From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 3 Apr 2015 21:48:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/pr/164' into pr164
X-Git-Tag: rel_1_0_0~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c19ea20875e3487c3e25c35eaf832be2b661fc0c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge remote-tracking branch 'origin/pr/164' into pr164
---

c19ea20875e3487c3e25c35eaf832be2b661fc0c
diff --cc lib/sqlalchemy/orm/persistence.py
index ff5dda7b3a,3b85d717ed..c2527ee3d1
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@@ -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,