summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-05-30 01:38:12 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-05-30 01:38:12 -0400
commit28fbecaaa00ac6039d6c6b7e5abd594160f74104 (patch)
treeffcb935bed30b9bc9a1574b64249d45f31ae6f2a
parent69dbcdd0ebf8de81643c038276fcc822a7b0bd0b (diff)
downloadsqlalchemy-28fbecaaa00ac6039d6c6b7e5abd594160f74104.tar.gz
revert this, not sure why that changed
-rw-r--r--lib/sqlalchemy/orm/strategies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index b1334636a..2674b9c6f 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -220,7 +220,7 @@ class DeferredColumnLoader(LoaderStrategy):
if not state.key:
return attributes.ATTR_EMPTY
- if not passive & attributes.CALLABLES_OK:
+ if not passive & attributes.SQL_OK:
return attributes.PASSIVE_NO_RESULT
localparent = state.manager.mapper