From: Mike Bayer Date: Sun, 18 Oct 2009 22:50:14 +0000 (+0000) Subject: attempt to fix some jython ordering annoyingness X-Git-Tag: rel_0_6beta1~242 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b252fc249d1e23bc7781bf6cacd0add10a476244;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git attempt to fix some jython ordering annoyingness --- diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py index 8618a7fe8e..397be9843f 100644 --- a/test/orm/test_eager_relations.py +++ b/test/orm/test_eager_relations.py @@ -10,6 +10,7 @@ from sqlalchemy.orm import mapper, relation, create_session, lazyload, aliased from sqlalchemy.test.testing import eq_ from sqlalchemy.test.assertsql import CompiledSQL from test.orm import _base, _fixtures +from sqlalchemy.util import OrderedDict as odict import datetime class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL): @@ -576,13 +577,13 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL): def test_manytoone_limit(self): """test that the subquery wrapping only occurs with limit/offset and m2m or o2m joins present.""" - mapper(User, users, properties={ - 'orders':relation(Order, backref='user') - }) - mapper(Order, orders, properties={ - 'items':relation(Item, secondary=order_items, backref='orders'), - 'address':relation(Address) - }) + mapper(User, users, properties=odict( + orders=relation(Order, backref='user') + )) + mapper(Order, orders, properties=odict( + items=relation(Item, secondary=order_items, backref='orders'), + address=relation(Address) + )) mapper(Address, addresses) mapper(Item, items)