- Actually fixed that testcascade issue. And friends- looks like a cut-n-paste-o.

diff --git a/test/orm/entity.py b/test/orm/entity.py
index 3570001213d06cef502d14ccfedeaffed20a70d5..ef0932032f0a09a2dacd1f79eff509cef2941d2a 100644 (file)
--- a/test/orm/entity.py
+++ b/test/orm/entity.py
@@ -121,8 +121,8 @@ class EntityTest(AssertMixin):
         sess.flush()
         assert user1.select().execute().fetchall() == [(u1.user_id, u1.name)]
         assert user2.select().execute().fetchall() == [(u2.user_id, u2.name)]
-        assert address1.select().execute().fetchall() == [(u1.user_id, a1.user_id, 'a1@foo.com')]
-        assert address2.select().execute().fetchall() == [(u2.user_id, a2.user_id, 'a2@foo.com')]
+        assert address1.select().execute().fetchall() == [(a1.address_id, u1.user_id, 'a1@foo.com')]
+        assert address2.select().execute().fetchall() == [(a1.address_id, u2.user_id, 'a2@foo.com')]
 
         sess.clear()
         u1list = sess.query(User, entity_name='user1').select()
@@ -161,8 +161,8 @@ class EntityTest(AssertMixin):
         ctx.current.flush()
         assert user1.select().execute().fetchall() == [(u1.user_id, u1.name)]
         assert user2.select().execute().fetchall() == [(u2.user_id, u2.name)]
-        assert address1.select().execute().fetchall() == [(u1.user_id, a1.user_id, 'a1@foo.com')]
-        assert address2.select().execute().fetchall() == [(u2.user_id, a2.user_id, 'a2@foo.com')]
+        assert address1.select().execute().fetchall() == [(a1.address_id, u1.user_id, 'a1@foo.com')]
+        assert address2.select().execute().fetchall() == [(a1.address_id, u2.user_id, 'a2@foo.com')]
 
         ctx.current.clear()
         u1list = ctx.current.query(User, entity_name='user1').select()