]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
revert this, not sure why that changed
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 30 May 2014 05:38:12 +0000 (01:38 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 30 May 2014 05:38:12 +0000 (01:38 -0400)
lib/sqlalchemy/orm/strategies.py

index b1334636ab669902d9c8918031545b4ac9fd24d3..2674b9c6f7f78c6668eab38223b87fb506ed0299 100644 (file)
@@ -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