more order bys...

diff --git a/test/orm/eager_relations.py b/test/orm/eager_relations.py
index 51457cdbdb49412b5d4fcdca7104634d916ad046..544e505f46890366a39b56582cda3d36cdd80236 100644 (file)
--- a/test/orm/eager_relations.py
+++ b/test/orm/eager_relations.py
@@ -990,7 +990,8 @@ 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).join(User.orders).options(eagerload(User.addresses), eagerload(Order.items)).filter(User.id==9).all(),
+                sess.query(User, Order).join(User.orders).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)
     
@@ -1019,7 +1020,8 @@ 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).join((User.orders, oalias)).options(eagerload(User.addresses), eagerload(oalias.items)).filter(User.id==9).all(),
+                sess.query(User, oalias).join((User.orders, oalias)).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/query.py b/test/orm/query.py
index f5a2f0a1864e45d271a7a59b37d7bf71094c7605..cbf313bcae5f9788d6c1d16cb7e490bc90e36395 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -766,7 +766,8 @@ class JoinTest(QueryTest):
         OrderAlias = aliased(Order)
 
         self.assertEquals(
-            sess.query(OrderAlias).join('items').filter_by(description='item 3').all(),
+            sess.query(OrderAlias).join('items').filter_by(description='item 3').\
+                order_by(OrderAlias.id).all(),
             [
                 Order(address_id=1,description=u'order 1',isopen=0,user_id=7,id=1), 
                 Order(address_id=4,description=u'order 2',isopen=0,user_id=9,id=2), 
@@ -775,7 +776,8 @@ class JoinTest(QueryTest):
         )
          
         self.assertEquals(
-            sess.query(User, OrderAlias, Item.description).join(('orders', OrderAlias), 'items').filter_by(description='item 3').all(),
+            sess.query(User, OrderAlias, Item.description).join(('orders', OrderAlias), 'items').filter_by(description='item 3').\
+                order_by(User.id, OrderAlias.id).all(),
             [
                 (User(name=u'jack',id=7), Order(address_id=1,description=u'order 1',isopen=0,user_id=7,id=1), u'item 3'), 
                 (User(name=u'jack',id=7), Order(address_id=1,description=u'order 3',isopen=1,user_id=7,id=3), u'item 3'), 
@@ -1268,7 +1270,7 @@ class MixedEntitiesTest(QueryTest):
         ]:
         
             self.assertEquals(
-            q.all(),
+            q.order_by(Order.id, oalias.id).all(),
             [
                 (Order(address_id=1,description=u'order 3',isopen=1,user_id=7,id=3), Order(address_id=1,description=u'order 1',isopen=0,user_id=7,id=1)), 
                 (Order(address_id=None,description=u'order 5',isopen=0,user_id=7,id=5), Order(address_id=1,description=u'order 1',isopen=0,user_id=7,id=1)),