get() method needs to use the full table, not just the 'primary' table, to get the...

diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py
index 72b796f2720fdd9955ed9952c89040bd921492f9..61d9a3c2ef0d2e8b452d5bec9dd82d12ff7fb79a 100644 (file)
--- a/lib/sqlalchemy/mapping/mapper.py
+++ b/lib/sqlalchemy/mapping/mapper.py
@@ -274,7 +274,7 @@ class Mapper(object):
                 ident = key[2]
             i = 0
             params = {}
-            for primary_key in self.pks_by_table[self.primarytable]:
+            for primary_key in self.pks_by_table[self.table]:
                 params["pk_"+primary_key.key] = ident[i]
                 i += 1
             try: