summaryrefslogtreecommitdiff
path: root/test/orm/inheritance/test_polymorph2.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-03-24 19:11:01 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-03-24 19:11:01 -0400
commit1675811029553501bb23084604c64d974dfe739c (patch)
tree7e3c29f55c562aab06a48b6b4727f59156ed6722 /test/orm/inheritance/test_polymorph2.py
parent290a1596ce6f806aa6f25dd754cf0d2197f160ff (diff)
downloadsqlalchemy-1675811029553501bb23084604c64d974dfe739c.tar.gz
- To accomodate the fact that there are now two kinds of eager
loading available, the new names for eagerload() and eagerload_all() are joinedload() and joinedload_all(). The old names will remain as synonyms for the foreseeable future. - The "lazy" flag on the relationship() function now accepts a string argument for all kinds of loading: "select", "joined", "subquery", "noload" and "dynamic", where the default is now "select". The old values of True/ False/None still retain their usual meanings and will remain as synonyms for the foreseeable future. - Added documentation to tutorial,mapper doc, api docs for subqueryload, subqueryload_all, and other options.
Diffstat (limited to 'test/orm/inheritance/test_polymorph2.py')
-rw-r--r--test/orm/inheritance/test_polymorph2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/orm/inheritance/test_polymorph2.py b/test/orm/inheritance/test_polymorph2.py
index 94939b33c..ffe6201de 100644
--- a/test/orm/inheritance/test_polymorph2.py
+++ b/test/orm/inheritance/test_polymorph2.py
@@ -384,7 +384,7 @@ class RelationshipTest4(_base.MappedTest):
session.expunge_all()
def go():
- testcar = session.query(Car).options(eagerload('employee')).get(car1.car_id)
+ testcar = session.query(Car).options(joinedload('employee')).get(car1.car_id)
assert str(testcar.employee) == "Engineer E4, status X"
self.assert_sql_count(testing.db, go, 1)
@@ -407,7 +407,7 @@ class RelationshipTest4(_base.MappedTest):
# and now for the lightning round, eager !
def go():
- testcar = session.query(Car).options(eagerload('employee')).get(car1.car_id)
+ testcar = session.query(Car).options(joinedload('employee')).get(car1.car_id)
assert str(testcar.employee) == "Engineer E4, status X"
self.assert_sql_count(testing.db, go, 1)