diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 11:45:06 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 11:45:06 -0400 |
| commit | ff0fb31bf205a82c4af8781ac9afc96586a67d66 (patch) | |
| tree | 95d3d6164cdfe6104cdde2cb94daab11ec4da17c /lib/sqlalchemy/orm/state.py | |
| parent | 713a4e19fa6c4397191dd7311152c6c69c37535e (diff) | |
| download | sqlalchemy-ff0fb31bf205a82c4af8781ac9afc96586a67d66.tar.gz | |
- merge attribute flag overhaul for [ticket:2358]
Diffstat (limited to 'lib/sqlalchemy/orm/state.py')
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index 4803ecdc3..30a08faba 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -18,7 +18,7 @@ from sqlalchemy import util from sqlalchemy.orm import exc as orm_exc, attributes, interfaces,\ util as orm_util from sqlalchemy.orm.attributes import PASSIVE_OFF, PASSIVE_NO_RESULT, \ - PASSIVE_NO_FETCH, NEVER_SET, ATTR_WAS_SET, NO_VALUE + SQL_OK, NEVER_SET, ATTR_WAS_SET, NO_VALUE mapperlib = util.importlater("sqlalchemy.orm", "mapperlib") @@ -276,7 +276,7 @@ class InstanceState(object): """ - if passive is PASSIVE_NO_FETCH: + if not passive & SQL_OK: return PASSIVE_NO_RESULT toload = self.expired_attributes.\ |