diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-04-03 17:53:49 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-04-03 17:53:49 -0400 |
| commit | 06d9307ae237bcf9d01d6b4ad230cdb10c47d098 (patch) | |
| tree | e5578b47d2bf3d0b3bce2ab4bf53dfde2be413c4 | |
| parent | c19ea20875e3487c3e25c35eaf832be2b661fc0c (diff) | |
| download | sqlalchemy-06d9307ae237bcf9d01d6b4ad230cdb10c47d098.tar.gz | |
- changelog + docstring for pullreq github:164
| -rw-r--r-- | doc/build/changelog/changelog_10.rst | 11 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index 7ea4ec3df..e73e9897e 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -16,6 +16,17 @@ :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 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. |