try to bang mysql tests to work

diff --git a/test/orm/query.py b/test/orm/query.py
index efd890e0e83cbf70e8d1db8a4593d77a61c02300..1dc50ebbb10e573979fb85995bdd016b4777dec9 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -965,7 +965,7 @@ class SelectFromTest(QueryTest):
         sel = users.select(users.c.id.in_([7, 8]))
         sess = create_session()
 
-        self.assertEquals(sess.query(User).select_from(sel).join('addresses').add_entity(Address).all(), 
+        self.assertEquals(sess.query(User).select_from(sel).join('addresses').add_entity(Address).order_by(User.id).order_by(Address.id).all(), 
             [
                 (User(name='jack',id=7), Address(user_id=7,email_address='jack@bean.com',id=1)), 
                 (User(name='ed',id=8), Address(user_id=8,email_address='ed@wood.com',id=2)), 
@@ -974,7 +974,7 @@ class SelectFromTest(QueryTest):
             ]
         )
 
-        self.assertEquals(sess.query(User).select_from(sel).join('addresses', aliased=True).add_entity(Address).all(), 
+        self.assertEquals(sess.query(User).select_from(sel).join('addresses', aliased=True).add_entity(Address).order_by(User.id).order_by(Address.id).all(), 
             [
                 (User(name='jack',id=7), Address(user_id=7,email_address='jack@bean.com',id=1)), 
                 (User(name='ed',id=8), Address(user_id=8,email_address='ed@wood.com',id=2)), 
@@ -991,7 +991,7 @@ class SelectFromTest(QueryTest):
             'items':relation(Item, secondary=order_items, order_by=items.c.id),  #m2m
         })
         mapper(Item, items, properties={
-            'keywords':relation(Keyword, secondary=item_keywords) #m2m
+            'keywords':relation(Keyword, secondary=item_keywords, order_by=keywords.c.id) #m2m
         })
         mapper(Keyword, keywords)
         

diff --git a/test/sql/query.py b/test/sql/query.py
index d0b24a9cce1326012381df97332047daad5b12f7..56742794c95a79ae8e70ba7b886e80e1c5eaa74c 100644 (file)
--- a/test/sql/query.py
+++ b/test/sql/query.py
@@ -264,7 +264,7 @@ class QueryTest(PersistTest):
         r = users.select(offset=5, order_by=[users.c.user_id]).execute().fetchall()
         self.assert_(r==[(6, 'ralph'), (7, 'fido')])
 
-    @testing.exclude('mysql', '<', (5, 0, 0))
+    @testing.exclude('mysql', '<', (5, 1, 0))
     def test_scalar_select(self):
         """test that scalar subqueries with labels get their type propigated to the result set."""
         # mysql and/or mysqldb has a bug here, type isn't propagated for scalar