summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-06-13 10:13:17 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-06-13 10:13:17 -0400
commitdfbf68046bc717eb862fa37e4d7207160fe5760e (patch)
treeff5bdbc0b1dcb681002d6b4485111cc97dde1235 /lib
parent9c1a31113937ce56e56ff5689838c6eedf1cfa25 (diff)
downloadsqlalchemy-dfbf68046bc717eb862fa37e4d7207160fe5760e.tar.gz
dont call connection()/get_bind() all that here if we don't have to
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/persistence.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index 6e455d9c7..35a12c275 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -750,13 +750,15 @@ def _connections_for_states(base_mapper, uowtransaction, states):
connection_callable = \
uowtransaction.session.connection_callable
else:
- connection = uowtransaction.transaction.connection(
- base_mapper)
+ connection = None
connection_callable = None
for state in _sort_states(states):
if connection_callable:
connection = connection_callable(base_mapper, state.obj())
+ elif not connection:
+ connection = uowtransaction.transaction.connection(
+ base_mapper)
mapper = _state_mapper(state)