]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge remote-tracking branch 'origin/pr/164' into pr164
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 3 Apr 2015 21:48:19 +0000 (17:48 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 3 Apr 2015 21:48:19 +0000 (17:48 -0400)
1  2 
lib/sqlalchemy/orm/persistence.py
lib/sqlalchemy/orm/query.py
test/orm/test_update_delete.py

index ff5dda7b3a74f619e924260ebdb0b9fe3fd66f68,3b85d717ed8ee1f86ca8ee50b1fcc510e647317a..c2527ee3d1450df71c25d9861b0d22ea8863bf51
@@@ -1170,12 -1132,14 +1170,13 @@@ class BulkFetch(BulkUD)
  class BulkUpdate(BulkUD):
      """BulkUD which handles UPDATEs."""
  
-     def __init__(self, query, values):
+     def __init__(self, query, values, update_kwargs):
          super(BulkUpdate, self).__init__(query)
 -        self.query._no_select_modifiers("update")
          self.values = values
+         self.update_kwargs = update_kwargs
  
      @classmethod
-     def factory(cls, query, synchronize_session, values):
+     def factory(cls, query, synchronize_session, values, update_kwargs):
          return BulkUD._factory({
              "evaluate": BulkUpdateEvaluate,
              "fetch": BulkUpdateFetch,
Simple merge
Simple merge