From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 12 Jul 2006 19:02:53 +0000 (+0000)
Subject: primary key identifier is a list now, not param list, [ticket:236]
X-Git-Tag: rel_0_2_6~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d599314d567dcf9edbcf6c6c662a3fd5e83c042;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

primary key identifier is a list now, not param list, [ticket:236]
---

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 82e1c6d6de..6988f81cc2 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -320,7 +320,7 @@ class Session(object):
                 # TODO: copy the state of the given object into this one.  tricky !
                 inst = u.identity_map[key]
             else:
-                inst = self.get(object.__class__, *key[1])
+                inst = self.get(object.__class__, key[1])
             if obj is object:
                 instance = inst