From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 26 Apr 2008 20:18:31 +0000 (+0000)
Subject: fix order by for MySQL environment
X-Git-Tag: rel_0_5beta1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3560379ff742f63937ecd9b81d30ac6f0e92f629;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix order by for MySQL environment
---

diff --git a/test/orm/query.py b/test/orm/query.py
index 4589cf9635..9245d43f34 100644
--- 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 08faae0968..bea8621121 100644
--- 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'",