From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 24 Dec 2010 16:39:56 +0000 (-0500)
Subject: bugfix
X-Git-Tag: rel_0_7b1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5291df27000d5da8693c1278de557d01ffca046b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

bugfix
---

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index ac6a498c72..e2d2c559b0 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -165,7 +165,7 @@ def create_proxied_attribute(descriptor):
             return self._comparator
         
         def adapted(self, adapter):
-            return self.__class__(self.key, self.descriptor,
+            return self.__class__(self.class_, self.key, self.descriptor,
                                        self._comparator,
                                        adapter)
 
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index a1498bfd49..6fb2d2c572 100644
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -71,7 +71,7 @@ class DescriptorProperty(MapperProperty):
                 fset=self.descriptor.__set__,
                 fdel=self.descriptor.__delete__,
             )
-
+        
         proxy_attr = attributes.\
                     create_proxied_attribute(self.descriptor or descriptor)\
                     (