diff options
| author | Michael Trier <mtrier@gmail.org> | 2011-03-14 12:04:36 -0400 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.org> | 2011-03-14 12:04:36 -0400 |
| commit | c594b58f0b8cf72d49cc6bf748b5e4851a1f9c2c (patch) | |
| tree | 59cfd359e8fcbd28b90cd9b2c5938814b9632372 | |
| parent | febb7b1ed66e4efbdc5a6e7c2a70be43da30eb99 (diff) | |
| parent | b327b981be9b55626bbce4091fc08b9588bd0d18 (diff) | |
| download | sqlalchemy-c594b58f0b8cf72d49cc6bf748b5e4851a1f9c2c.tar.gz | |
Merge
| -rw-r--r-- | test/orm/test_froms.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/orm/test_froms.py b/test/orm/test_froms.py index 707f11426..30579b93f 100644 --- a/test/orm/test_froms.py +++ b/test/orm/test_froms.py @@ -697,10 +697,10 @@ class MixedEntitiesTest(QueryTest, AssertsCompiledSQL): adalias = aliased(Address) q2 = q.join(adalias, 'addresses').\ - filter(User.name.like('%e%')).\ + filter(User.name.like('%e%')).order_by(adalias.email_address).\ values(User.name, adalias.email_address) - eq_(list(q2), [(u'ed', u'ed@wood.com'), (u'ed', u'ed@bettyboop.com'), - (u'ed', u'ed@lala.com'), (u'fred', u'fred@fred.com')]) + eq_(list(q2), [(u'ed', u'ed@bettyboop.com'), (u'ed', u'ed@lala.com'), + (u'ed', u'ed@wood.com'), (u'fred', u'fred@fred.com')]) q2 = q.values(func.count(User.name)) assert q2.next() == (4,) |