diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-06-11 10:08:33 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-06-11 10:08:33 -0400 |
| commit | 5b8e5d381c710b0d813022467acc56265e98a27d (patch) | |
| tree | 20b498ef90ab2cb53f0a9d5b513c30e9c15b750f /lib/sqlalchemy/orm/util.py | |
| parent | d8d080a76913af5d192c5ef627b8453c05d0e2c8 (diff) | |
| download | sqlalchemy-5b8e5d381c710b0d813022467acc56265e98a27d.tar.gz | |
- [bug] Fixed identity_key() function which
was not accepting a scalar argument
for the identity. [ticket:2508]. Also
in 0.7.8.
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 8403ce673..51aaa3152 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -199,7 +199,7 @@ def identity_key(*args, **kwargs): % ", ".join(kwargs.keys())) mapper = class_mapper(class_) if "ident" in locals(): - return mapper.identity_key_from_primary_key(ident) + return mapper.identity_key_from_primary_key(util.to_list(ident)) return mapper.identity_key_from_row(row) instance = kwargs.pop("instance") if kwargs: |