summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2005-09-22 04:22:57 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2005-09-22 04:22:57 +0000
commit2ca795bad6da650ff1920be61d16131a033a1c84 (patch)
tree013103fa7024db94f83af734a21b842372cd17e1
parentfb74b7a8bc524496d7de0923df843a093a235c6f (diff)
downloadsqlalchemy-2ca795bad6da650ff1920be61d16131a033a1c84.tar.gz
-rw-r--r--test/objectstore.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/objectstore.py b/test/objectstore.py
index 4f9b63902..ad75fb74f 100644
--- a/test/objectstore.py
+++ b/test/objectstore.py
@@ -102,18 +102,18 @@ class SaveTest(AssertMixin):
objectstore.uow().commit()
- usertable = engine.ResultProxy(users.select(users.c.user_id.in_(u.foo_id)).execute()).fetchall()
+ usertable = engine.ResultProxy(users.select(users.c.user_id.in_(u.foo_id)).execute(), users.engine).fetchall()
self.assert_(usertable[0].row == (u.foo_id, 'multitester'))
- addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id.in_(u.address_id)).execute()).fetchall()
+ addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id.in_(u.address_id)).execute(), users.engine).fetchall()
self.assert_(addresstable[0].row == (u.address_id, u.foo_id, 'multi@test.org'))
u.email = 'lala@hey.com'
u.user_name = 'imnew'
objectstore.uow().commit()
- usertable = engine.ResultProxy(users.select(users.c.user_id.in_(u.foo_id)).execute()).fetchall()
+ usertable = engine.ResultProxy(users.select(users.c.user_id.in_(u.foo_id)).execute(), users.engine).fetchall()
self.assert_(usertable[0].row == (u.foo_id, 'imnew'))
- addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id.in_(u.address_id)).execute()).fetchall()
+ addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id.in_(u.address_id)).execute(), users.engine).fetchall()
self.assert_(addresstable[0].row == (u.address_id, u.foo_id, 'lala@hey.com'))
u = m.select(users.c.user_id==u.foo_id)[0]
@@ -243,7 +243,7 @@ class SaveTest(AssertMixin):
objectstore.uow().commit()
return
l = sql.select([users, addresses], sql.and_(users.c.user_id==addresses.c.address_id, addresses.c.address_id==a.address_id)).execute()
- r = engine.ResultProxy(l)
+ r = engine.ResultProxy(l, users.engine)
print repr(r.fetchone().row)
def testonetomany(self):
@@ -265,9 +265,9 @@ class SaveTest(AssertMixin):
print repr(u.addresses.added_items())
objectstore.uow().commit()
- usertable = engine.ResultProxy(users.select(users.c.user_id.in_(u.user_id)).execute()).fetchall()
+ usertable = engine.ResultProxy(users.select(users.c.user_id.in_(u.user_id)).execute(), users.engine).fetchall()
self.assert_(usertable[0].row == (u.user_id, 'one2manytester'))
- addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id.in_(a.address_id, a2.address_id), order_by=[addresses.c.email_address]).execute()).fetchall()
+ addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id.in_(a.address_id, a2.address_id), order_by=[addresses.c.email_address]).execute(), users.engine).fetchall()
self.assert_(addresstable[0].row == (a2.address_id, u.user_id, 'lala@test.org'))
self.assert_(addresstable[1].row == (a.address_id, u.user_id, 'one2many@test.org'))
@@ -278,7 +278,7 @@ class SaveTest(AssertMixin):
objectstore.uow().commit()
- addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id == addressid).execute()).fetchall()
+ addresstable = engine.ResultProxy(addresses.select(addresses.c.address_id == addressid).execute(), addresses.engine).fetchall()
self.assert_(addresstable[0].row == (addressid, userid, 'somethingnew@foo.com'))
self.assert_(u.user_id == userid and a2.address_id == addressid)