From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 12 Nov 2010 00:15:26 +0000 (-0500)
Subject: - Fixed bug regarding "subqueryload" strategy whereby
X-Git-Tag: rel_0_7b1~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcf577c1d55a39695fe7df3bd25b6a3bad09f5cf;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed bug regarding "subqueryload" strategy whereby
strategy would fail if the entity was an aliased()
construct.  [ticket:1964]
---

diff --git a/CHANGES b/CHANGES
index 1b4f7cd348..7a07b7c766 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,10 @@ CHANGES
     a referenced child row to be correctly returned
     in results.  [ticket:1954]
 
+  - Fixed bug regarding "subqueryload" strategy whereby
+    strategy would fail if the entity was an aliased()
+    construct.  [ticket:1964]
+    
 - engine
   - Implemented sequence check capability for the C 
     version of RowProxy, as well as 2.7 style 
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 27ad3d902e..28759fb1ba 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -740,14 +740,16 @@ class SubqueryLoader(AbstractRelationshipLoader):
                                 ("orig_query", SubqueryLoader), 
                                 context.query)
 
+        subq_mapper = mapperutil._class_to_mapper(subq_path[0])
+        
         # determine attributes of the leftmost mapper
-        if self.parent.isa(subq_path[0]) and self.key==subq_path[1]:
+        if self.parent.isa(subq_mapper) and self.key==subq_path[1]:
             leftmost_mapper, leftmost_prop = \
                                     self.parent, self.parent_property
         else:
             leftmost_mapper, leftmost_prop = \
                                     subq_path[0], \
-                                    subq_path[0].get_property(subq_path[1])
+                                    subq_mapper.get_property(subq_path[1])
         leftmost_cols, remote_cols = self._local_remote_columns(leftmost_prop)
         
         leftmost_attr = [
diff --git a/test/orm/test_subquery_relations.py b/test/orm/test_subquery_relations.py
index 71f87a7267..81307a479e 100644
--- a/test/orm/test_subquery_relations.py
+++ b/test/orm/test_subquery_relations.py
@@ -42,6 +42,63 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
             )
         self.assert_sql_count(testing.db, go, 2)
 
+    @testing.resolve_artifact_names
+    def test_from_aliased(self):
+        mapper(Dingaling, dingalings)
+        mapper(Address, addresses, properties={
+            'dingalings':relationship(Dingaling, order_by=Dingaling.id)
+        })
+        mapper(User, users, properties={
+            'addresses':relationship(
+                            Address,
+                            order_by=Address.id)
+        })
+        sess = create_session()
+        
+        if False:
+            u = aliased(User)
+            q = sess.query(u).options(subqueryload(u.addresses))
+        
+            def go():
+                eq_(
+                        [User(id=7, addresses=[
+                                Address(id=1, email_address='jack@bean.com')])],
+                        q.filter(u.id==7).all()
+                )
+        
+            self.assert_sql_count(testing.db, go, 2)
+        
+            def go(): 
+                eq_(
+                    self.static.user_address_result, 
+                    q.order_by(u.id).all()
+                )
+            self.assert_sql_count(testing.db, go, 2)
+        
+        a = aliased(Address)
+    
+# TODO: this is [ticket:1965]
+#        q = sess.query(User).join((a, User.addresses)).\
+#                        options(subqueryload_all(User.addresses, a.dingalings))
+        q = sess.query(User).join((a, User.addresses)).\
+                        options(subqueryload_all(User.addresses, Address.dingalings))
+        
+        def go():
+            eq_(
+                [
+                    User(id=8, addresses=[
+                        Address(id=2, email_address='ed@wood.com', dingalings=[Dingaling()]),
+                        Address(id=3, email_address='ed@bettyboop.com'),
+                        Address(id=4, email_address='ed@lala.com'),
+                    ]),
+                    User(id=9, addresses=[
+                        Address(id=5, dingalings=[Dingaling()])
+                    ]),
+                ],
+                q.filter(User.id.in_([8, 9])).all()
+            )
+        self.assert_sql_count(testing.db, go, 3)
+        
     @testing.resolve_artifact_names
     def test_from_get(self):
         mapper(User, users, properties={