summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-04-03 17:53:49 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-04-03 17:53:49 -0400
commit06d9307ae237bcf9d01d6b4ad230cdb10c47d098 (patch)
treee5578b47d2bf3d0b3bce2ab4bf53dfde2be413c4 /lib/sqlalchemy/orm/query.py
parentc19ea20875e3487c3e25c35eaf832be2b661fc0c (diff)
downloadsqlalchemy-06d9307ae237bcf9d01d6b4ad230cdb10c47d098.tar.gz
- changelog + docstring for pullreq github:164
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 61cf3933f..d02c071db 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2860,6 +2860,13 @@ class Query(object):
The expression evaluator currently doesn't account for differing
string collations between the database and Python.
+ :param update_args: Optional dictionary, if present will be passed
+ to the underlying :func:`.update` construct as the ``**kw`` for
+ the object. May be used to pass dialect-specific arguments such
+ as ``mysql_limit``.
+
+ .. versionadded:: 1.0.0
+
:return: the count of rows matched as returned by the database's
"row count" feature.