[Sqlalchemy-commits] sqlalchemy: Corrected order by in test joins.

[<co...@sq...>]

details:   http://hg.sqlalchemy.org/sqlalchemy/sqlalchemy/rev/5bba0fb5320b
changeset: 7393:5bba0fb5320b
user:      Denise Govindarajan <den...@pc...>
date:      Mon Mar 14 11:44:38 2011 -0400
description:
Corrected order by in test joins.
Subject: sqlalchemy: Fixed order_by in test.orm.test_froms.MixedEntitiesTest.test_values.

details:   http://hg.sqlalchemy.org/sqlalchemy/sqlalchemy/rev/3ba680851db4
changeset: 7394:3ba680851db4
user:      Jim Phares <jim...@pc...>
date:      Mon Mar 14 11:51:38 2011 -0400
description:
Fixed order_by in test.orm.test_froms.MixedEntitiesTest.test_values.
Subject: sqlalchemy: Merge

details:   http://hg.sqlalchemy.org/sqlalchemy/sqlalchemy/rev/f0a7b2162dcd
changeset: 7395:f0a7b2162dcd
user:      Michael Trier <mt...@gm...>
date:      Mon Mar 14 12:04:36 2011 -0400
description:
Merge

diffstat:

 test/orm/test_froms.py |  6 +++---
 test/orm/test_joins.py |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 7b0d009f3847 -r f0a7b2162dcd test/orm/test_froms.py
--- a/test/orm/test_froms.py	Mon Mar 14 11:20:01 2011 -0400
+++ b/test/orm/test_froms.py	Mon Mar 14 12:04:36 2011 -0400
@@ -697,10 +697,10 @@
 
         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...@wo...'), (u'ed', u'ed...@be...'), 
-                        (u'ed', u'ed...@la...'), (u'fred', u'fr...@fr...')])
+        eq_(list(q2), [(u'ed', u'ed...@be...'), (u'ed', u'ed...@la...'),
+                       (u'ed', u'ed...@wo...'), (u'fred', u'fr...@fr...')])
 
         q2 = q.values(func.count(User.name))
         assert q2.next() == (4,)
diff -r 7b0d009f3847 -r f0a7b2162dcd test/orm/test_joins.py
--- a/test/orm/test_joins.py	Mon Mar 14 11:20:01 2011 -0400
+++ b/test/orm/test_joins.py	Mon Mar 14 12:04:36 2011 -0400
@@ -895,7 +895,7 @@
         # this is the first test where we are joining "backwards" - from AdAlias to User even though
         # the query is against User
         q = sess.query(User, AdAlias)
-        l = q.join(AdAlias.user).filter(User.name=='ed')
+        l = q.join(AdAlias.user).filter(User.name=='ed').order_by(User.id, AdAlias.id)
         eq_(l.all(), [(user8, address2),(user8, address3),(user8, address4),])
 
         q = sess.query(User, AdAlias).select_from(join(AdAlias, User, AdAlias.user)).filter(User.name=='ed')