From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 9 May 2008 19:42:32 +0000 (+0000)
Subject: some tweaks to help MySQL
X-Git-Tag: rel_0_5beta1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3b4e624a1f379047f01e4c10ec30458015a7b1e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

some tweaks to help MySQL
---

diff --git a/test/orm/eager_relations.py b/test/orm/eager_relations.py
index 94723a20bb..51457cdbdb 100644
--- a/test/orm/eager_relations.py
+++ b/test/orm/eager_relations.py
@@ -977,7 +977,9 @@ class MixedEntitiesTest(FixtureTest, AssertsCompiledSQL):
                     (User(id=9, addresses=[Address(id=5)]), Order(id=2, items=[Item(id=1), Item(id=2), Item(id=3)])),
                     (User(id=9, addresses=[Address(id=5)]), Order(id=4, items=[Item(id=1), Item(id=5)])),
                 ],
-                sess.query(User, Order).filter(User.id==Order.user_id).options(eagerload(User.addresses), eagerload(Order.items)).filter(User.id==9).all(),
+                sess.query(User, Order).filter(User.id==Order.user_id).\
+                    options(eagerload(User.addresses), eagerload(Order.items)).filter(User.id==9).\
+                        order_by(User.id, Order.id).all(),
             )
         self.assert_sql_count(testing.db, go, 1)
 
@@ -1004,7 +1006,9 @@ class MixedEntitiesTest(FixtureTest, AssertsCompiledSQL):
                     (User(id=9, addresses=[Address(id=5)]), Order(id=2, items=[Item(id=1), Item(id=2), Item(id=3)])),
                     (User(id=9, addresses=[Address(id=5)]), Order(id=4, items=[Item(id=1), Item(id=5)])),
                 ],
-                sess.query(User, oalias).filter(User.id==oalias.user_id).options(eagerload(User.addresses), eagerload(oalias.items)).filter(User.id==9).all(),
+                sess.query(User, oalias).filter(User.id==oalias.user_id).\
+                    options(eagerload(User.addresses), eagerload(oalias.items)).filter(User.id==9).\
+                    order_by(User.id, oalias.id).all(),
             )
         self.assert_sql_count(testing.db, go, 1)
 
diff --git a/test/orm/inheritance/query.py b/test/orm/inheritance/query.py
index 30694d8c30..d6ff8541a6 100644
--- a/test/orm/inheritance/query.py
+++ b/test/orm/inheritance/query.py
@@ -194,7 +194,7 @@ def make_test(select_type):
             sess = create_session()
 
             # assert the JOINs dont over JOIN
-            assert sess.query(Person).with_polymorphic('*').options(eagerload(Engineer.machines)).limit(2).offset(1).with_labels().statement.count().scalar() == 2
+            assert sess.query(Person).with_polymorphic('*').options(eagerload(Engineer.machines)).limit(2).offset(1).with_labels().subquery().count().scalar() == 2
 
             def go():
                 self.assertEquals(sess.query(Person).with_polymorphic('*').options(eagerload(Engineer.machines))[1:3].all(), all_employees[1:3])
@@ -778,7 +778,7 @@ class SelfReferentialM2MTest(ORMTest, AssertsCompiledSQL):
         , dialect=default.DefaultDialect())
 
         # another way to check
-        assert q.limit(1).with_labels().statement.count().scalar() == 1
+        assert q.limit(1).with_labels().subquery().count().scalar() == 1
         
         assert q.first() is c1