- merge from tip

- refine subq loading to use the same approach for m2m/o2m

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index 579101f0d..03ebb97c4 100644
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -482,6 +482,12 @@ class MapperProperty(object):
         self.do_init()
         self._compile_finished = True
 
+    @property
+    def class_attribute(self):
+        """Return the class-bound descriptor corresponding to this MapperProperty."""
+        
+        return getattr(self.parent.class_, self.key)
+        
     def do_init(self):
         """Perform subclass-specific initialization post-mapper-creation steps.