summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-01-30 22:04:53 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-01-30 22:04:53 +0000
commit8d7833d27c2f529ae65e84a5932e47457b989871 (patch)
tree89bf4b59a64b5512b63c6cf2575933a71a36a306 /lib
parentd8204ea92abe4b74d99549b89260c616f82e9dc5 (diff)
downloadsqlalchemy-8d7833d27c2f529ae65e84a5932e47457b989871.tar.gz
- fix to deferred so that load operation doesnt mistakenly occur when only
PK col attributes are set
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/strategies.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index d8d9a9c47..50a2ea27d 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -73,6 +73,10 @@ class DeferredColumnLoader(LoaderStrategy):
def lazyload():
if self._should_log_debug:
self.logger.debug("deferred load %s group %s" % (mapperutil.attribute_str(instance, self.key), str(self.group)))
+
+ if not mapper.has_identity(instance):
+ return None
+
try:
pk = self.parent.pks_by_table[self.columns[0].table]
except KeyError: