From: Michael Trier <mtrier@gmail.com>
Date: Fri, 12 Dec 2008 01:40:05 +0000 (+0000)
Subject: Broke out a specific values test and indicated that it fails on mssql due to duplicat... 
X-Git-Tag: rel_0_5_0~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7247ca12cfea1be1be93f5d43fe37391622a365b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Broke out a specific values test and indicated that it fails on mssql due to duplicate columns in the order by clause.
---

diff --git a/test/orm/query.py b/test/orm/query.py
index d0acc5e45e..e5de70dc08 100644
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -1523,10 +1523,6 @@ class MixedEntitiesTest(QueryTest):
         q2 = q.values(func.count(User.name))
         assert q2.next() == (4,)
 
-        u2 = aliased(User)
-        q2 = q.select_from(sel).filter(u2.id>1).order_by([User.id, sel.c.id, u2.id]).values(User.name, sel.c.name, u2.name)
-        self.assertEquals(list(q2), [(u'jack', u'jack', u'jack'), (u'jack', u'jack', u'ed'), (u'jack', u'jack', u'fred'), (u'jack', u'jack', u'chuck'), (u'ed', u'ed', u'jack'), (u'ed', u'ed', u'ed'), (u'ed', u'ed', u'fred'), (u'ed', u'ed', u'chuck')])
-        
         q2 = q.select_from(sel).filter(User.id==8).values(User.name, sel.c.name, User.name)
         self.assertEquals(list(q2), [(u'ed', u'ed', u'ed')])
 
@@ -1538,6 +1534,18 @@ class MixedEntitiesTest(QueryTest):
         q2 = q.select_from(sel).filter(users.c.id==8).filter(users.c.id>sel.c.id).values(users.c.name, sel.c.name, User.name)
         self.assertEquals(list(q2), [(u'ed', u'jack', u'jack')])
 
+    @testing.fails_on('mssql')
+    def test_values_specific_order_by(self):
+        sess = create_session()
+
+        assert list(sess.query(User).values()) == list()
+
+        sel = users.select(User.id.in_([7, 8])).alias()
+        q = sess.query(User)
+        u2 = aliased(User)
+        q2 = q.select_from(sel).filter(u2.id>1).order_by([User.id, sel.c.id, u2.id]).values(User.name, sel.c.name, u2.name)
+        self.assertEquals(list(q2), [(u'jack', u'jack', u'jack'), (u'jack', u'jack', u'ed'), (u'jack', u'jack', u'fred'), (u'jack', u'jack', u'chuck'), (u'ed', u'ed', u'jack'), (u'ed', u'ed', u'ed'), (u'ed', u'ed', u'fred'), (u'ed', u'ed', u'chuck')])
+
     @testing.fails_on('mssql')
     def test_values_with_boolean_selects(self):
         """Tests a values clause that works with select boolean evaluations"""