- _Label adds itself to the proxy collection so that it works in correspoinding column. fixes some eager load with column_property bugs.

- this partially fixes some issues in [ticket:1022] but leaving the "unlabeled" fix for 0.5 for now

1 files changed, 10 insertions, 8 deletions

diff --git a/test/orm/eager_relations.py b/test/orm/eager_relations.py
index 866eec718..418df83dd 100644
--- a/test/orm/eager_relations.py
+++ b/test/orm/eager_relations.py
@@ -1047,14 +1047,16 @@ class SubqueryTest(ORMTest):
                     self.assertEquals(user.query_score, user.prop_score)
             self.assert_sql_count(testing.db, go, 1)
 
-            u = session.query(User).filter_by(name='joe').one()
-            self.assertEquals(u.query_score, u.prop_score)
-
-            # fails:
-            #def go():
-            #    u = session.query(User).filter_by(name='joe').one()
-            #    self.assertEquals(u.query_score, u.prop_score)
-            #self.assert_sql_count(testing.db, go, 1)
+
+            # fails for non labeled (fixed in 0.5):
+            if labeled:
+                def go():
+                    u = session.query(User).filter_by(name='joe').one()
+                    self.assertEquals(u.query_score, u.prop_score)
+                self.assert_sql_count(testing.db, go, 1)
+            else:
+                u = session.query(User).filter_by(name='joe').one()
+                self.assertEquals(u.query_score, u.prop_score)
             
             for t in (tags_table, users_table):
                 t.delete().execute()