- changelog + docstring for pullreq github:164

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 7ea4ec3df562ac5a371763b608de0ce5b77b6323..e73e9897ec451c3383093cad504c87ddd4a4e94b 100644 (file)
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -15,6 +15,17 @@
     .. include:: changelog_07.rst
         :start-line: 5
 
+.. changelog::
+    :version: 1.0.0
+
+    .. change::
+        :tags: feature, orm
+        :pullreq: github:164
+
+        Added new argument :paramref:`.Query.update.update_args` which allows
+        kw arguments such as ``mysql_limit`` to be passed to the underlying
+        :class:`.Update` construct.  Pull request courtesy Amir Sadoughi.
+
 .. changelog::
     :version: 1.0.0b5
     :released: April 3, 2015

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 61cf3933fefb3a0a0895c089b01839f337eb4eab..d02c071dbd26d7e78230918831a3338d912f12d9 100644 (file)
--- 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.