- improved support for eagerloading of properties off of mappers that are mapped

to select() statements; i.e. eagerloader is better at locating the correct
selectable with which to attach its LEFT OUTER JOIN.
- some fixes to new tests in inheritance5 to work with postgres

1 files changed, 2 insertions, 2 deletions

diff --git a/test/orm/inheritance5.py b/test/orm/inheritance5.py
index 1c4214635..56a83f575 100644
--- a/test/orm/inheritance5.py
+++ b/test/orm/inheritance5.py
@@ -706,7 +706,7 @@ class GenerativeTest(testbase.AssertMixin):
             # into the WHERE criterion, using a correlated select. ticket #577 tracks 
             # that Query's adaptation of the WHERE clause does not dig into the 
             # mapped selectable itself, which permanently breaks the mapped selectable.
-            r = session.query(Person).filter(Car.c.owner == select([Car.c.owner], Car.c.owner==employee_join.c.person_id))
+            r = session.query(Person).filter(exists([Car.c.owner], Car.c.owner==employee_join.c.person_id))
             assert str(list(r)) == "[Engineer E4, field X, status Status dead]"
         
 class MultiLevelTest(testbase.ORMTest):
@@ -878,7 +878,7 @@ class CustomPKTest(testbase.ORMTest):
         
         # query using get(), using only one value.  this requires the select_table mapper
         # has the same single-col primary key.
-        assert sess.query(T1).get(ot1.id).id is ot1.id
+        assert sess.query(T1).get(ot1.id).id == ot1.id
         
         ot1 = sess.query(T1).get(ot1.id)
         ot1.data = 'hi'