[Python-modules-commits] [sqlobject] 02/03: merge patched into master

[Neil Muller]

This is an automated email from the git hooks/post-receive script.

drnlmza-guest pushed a commit to branch master
in repository sqlobject.

commit 4815e49ef406d3b30ba089e1430f9014a0bf28c4
Merge: f1522e3 1ae9b84
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date:   Wed Nov 2 18:33:00 2016 +0200

    merge patched into master

 debian/.git-dpm                      |  4 ++--
 debian/patches/fix_sqlite_vacuum_cmd | 28 ++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 sqlobject/sqlite/sqliteconnection.py |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7d89bdb,0000000..ffc3aae
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e9a932305b79254971e05490bc9143776ea8e439
- e9a932305b79254971e05490bc9143776ea8e439
++1ae9b84e0f20b5384dbfbd082cc00c99a0e86386
++1ae9b84e0f20b5384dbfbd082cc00c99a0e86386
 +d2df5da8629c9934b60ab99d1632f0494c56e00a
 +d2df5da8629c9934b60ab99d1632f0494c56e00a
 +sqlobject_3.1.0+dfsg.orig.tar.gz
 +fc71b97f3dbe63ea8a2ebc29c96073e606949ea7
 +902976
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix_sqlite_vacuum_cmd
index 0000000,0000000..f7b7482
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_sqlite_vacuum_cmd
@@@ -1,0 -1,0 +1,28 @@@
++From 1ae9b84e0f20b5384dbfbd082cc00c99a0e86386 Mon Sep 17 00:00:00 2001
++From: Neil Muller <drnlmuller+debian at gmail.com>
++Date: Wed, 2 Nov 2016 18:32:21 +0200
++Subject: Fix #841596 by backporting upstream fix
++
++SQLite 3.15 treats the parameter to VACUUM as a schema name,
++not the table name. Dropping the parameter matches the
++behaviour on older versions, which simply ignored the parameter.
++
++Patch-Name: fix_sqlite_vacuum_cmd
++Applied-Upstream: 3.2.0
++---
++ sqlobject/sqlite/sqliteconnection.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/sqlobject/sqlite/sqliteconnection.py b/sqlobject/sqlite/sqliteconnection.py
++index a0c347b..70fae63 100644
++--- a/sqlobject/sqlite/sqliteconnection.py
+++++ b/sqlobject/sqlite/sqliteconnection.py
++@@ -310,7 +310,7 @@ class SQLiteConnection(DBAPI):
++         self.query('ALTER TABLE %s ADD COLUMN %s' %
++                    (tableName,
++                     column.sqliteCreateSQL()))
++-        self.query('VACUUM %s' % tableName)
+++        self.query('VACUUM')
++ 
++     def delColumn(self, sqlmeta, column):
++         self.recreateTableWithoutColumn(sqlmeta, column)
diff --cc debian/patches/series
index 9e72596,0000000..b05945c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +get_rid_of_setuptools
 +change_doc_build_script
 +remove_pkg_resources
 +replace_logos
 +0005-Remove-docs-from-installed-files.patch
++fix_sqlite_vacuum_cmd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sqlobject.git