diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-24 19:11:01 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-24 19:11:01 -0400 |
| commit | 1675811029553501bb23084604c64d974dfe739c (patch) | |
| tree | 7e3c29f55c562aab06a48b6b4727f59156ed6722 /test/orm/test_merge.py | |
| parent | 290a1596ce6f806aa6f25dd754cf0d2197f160ff (diff) | |
| download | sqlalchemy-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/test_merge.py')
| -rw-r--r-- | test/orm/test_merge.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py index 9f8861ad8..e80b92699 100644 --- a/test/orm/test_merge.py +++ b/test/orm/test_merge.py @@ -708,7 +708,7 @@ class MergeTest(_fixtures.FixtureTest): sess.flush() sess2 = create_session() - u2 = sess2.query(User).options(sa.orm.eagerload('addresses')).get(7) + u2 = sess2.query(User).options(sa.orm.joinedload('addresses')).get(7) sess3 = create_session() u3 = sess3.merge(u2, load=False) |