added some of the newer query styles to some inheritance tests. more inheritance...

diff --git a/test/orm/inheritance/magazine.py b/test/orm/inheritance/magazine.py
index 60d690388c3d6a352d1f9d4e1ef0e455f9f033f1..509216d3745d888b38d8f0e488c6a0428ffd22ac 100644 (file)
--- a/test/orm/inheritance/magazine.py
+++ b/test/orm/inheritance/magazine.py
@@ -23,7 +23,7 @@ class Location(BaseObject):
 
     def _set_name(self, name):
         session = create_session()
-        s = session.query(LocationName).selectfirst(location_name_table.c.name==name)
+        s = session.query(LocationName).filter(LocationName.name==name).first()
         session.clear()
         if s is not None:
             self._name = s
@@ -203,7 +203,7 @@ def generate_round_trip_test(use_unions=False, use_joins=False):
 
         session.flush()
         session.clear()
-        p = session.query(Publication).selectone_by(name='Test')
+        p = session.query(Publication).filter(Publication.name=="Test").one()
 
         print p.issues[0].locations[0].magazine.pages
         print [page, page2, page3]

diff --git a/test/orm/inheritance/polymorph.py b/test/orm/inheritance/polymorph.py
index 2aae9eb6a4238a05584411b76ae2b78afc1aa0d6..a3395924f3d43ec76419d894627741668bbf51f0 100644 (file)
--- a/test/orm/inheritance/polymorph.py
+++ b/test/orm/inheritance/polymorph.py
@@ -285,11 +285,11 @@ def generate_round_trip_test(include_base=False, lazy_relation=True, redefine_co
         dilbert2 = session.query(Engineer).filter((palias.c.name=='dilbert') & (palias.c.person_id==Person.person_id)).first()
         assert dilbert is dilbert2
 
-        session.query(Person).selectfirst((engineers.c.engineer_name=="engineer1") & (engineers.c.person_id==people.c.person_id))
-        dilbert2 = session.query(Engineer).selectfirst(engineers.c.engineer_name=="engineer1")
+        session.query(Person).filter((Engineer.engineer_name=="engineer1") & (Engineer.person_id==people.c.person_id)).first()
+        
+        dilbert2 = session.query(Engineer).filter(Engineer.engineer_name=="engineer1")[0]
         assert dilbert is dilbert2
     
-    
         dilbert.engineer_name = 'hes dibert!'
 
         session.flush()

diff --git a/test/orm/inheritance/polymorph2.py b/test/orm/inheritance/polymorph2.py
index 1f5fe128907fbeb1f7553e5df640ff45b33ab6e8..d18539aa10adfa383b8560897c803fc0a4bf7423 100644 (file)
--- a/test/orm/inheritance/polymorph2.py
+++ b/test/orm/inheritance/polymorph2.py
@@ -369,8 +369,8 @@ class RelationTest4(testbase.ORMTest):
 
         session.flush()
 
-        engineer4 = session.query(Engineer).selectfirst_by(name="E4")
-        manager3 = session.query(Manager).selectfirst_by(name="M3")
+        engineer4 = session.query(Engineer).filter(Engineer.name=="E4").first()
+        manager3 = session.query(Manager).filter(Manager.name=="M3").first()
         
         car1 = Car(employee=engineer4)
         session.save(car1)
@@ -402,7 +402,7 @@ class RelationTest4(testbase.ORMTest):
 
         session.clear()
         s = session.query(Car)
-        c = s.join("employee").select(employee_join.c.name=="E4")[0]
+        c = s.join("employee").filter(Person.name=="E4")[0]
         assert c.car_id==car1.car_id
 
 class RelationTest5(testbase.ORMTest):