From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 22 Jul 2007 22:32:58 +0000 (+0000)
Subject: added some of the newer query styles to some inheritance tests.  more inheritance... 
X-Git-Tag: rel_0_4_6~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e5d28f8425bde0165fb1096e6b9bd8b5a0307b6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

added some of the newer query styles to some inheritance tests.  more inheritance + new query stuff needs to be tested
---

diff --git a/test/orm/inheritance/magazine.py b/test/orm/inheritance/magazine.py
index 60d690388c..509216d374 100644
--- 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 2aae9eb6a4..a3395924f3 100644
--- 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 1f5fe12890..d18539aa10 100644
--- 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):