From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 14 Jun 2015 00:15:17 +0000 (-0400)
Subject: - add changelog for #3451, with 09485d733131b667813f44eb0b6807b698668ee7 fixes #3451
X-Git-Tag: rel_1_0_6~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2497d559ddeb68e52eb1838deeed7e3305280aa5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- add changelog for #3451, with 09485d733131b667813f44eb0b6807b698668ee7 fixes #3451
- also add a bulk_insert_mappings test
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index f448865591..e37fc46c79 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,6 +18,16 @@
 .. changelog::
     :version: 1.0.6
 
+    .. change::
+        :tags: bug, orm
+        :tickets: 3451
+        :pullreq: github:181
+
+        Fixed bug in new :meth:`.Session.bulk_update_mappings` feature where
+        the primary key columns used in the WHERE clause to locate the row
+        would also be included in the SET clause, setting their value to
+        themselves unnecessarily.  Pull request courtesy Patrick Hayes.
+
     .. change::
         :tags: bug, orm
         :tickets: 3448
diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py
index 63883daac6..a777a8aa1d 100644
--- a/test/aaa_profiling/test_memusage.py
+++ b/test/aaa_profiling/test_memusage.py
@@ -45,7 +45,8 @@ def profile_memory(maxtimes=50):
             # tests under 50 iterations and ideally about ten, so
             # just filter them out so that we get a "flatline" more quickly.
 
-            if testing.against("sqlite+pysqlite"):
+            if testing.against("sqlite+pysqlite") or \
+                    testing.against("sqlite+pysqlcipher"):
                 return [o for o in gc.get_objects()
                         if not isinstance(o, weakref.ref)]
             else:
diff --git a/test/orm/test_bulk.py b/test/orm/test_bulk.py
index 1e0a735c76..e2a1464a61 100644
--- a/test/orm/test_bulk.py
+++ b/test/orm/test_bulk.py
@@ -134,6 +134,27 @@ class BulkInsertUpdateTest(BulkTest, _fixtures.FixtureTest):
             )
         )
 
+    def test_bulk_insert(self):
+        User, = self.classes("User",)
+
+        s = Session()
+        with self.sql_execution_asserter() as asserter:
+            s.bulk_insert_mappings(
+                User,
+                [{'id': 1, 'name': 'u1new'},
+                 {'id': 2, 'name': 'u2'},
+                 {'id': 3, 'name': 'u3new'}]
+            )
+
+        asserter.assert_(
+            CompiledSQL(
+                "INSERT INTO users (id, name) VALUES (:id, :name)",
+                [{'id': 1, 'name': 'u1new'},
+                 {'id': 2, 'name': 'u2'},
+                 {'id': 3, 'name': 'u3new'}]
+            )
+        )
+
 
 class BulkInheritanceTest(BulkTest, fixtures.MappedTest):
     @classmethod