summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/session.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-01-11 03:16:10 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-01-11 03:16:10 +0000
commitf4b143685cea4c5e14c21238a56fbf8e1fd7a4f1 (patch)
tree8820ef9464a644eb50dfe64bbac9ed44fe26bc0d /lib/sqlalchemy/orm/session.py
parentb729503a3e1165dc37fb5ac4746226761e86fd51 (diff)
downloadsqlalchemy-f4b143685cea4c5e14c21238a56fbf8e1fd7a4f1.tar.gz
- cut down on a few hundred method calls
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
-rw-r--r--lib/sqlalchemy/orm/session.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 8217bfa99..6590864d6 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1104,7 +1104,11 @@ class Session(object):
util.warn_deprecated("dont_load=True has been renamed to load=False.")
_recursive = {}
- self._autoflush()
+
+ if load:
+ # flush current contents if we expect to load data
+ self._autoflush()
+
_object_mapper(instance) # verify mapped
autoflush = self.autoflush
try: