some tweaks to help MySQL

diff --git a/test/orm/eager_relations.py b/test/orm/eager_relations.py
index 94723a20bbfcd2c2713eae8143ece79173154a6e..51457cdbdb49412b5d4fcdca7104634d916ad046 100644 (file)
--- 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 30694d8c30a4b04c6c3d558bc614741f16d5ba03..d6ff8541a6b8a6adc581a74e842f4033c8e377c6 100644 (file)
--- 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