diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-30 20:24:08 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-30 20:24:08 -0400 |
| commit | 9bab63b69341bf9d89a30de2f624644b55afc6e9 (patch) | |
| tree | b1c0a4956a743ba208a0c2cf506b9fcc634ac82d /lib/sqlalchemy/orm/query.py | |
| parent | a19e403010804ad25260a96e5f38e0894c1d72af (diff) | |
| download | sqlalchemy-9bab63b69341bf9d89a30de2f624644b55afc6e9.tar.gz | |
- Pool classes will reuse the same "pool_logging_name" setting
after a dispose() occurs.
- Engine gains an "execution_options" argument and
update_execution_options() method, which will apply to
all connections generated by this engine.
- Added more aggressive caching to the mapper's usage of
UPDATE, INSERT, and DELETE expressions. Assuming the
statement has no per-object SQL expressions attached,
the expression objects are cached by the mapper after
the first create, and their compiled form is stored
persistently in a cache dictionary for the duration of
the related Engine.
- change #3 required change #1 so that we could test
a set of mappers operating over the course of many engines without
memory usage increase.
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 75fccb86f..ae6624d47 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -785,10 +785,7 @@ class Query(object): method is used. """ - _execution_options = self._execution_options.copy() - for key, value in kwargs.items(): - _execution_options[key] = value - self._execution_options = _execution_options + self._execution_options = self._execution_options.union(kwargs) @_generative() def with_lockmode(self, mode): |