summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-11-05 21:15:19 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-11-05 21:15:19 +0000
commit7576315169ccb8606f148d040c3602e1e21a04fd (patch)
treeb31648a7810d964a279f304b0f6025c810be4754 /lib/sqlalchemy/orm
parent9f894d2f265bb5fd03ab0b3aa3fd164108c99259 (diff)
downloadsqlalchemy-7576315169ccb8606f148d040c3602e1e21a04fd.tar.gz
- Fixed bug in composite types which prevented a primary-key
composite type from being mutated [ticket:1213].
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/mapper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index c2bb73481..42597cda1 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1289,10 +1289,10 @@ class Mapper(object):
params[col.key] = prop.get_col_value(col, history.added[0])
if col in pks:
if history.deleted:
- params[col._label] = history.deleted[0]
+ params[col._label] = prop.get_col_value(col, history.deleted[0])
else:
# row switch logic can reach us here
- params[col._label] = history.added[0]
+ params[col._label] = prop.get_col_value(col, history.added[0])
hasdata = True
elif col in pks:
params[col._label] = mapper._get_state_attr_by_column(state, col)