- 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.

2 files changed, 5 insertions, 5 deletions

diff --git a/test/perf/masseagerload.py b/test/perf/masseagerload.py
index 3d251c816..ab3f00fa4 100644
--- a/test/perf/masseagerload.py
+++ b/test/perf/masseagerload.py
@@ -35,8 +35,8 @@ def load():
         #print l
         subitems.insert().execute(*l)
 
-@profiling.profiled('masseagerload', always=True, sort=['cumulative'])
-def masseagerload(session):
+@profiling.profiled('massjoinedload', always=True, sort=['cumulative'])
+def massjoinedload(session):
     session.begin()
     query = session.query(Item)
     l = query.all()
@@ -46,7 +46,7 @@ def all():
     meta.create_all()
     try:
         load()
-        masseagerload(create_session())
+        massjoinedload(create_session())
     finally:
         meta.drop_all()
 
diff --git a/test/perf/ormsession.py b/test/perf/ormsession.py
index fc3e2e206..0df440aab 100644
--- a/test/perf/ormsession.py
+++ b/test/perf/ormsession.py
@@ -152,8 +152,8 @@ def run_queries():
     q = session.query(Purchase). \
         order_by(desc(Purchase.purchase_date)). \
         limit(50).\
-        options(eagerload('items'), eagerload('items.subitems'),
-                eagerload('customer'))
+        options(joinedload('items'), joinedload('items.subitems'),
+                joinedload('customer'))
 
     report = []
     # "write" the report.  pretend it's going to a web template or something,