diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-02-08 01:20:41 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-02-08 01:20:41 -0500 |
| commit | b6195b1f755768066c78db7575275052a3e2daaa (patch) | |
| tree | 3060f014610b8d75fe6c8553a2d453779efde1cb /lib/sqlalchemy/orm/query.py | |
| parent | 9e3cd16c2174f5e6e4364803e940bdb4b8c1e6fa (diff) | |
| download | sqlalchemy-b6195b1f755768066c78db7575275052a3e2daaa.tar.gz | |
Fixed bug whereby :meth:`.Query.yield_per` would set the execution
options incorrectly, thereby breaking subsequent usage of the
:meth:`.Query.execution_options` method. Courtesy Ryan Kelly.
[ticket:2661]
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 02f6f3eea..b18e28abb 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -712,8 +712,8 @@ class Query(object): """ self._yield_per = count - self._execution_options = self._execution_options.copy() - self._execution_options['stream_results'] = True + self._execution_options = self._execution_options.union( + {"stream_results": True}) def get(self, ident): """Return an instance based on the given primary key identifier, |