summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/mapper.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-07-21 20:25:36 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-07-21 20:25:36 +0000
commitf300bb43dedd54a81f5bd72fd9afad1c2bb39ede (patch)
tree4f6eab18681ed728755cc2ccd75d452b97696da2 /lib/sqlalchemy/orm/mapper.py
parent8804e1963f7f391bfc29feca7155e3a5f9bb097d (diff)
downloadsqlalchemy-f300bb43dedd54a81f5bd72fd9afad1c2bb39ede.tar.gz
- Fixed bug whereby inheritance discriminator part of a
composite primary key would fail on updates. Continuation of [ticket:1300].
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index b84f0166a..ab6ff1c20 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1328,7 +1328,7 @@ class Mapper(object):
history = attributes.get_state_history(state, prop.key, passive=True)
if history.added:
hasdata = True
- elif mapper.polymorphic_on and mapper.polymorphic_on.shares_lineage(col):
+ elif mapper.polymorphic_on and mapper.polymorphic_on.shares_lineage(col) and col not in pks:
pass
else:
if post_update_cols is not None and col not in post_update_cols: