From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 3 Apr 2015 21:53:49 +0000 (-0400)
Subject: - changelog + docstring for pullreq github:164
X-Git-Tag: rel_1_0_0~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06d9307ae237bcf9d01d6b4ad230cdb10c47d098;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- changelog + docstring for pullreq github:164
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 7ea4ec3df5..e73e9897ec 100644
--- 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 61cf3933fe..d02c071dbd 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.