From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 2 Feb 2014 19:40:23 +0000 (-0500)
Subject: - use from_statement() for the ORM column test
X-Git-Tag: rel_0_9_2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ed4266803cbba480e5785103302eba5b5a86652;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- use from_statement() for the ORM column test
- with select_from(), add external order by so that Oracle orders correctly
---

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index 07cb24cb62..dbac48580b 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -2092,31 +2092,30 @@ class TextTest(QueryTest):
             [User(id=7), User(id=8), User(id=9), User(id=10)]
         )
 
-    def test_via_textasfrom_select_from(self):
+    def test_via_textasfrom_use_mapped_columns(self):
         User = self.classes.User
         s = create_session()
 
         eq_(
-            s.query(User).select_from(
+            s.query(User).from_statement(
                 text("select * from users order by id").\
-                        columns(id=Integer, name=String)
+                        columns(User.id, User.name)
             ).all(),
             [User(id=7), User(id=8), User(id=9), User(id=10)]
         )
 
-    def test_via_textasfrom_use_mapped_columns(self):
+    def test_via_textasfrom_select_from(self):
         User = self.classes.User
         s = create_session()
 
         eq_(
             s.query(User).select_from(
-                text("select * from users order by id").\
-                        columns(User.id, User.name)
-            ).all(),
+                text("select * from users").\
+                        columns(id=Integer, name=String)
+            ).order_by(User.id).all(),
             [User(id=7), User(id=8), User(id=9), User(id=10)]
         )
 
-
 class ParentTest(QueryTest, AssertsCompiledSQL):
     __dialect__ = 'default'