diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-26 15:36:43 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-26 15:36:43 +0000 |
| commit | 46eb453c36e742ec69fbc0442ac43245d7ee7eb7 (patch) | |
| tree | ca1cd1c1ea51a6b1d95f63938860c1720baed727 /lib/sqlalchemy/mapping | |
| parent | fcace31b887d0edb73dfd01a9134727d3647061f (diff) | |
| download | sqlalchemy-46eb453c36e742ec69fbc0442ac43245d7ee7eb7.tar.gz | |
column label generation checks for a conflict against a column named the same as the label
comment in mapper
Diffstat (limited to 'lib/sqlalchemy/mapping')
| -rw-r--r-- | lib/sqlalchemy/mapping/mapper.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py index 82257ae62..1efdb649a 100644 --- a/lib/sqlalchemy/mapping/mapper.py +++ b/lib/sqlalchemy/mapping/mapper.py @@ -998,8 +998,8 @@ class MapperExtension(object): Essentially, this method is used to have a different mapper populate the object: - def populate_instance(self, mapper, *args): - othermapper.populate_instance(*args) + def populate_instance(self, mapper, instance, row, identitykey, imap, isnew): + othermapper.populate_instance(instance, row, identitykey, imap, isnew, frommapper=mapper) return False """ if self.next is None: |