From 46eb453c36e742ec69fbc0442ac43245d7ee7eb7 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 26 Mar 2006 15:36:43 +0000
Subject: column label generation checks for a conflict against a column named
 the same as the label comment in mapper

---
 lib/sqlalchemy/mapping/mapper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sqlalchemy/mapping')

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:
-- 
cgit v1.2.1