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/query.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/query.py')
-rw-r--r-- | lib/sqlalchemy/orm/query.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 9aa2e3d99..61cf3933f 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2811,7 +2811,7 @@ class Query(object): delete_op.exec_() return delete_op.rowcount - def update(self, values, synchronize_session='evaluate'): + def update(self, values, synchronize_session='evaluate', update_args=None): """Perform a bulk update query. Updates rows matched by this query in the database. @@ -2920,8 +2920,9 @@ class Query(object): """ + update_args = update_args or {} update_op = persistence.BulkUpdate.factory( - self, synchronize_session, values) + self, synchronize_session, values, update_args) update_op.exec_() return update_op.rowcount |