- tests for hybrid

- documentation for hybrid
- rewrite descriptor, synonym, comparable_property documentation

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index eb923bc4e..ca1137c3f 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -174,6 +174,13 @@ def create_proxied_attribute(descriptor):
                 self._comparator = self._comparator.adapted(self.adapter)
             return self._comparator
 
+        def adapted(self, adapter):
+            """Proxy adapted() for the use case of AliasedClass calling adapted."""
+
+            return self.__class__(self.class_, self.key, self.descriptor,
+                                       self._comparator,
+                                       adapter)
+
         def __get__(self, instance, owner):
             if instance is None:
                 return self