diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-04-03 17:48:19 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-04-03 17:48:19 -0400 |
commit | c19ea20875e3487c3e25c35eaf832be2b661fc0c (patch) | |
tree | 596df083fc9edf2e375a9503f0e999f6bce2c2dc /lib/sqlalchemy/orm/persistence.py | |
parent | 541a9751fc179720d2f0a6de062c238b16e5a65e (diff) | |
parent | 3365a4f78ed54fc0c242c01a3f58e87b1518d68d (diff) | |
download | sqlalchemy-c19ea20875e3487c3e25c35eaf832be2b661fc0c.tar.gz |
Merge remote-tracking branch 'origin/pr/164' into pr164
Diffstat (limited to 'lib/sqlalchemy/orm/persistence.py')
-rw-r--r-- | lib/sqlalchemy/orm/persistence.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index ff5dda7b3..c2527ee3d 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -1170,17 +1170,18 @@ 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.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, False: BulkUpdate - }, synchronize_session, query, values) + }, synchronize_session, query, values, update_kwargs) def _resolve_string_to_expr(self, key): if self.mapper and isinstance(key, util.string_types): @@ -1215,7 +1216,8 @@ class BulkUpdate(BulkUD): for k, v in self.values.items() ) update_stmt = sql.update(self.primary_table, - self.context.whereclause, values) + self.context.whereclause, values, + **self.update_kwargs) self.result = self.query.session.execute( update_stmt, params=self.query._params, |