diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2019-05-25 14:28:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2019-05-25 14:28:27 +0000 |
| commit | 142c94348ad4a341f7cbff3d76bf0df397fa782f (patch) | |
| tree | 12cb8bf77134342ae5731478fec6f52fda652355 /lib/sqlalchemy/orm/mapper.py | |
| parent | 0694c7f272819d013b5e1931f1baf0ebfb05e666 (diff) | |
| parent | f146f19d4bf1f9150785e22d37a62dcbe3436c9a (diff) | |
| download | sqlalchemy-142c94348ad4a341f7cbff3d76bf0df397fa782f.tar.gz | |
Merge "Unify NO_VALUE and NEVER_SET"
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index ccf05a783..3c26f7247 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -2715,7 +2715,7 @@ class Mapper(InspectionAttr): return self._identity_key_from_state(state, attributes.PASSIVE_OFF) def _identity_key_from_state( - self, state, passive=attributes.PASSIVE_RETURN_NEVER_SET + self, state, passive=attributes.PASSIVE_RETURN_NO_VALUE ): dict_ = state.dict manager = state.manager @@ -2769,7 +2769,7 @@ class Mapper(InspectionAttr): return {prop.key for prop in self._all_pk_props} def _get_state_attr_by_column( - self, state, dict_, column, passive=attributes.PASSIVE_RETURN_NEVER_SET + self, state, dict_, column, passive=attributes.PASSIVE_RETURN_NO_VALUE ): prop = self._columntoproperty[column] return state.manager[prop.key].impl.get(state, dict_, passive=passive) @@ -2790,7 +2790,7 @@ class Mapper(InspectionAttr): ) def _get_committed_state_attr_by_column( - self, state, dict_, column, passive=attributes.PASSIVE_RETURN_NEVER_SET + self, state, dict_, column, passive=attributes.PASSIVE_RETURN_NO_VALUE ): prop = self._columntoproperty[column] |