fix order by for MySQL environment

diff --git a/test/orm/query.py b/test/orm/query.py
index 4589cf9635a0f037f5949467370aa5b3bde2a819..9245d43f348cdf1b0453a4aa8864f8d7036f1d50 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -678,7 +678,7 @@ class JoinTest(QueryTest):
         ]
         
         q = sess.query(Order)
-        q = q.add_entity(Item).select_from(join(Order, Item, 'items'))
+        q = q.add_entity(Item).select_from(join(Order, Item, 'items')).order_by(Order.id, Item.id)
         l = q.all()
         self.assertEquals(l, expected)
 

diff --git a/test/sql/select.py b/test/sql/select.py
index 08faae096865315131c9fedb65e69f93bcb767ca..bea8621121be7f72272399fb71c80f4aca81e65c 100644 (file)
--- a/test/sql/select.py
+++ b/test/sql/select.py
@@ -683,6 +683,8 @@ WHERE mytable.myid = myothertable.otherid) AS t2view WHERE t2view.mytable_myid =
                 checkparams={'bar':4, 'whee': 7},
                 dialect=dialect
         )
+        
+        # test escaping out text() params with a backslash
         self.assert_compile(
             text("select * from foo where clock='05:06:07' and mork='\:mindy'"),
             "select * from foo where clock='05:06:07' and mork=':mindy'",