From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 30 May 2014 05:38:12 +0000 (-0400)
Subject: revert this, not sure why that changed
X-Git-Tag: rel_1_0_0b1~408^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28fbecaaa00ac6039d6c6b7e5abd594160f74104;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

revert this, not sure why that changed
---

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index b1334636ab..2674b9c6f7 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