More ORDER BY, now with use_labels.

1 files changed, 45 insertions, 33 deletions

diff --git a/test/sql/query.py b/test/sql/query.py
index 904303db7..118b626f4 100644
--- a/test/sql/query.py
+++ b/test/sql/query.py
@@ -286,41 +286,53 @@ class QueryTest(PersistTest):
             got = list(executable.execute())
             self.assertEquals(got, wanted)
 
-        a_eq(users.select(order_by=[users.c.user_id]),
-             [(1, 'c'), (2, 'b'), (3, 'a')])
+        for labels in False, True:
+            a_eq(users.select(order_by=[users.c.user_id],
+                              use_labels=labels),
+                 [(1, 'c'), (2, 'b'), (3, 'a')])
         
-        a_eq(users.select(order_by=[users.c.user_name, users.c.user_id]),
-             [(3, 'a'), (2, 'b'), (1, 'c')])
-
-        a_eq(select([users.c.user_id.label('foo')], order_by=[users.c.user_id]),
-             [(1,), (2,), (3,)])
+            a_eq(users.select(order_by=[users.c.user_name, users.c.user_id],
+                              use_labels=labels),
+                 [(3, 'a'), (2, 'b'), (1, 'c')])
+
+            a_eq(select([users.c.user_id.label('foo')],
+                        use_labels=labels,
+                        order_by=[users.c.user_id]),
+                 [(1,), (2,), (3,)])
              
-        a_eq(select([users.c.user_id.label('foo'), users.c.user_name],
-                    order_by=[users.c.user_name, users.c.user_id]),
-             [(3, 'a'), (2, 'b'), (1, 'c')])
-
-        a_eq(users.select(distinct=True, order_by=[users.c.user_id]),
-             [(1, 'c'), (2, 'b'), (3, 'a')])
-
-        a_eq(select([users.c.user_id.label('foo')],
-                    distinct=True,
-                    order_by=[users.c.user_id]),
-             [(1,), (2,), (3,)])
-
-        a_eq(select([users.c.user_id.label('a'),
-                     users.c.user_id.label('b'),                     
-                     users.c.user_name],
-                    order_by=[users.c.user_id]),
-             [(1, 1, 'c'), (2, 2, 'b'), (3, 3, 'a')])
-
-        a_eq(users.select(distinct=True, order_by=[desc(users.c.user_id)]),
-             [(3, 'a'), (2, 'b'), (1, 'c')])
-
-        a_eq(select([users.c.user_id.label('foo')],
-                    distinct=True,
-                    order_by=[users.c.user_id.desc()]),
-             [(3,), (2,), (1,)])
-
+            a_eq(select([users.c.user_id.label('foo'), users.c.user_name],
+                        use_labels=labels,
+                        order_by=[users.c.user_name, users.c.user_id]),
+                 [(3, 'a'), (2, 'b'), (1, 'c')])
+
+            a_eq(users.select(distinct=True,
+                              use_labels=labels,
+                              order_by=[users.c.user_id]),
+                 [(1, 'c'), (2, 'b'), (3, 'a')])
+
+            a_eq(select([users.c.user_id.label('foo')],
+                        distinct=True,
+                        use_labels=labels,
+                        order_by=[users.c.user_id]),
+                 [(1,), (2,), (3,)])
+
+            a_eq(select([users.c.user_id.label('a'),
+                         users.c.user_id.label('b'),
+                         users.c.user_name],
+                        use_labels=labels,
+                        order_by=[users.c.user_id]),
+                 [(1, 1, 'c'), (2, 2, 'b'), (3, 3, 'a')])
+
+            a_eq(users.select(distinct=True,
+                              use_labels=labels,
+                              order_by=[desc(users.c.user_id)]),
+                 [(3, 'a'), (2, 'b'), (1, 'c')])
+
+            a_eq(select([users.c.user_id.label('foo')],
+                        distinct=True,
+                        use_labels=labels,
+                        order_by=[users.c.user_id.desc()]),
+                 [(3,), (2,), (1,)])
 
     def test_column_accessor(self):
         users.insert().execute(user_id=1, user_name='john')