diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-18 18:49:42 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-18 18:49:42 -0500 |
| commit | 09a82f90e63ec6eeaaa5610b0f495fb2b5a10fce (patch) | |
| tree | df1bcbdf3884006eca0e84e8f1f81a51fab90369 /lib/sqlalchemy/orm/mapper.py | |
| parent | e85871c612587b808a145f1351e0c68e2eea2226 (diff) | |
| parent | 2336b1cebfcb2f304e09cbc2a0e8bb3fb3a9ceeb (diff) | |
| download | sqlalchemy-09a82f90e63ec6eeaaa5610b0f495fb2b5a10fce.tar.gz | |
merge tip
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 75ba0b5c0..accb7c4be 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -104,7 +104,7 @@ class Mapper(object): self.class_manager = None - self.primary_key_argument = primary_key + self.primary_key_argument = util.to_list(primary_key) self.non_primary = non_primary if order_by is not False: |