Compare commits

...

2 Commits

Author SHA1 Message Date
Miss Islington (bot) 80e5732d31
bpo-40810: Fix CheckTraceCallbackContent for SQLite pre 3.7.15 (GH-20530)
Ref. [SQLite 3.7.15 changelog](https://sqlite.org/changes.htmlGH-version_3_7_15):
_"Avoid invoking the sqlite3_trace() callback multiple times when a statement is automatically reprepared due to SQLITE_SCHEMA errors."_
(cherry picked from commit f7f0ed59bc)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
2021-01-04 15:41:03 -08:00
Miss Islington (bot) def7dc3b71
Do not remove x bit from published directories (GH-24101)
(cherry picked from commit af4cd16479)

Co-authored-by: Steve Dower <steve.dower@python.org>
2021-01-04 13:17:05 -08:00
3 changed files with 11 additions and 2 deletions

View File

@ -265,6 +265,14 @@ class TraceCallbackTests(unittest.TestCase):
cur.execute(queries[0])
con2.execute("create table bar(x)")
cur.execute(queries[1])
# Extract from SQLite 3.7.15 changelog:
# Avoid invoking the sqlite3_trace() callback multiple times when a
# statement is automatically reprepared due to SQLITE_SCHEMA errors.
#
# See bpo-40810
if sqlite.sqlite_version_info < (3, 7, 15):
queries.append(queries[-1])
self.assertEqual(traced_statements, queries)

View File

@ -0,0 +1 @@
In :mod:`sqlite3`, fix `CheckTraceCallbackContent` for SQLite pre 3.7.15.

View File

@ -90,7 +90,7 @@ if (-not $skipupload) {
$d = "$target/$($p[0])/"
& $plink -batch $user@$server mkdir $d
& $plink -batch $user@$server chgrp downloads $d
& $plink -batch $user@$server chmod g-x,o+rx $d
& $plink -batch $user@$server chmod o+rx $d
& $pscp -batch $chm.FullName "$user@${server}:$d"
if (-not $?) { throw "Failed to upload $chm" }
@ -115,7 +115,7 @@ if (-not $skipupload) {
$sd = "$d$($a.Name)$($p[1])/"
& $plink -batch $user@$server mkdir $sd
& $plink -batch $user@$server chgrp downloads $sd
& $plink -batch $user@$server chmod g-x,o+rx $sd
& $plink -batch $user@$server chmod o+rx $sd
& $pscp -batch $msi.FullName "$user@${server}:$sd"
if (-not $?) { throw "Failed to upload $msi" }
& $plink -batch $user@$server chgrp downloads $sd*