diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-30 01:38:45 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-30 01:38:45 -0400 |
| commit | f26669ae1b066052c6d8a251d82d2b7cb96f8c41 (patch) | |
| tree | ffcb935bed30b9bc9a1574b64249d45f31ae6f2a | |
| parent | 013455139bce704e177af9394040e9ce40481ef2 (diff) | |
| parent | 28fbecaaa00ac6039d6c6b7e5abd594160f74104 (diff) | |
| download | sqlalchemy-f26669ae1b066052c6d8a251d82d2b7cb96f8c41.tar.gz | |
Merge branch 'master' into rel_1_0
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 2 |
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 |