diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-11-03 04:57:09 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-11-03 04:57:09 +0000 |
| commit | db2ff896446f3d7d36d84c7a1de93007a36942eb (patch) | |
| tree | 1dd3acd20dede3e4068b1cc232904f1322ac1ef6 /lib/sqlalchemy | |
| parent | cc9c615c5af8480c2a32d00a1f0d705f11676040 (diff) | |
| download | sqlalchemy-db2ff896446f3d7d36d84c7a1de93007a36942eb.tar.gz | |
revert r6466
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index d6bb2b2e6..6bc55c831 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -1628,7 +1628,7 @@ class Mapper(object): if polymorphic_on is not None: discriminator = row[polymorphic_on] - if discriminator is not None or None in polymorphic_instances: + if discriminator is not None: _instance = polymorphic_instances[discriminator] if _instance: return _instance(row, result) diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index 1fd7d48a9..1ca71390c 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -161,8 +161,7 @@ class CompositeProperty(ColumnProperty): return self.get_col_value(column, obj) def getcommitted(self, state, column, passive=False): - # TODO: no coverage here - obj = state.get_impl(self.key).get_committed_value(state, state.dict, passive=passive) + obj = state.get_impl(self.key).get_committed_value(state, passive=passive) return self.get_col_value(column, obj) def setattr(self, state, value, column): |