bugfix

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index ac6a498c7284a889dab730b799ad6e1134aa7f48..e2d2c559b0952f8ec200b4109ad5adf9a3a811c6 100644 (file)
--- 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 a1498bfd493a7dc61f8d97e6e98e8d66af5dc2cc..6fb2d2c57271ce0dc3dda1da040504727b9a4bf9 100644 (file)
--- 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)\
                     (