From 28fbecaaa00ac6039d6c6b7e5abd594160f74104 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 30 May 2014 01:38:12 -0400
Subject: revert this, not sure why that changed

---
 lib/sqlalchemy/orm/strategies.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sqlalchemy')

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
-- 
cgit v1.2.1