diff options
| -rw-r--r-- | lib/sqlalchemy/engine/result.py | 2 | ||||
| -rw-r--r-- | test/orm/test_query.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index af5303658..eccea6daa 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -711,7 +711,7 @@ class ResultMetaData(object): break else: result = None - if result is not None: + if False: # result is not None: if result[MD_OBJECTS] is _UNPICKLED: util.warn_deprecated( "Retreiving row values using Column objects from a " diff --git a/test/orm/test_query.py b/test/orm/test_query.py index 7c4811dc7..d5dddb3aa 100644 --- a/test/orm/test_query.py +++ b/test/orm/test_query.py @@ -4284,12 +4284,15 @@ class TextTest(QueryTest, AssertsCompiledSQL): s = create_session() q = ( s.query(User) - .from_statement(text("select * from users ORDER BY users.id")) + .from_statement(text("select * from users")) .options(subqueryload(User.addresses)) ) + # we can't ORDER BY in this test because SQL server won't let the + # ORDER BY work inside the subqueryload; the test needs to use + # subqueryload (not selectinload) to confirm the feature def go(): - eq_(q.all(), self.static.user_address_result) + eq_(set(q.all()), set(self.static.user_address_result)) self.assert_sql_count(testing.db, go, 2) |