]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- converted all lazy=True|False|None to 'select'|'joined'|'noload'
authorMike Bayer <mike_mp@zzzcomputing.com>
Wed, 24 Mar 2010 23:19:03 +0000 (19:19 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 24 Mar 2010 23:19:03 +0000 (19:19 -0400)
- converted all eager to joined in examples
- fixed beaker/advanced.py to reference RelationshipCache

34 files changed:
examples/adjacency_list/adjacency_list.py
examples/association/basic_association.py
examples/association/proxied_association.py
examples/beaker_caching/advanced.py
examples/beaker_caching/relation_caching.py
examples/elementtree/adjacency_list.py
examples/elementtree/optimized_al.py
examples/inheritance/polymorph.py
test/ext/test_associationproxy.py
test/ext/test_orderinglist.py
test/orm/inheritance/test_basic.py
test/orm/inheritance/test_magazine.py
test/orm/inheritance/test_manytomany.py
test/orm/inheritance/test_poly_linked_list.py
test/orm/inheritance/test_polymorph2.py
test/orm/inheritance/test_productspec.py
test/orm/test_association.py
test/orm/test_assorted_eager.py
test/orm/test_cascade.py
test/orm/test_compile.py
test/orm/test_cycles.py
test/orm/test_eager_relations.py
test/orm/test_expire.py
test/orm/test_lazy_relations.py
test/orm/test_manytomany.py
test/orm/test_mapper.py
test/orm/test_query.py
test/orm/test_relationships.py
test/orm/test_subquery_relations.py
test/orm/test_unitofwork.py
test/perf/masseagerload.py
test/perf/objupdatespeed.py
test/perf/ormsession.py
test/zblog/mappers.py

index 494ae1c273cd0f47c3b3baad4ff0bd8d7a12298d..6242398699dd452e7607edc028bc6db0a7cc3f12 100644 (file)
@@ -2,7 +2,7 @@ from sqlalchemy import MetaData, Table, Column, Sequence, ForeignKey,\
                         Integer, String, create_engine
                         
 from sqlalchemy.orm import sessionmaker, mapper, relationship, backref,\
-                                eagerload_all
+                                joinedload_all
                                 
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
@@ -119,7 +119,7 @@ if __name__ == '__main__':
         "selecting tree on root, using eager loading to join four levels deep.")
     session.expunge_all()
     node = session.query(TreeNode).\
-                        options(eagerload_all("children", "children", 
+                        options(joinedload_all("children", "children", 
                                                 "children", "children")).\
                         filter(TreeNode.name=="rootnode").\
                         first()
index 83f53e000e9bc3b2d60c6bd9016171548c45b907..7e94ef7fedd30f124b420d1af9bf9d814ce0b16e 100644 (file)
@@ -67,7 +67,7 @@ mapper(Order, orders, properties={
 })
 mapper(Item, items)
 mapper(OrderItem, orderitems, properties={
-    'item': relationship(Item, lazy=False)
+    'item': relationship(Item, lazy='joined')
 })
 
 session = create_session()
index 68f8450a5d605c63d3b90efe30dbe35ee91ae410..3139b09736b8829547cea97956d44752c0972f8e 100644 (file)
@@ -48,11 +48,11 @@ class Item(object):
 
 
 mapper(Order, orders, properties={
-    'itemassociations':relationship(OrderItem, cascade="all, delete-orphan", lazy=False)
+    'itemassociations':relationship(OrderItem, cascade="all, delete-orphan", lazy='joined')
 })
 mapper(Item, items)
 mapper(OrderItem, orderitems, properties={
-    'item':relationship(Item, lazy=False)
+    'item':relationship(Item, lazy='joined')
 })
 
 session = create_session()
index 8e3361b1e4e8c7b52684c86aa9b44575ff8ac8c6..e14b969738f4218c23bf7fffed0f67b264201801 100644 (file)
@@ -8,8 +8,8 @@ and collection caching.
 
 import environment
 from model import Person, Address, cache_address_bits
-from meta import Session, FromCache, RelationCache
-from sqlalchemy.orm import eagerload
+from meta import Session, FromCache, RelationshipCache
+from sqlalchemy.orm import joinedload
 
 def load_name_range(start, end, invalidate=False):
     """Load Person objects on a range of names.
@@ -22,7 +22,7 @@ def load_name_range(start, end, invalidate=False):
     
     The `Person.addresses` collections are also cached.  Its basically
     another level of tuning here, as that particular cache option
-    can be transparently replaced with eagerload(Person.addresses). 
+    can be transparently replaced with joinedload(Person.addresses). 
     The effect is that each Person and his/her Address collection
     is cached either together or separately, affecting the kind of
     SQL that emits for unloaded Person objects as well as the distribution
@@ -35,13 +35,13 @@ def load_name_range(start, end, invalidate=False):
 
     # have the "addresses" collection cached separately
     # each lazyload of Person.addresses loads from cache.
-    q = q.options(RelationCache("default", "by_person", Person.addresses))
+    q = q.options(RelationshipCache("default", "by_person", Person.addresses))
     
     # alternatively, eagerly load the "addresses" collection, so that they'd
     # be cached together.   This issues a bigger SQL statement and caches
     # a single, larger value in the cache per person rather than two
     # separate ones.
-    #q = q.options(eagerload(Person.addresses))
+    #q = q.options(joinedload(Person.addresses))
     
     # if requested, invalidate the cache on current criterion.
     if invalidate:
index f5f0fad69c3b3828528b20816bb7e057f886910f..100f5412d5a615c35d53f4749ced1a3c1a1cc25e 100644 (file)
@@ -8,10 +8,10 @@ term cache.
 import environment
 from model import Person, Address, cache_address_bits
 from meta import Session
-from sqlalchemy.orm import eagerload
+from sqlalchemy.orm import joinedload
 import os
 
-for p in Session.query(Person).options(eagerload(Person.addresses), cache_address_bits):
+for p in Session.query(Person).options(joinedload(Person.addresses), cache_address_bits):
     print p.format_full()
 
 
index ad0f3f607197ba3918f50b854aec3afc673bffb0..78d71f3fe9edff673cefcd911bdd4685ad8e04ca 100644 (file)
@@ -79,13 +79,13 @@ class _Attribute(object):
 
 # setup mappers.  Document will eagerly load a list of _Node objects.
 mapper(Document, documents, properties={
-    '_root':relationship(_Node, lazy=False, cascade="all")
+    '_root':relationship(_Node, lazy='joined', cascade="all")
 })
 
 mapper(_Node, elements, properties={
     'children':relationship(_Node, cascade="all"),
     # eagerly load attributes
-    'attributes':relationship(_Attribute, lazy=False, cascade="all, delete-orphan"),
+    'attributes':relationship(_Attribute, lazy='joined', cascade="all, delete-orphan"),
 })
 
 mapper(_Attribute, attributes)
index 9cd2acc3099b7d10bfb33747484a38d0982995ef..98c4e1129779273a397640b42bc9da76e2164ebf 100644 (file)
@@ -80,7 +80,7 @@ class _Attribute(object):
 # they will be ordered in primary key/insert order, so that we can reconstruct
 # an ElementTree structure from the list.
 mapper(Document, documents, properties={
-    '_nodes':relationship(_Node, lazy=False, cascade="all, delete-orphan")
+    '_nodes':relationship(_Node, lazy='joined', cascade="all, delete-orphan")
 })
 
 # the _Node objects change the way they load so that a list of _Nodes will organize
@@ -89,7 +89,7 @@ mapper(Document, documents, properties={
 # ordering to rows which will suffice.
 mapper(_Node, elements, properties={
     'children':relationship(_Node, lazy=None),  # doesnt load; used only for the save relationship
-    'attributes':relationship(_Attribute, lazy=False, cascade="all, delete-orphan"), # eagerly load attributes
+    'attributes':relationship(_Attribute, lazy='joined', cascade="all, delete-orphan"), # eagerly load attributes
 })
 
 mapper(_Attribute, attributes)
index 3ebcd6efe08a87dd5bb16de67d13d0be1962fbe2..7ca207f9fd779014d3a8eb0235282becfb4195cb 100644 (file)
@@ -61,7 +61,7 @@ mapper(Engineer, engineers, inherits=person_mapper, polymorphic_identity='engine
 mapper(Manager, managers, inherits=person_mapper, polymorphic_identity='manager')
 
 mapper(Company, companies, properties={
-    'employees': relationship(Person, lazy=False, backref='company', cascade="all, delete-orphan")
+    'employees': relationship(Person, lazy='joined', backref='company', cascade="all, delete-orphan")
 })
 
 session = create_session()
index ea1864c92550dd642d0a2f9649dc7317d39580d8..df51c322b35240cacefdba94514d53b29923c413 100644 (file)
@@ -91,7 +91,7 @@ class _CollectionOperations(TestBase):
                     self.name = name
 
         mapper(Parent, parents_table, properties={
-            '_children': relationship(Child, lazy=False,
+            '_children': relationship(Child, lazy='joined',
                                   collection_class=collection_class)})
         mapper(Child, children_table)
 
@@ -654,7 +654,7 @@ class ProxyFactoryTest(ListTest):
                 self.name = name
 
         mapper(Parent, parents_table, properties={
-            '_children': relationship(Child, lazy=False,
+            '_children': relationship(Child, lazy='joined',
                                   collection_class=list)})
         mapper(Child, children_table)
 
@@ -701,7 +701,7 @@ class ScalarTest(TestBase):
                     setattr(self, attr, kw[attr])
 
         mapper(Parent, parents_table, properties={
-            'child': relationship(Child, lazy=False,
+            'child': relationship(Child, lazy='joined',
                               backref='parent', uselist=False)})
         mapper(Child, children_table)
 
@@ -836,7 +836,7 @@ class LazyLoadTest(TestBase):
         Parent, Child = self.Parent, self.Child
 
         mapper(Parent, self.table, properties={
-            '_children': relationship(Child, lazy=True,
+            '_children': relationship(Child, lazy='select',
                                   collection_class=list)})
 
         p = Parent('p')
@@ -854,7 +854,7 @@ class LazyLoadTest(TestBase):
         Parent, Child = self.Parent, self.Child
 
         mapper(Parent, self.table, properties={
-            '_children': relationship(Child, lazy=False,
+            '_children': relationship(Child, lazy='joined',
                                   collection_class=list)})
 
         p = Parent('p')
@@ -869,7 +869,7 @@ class LazyLoadTest(TestBase):
         Parent, Child = self.Parent, self.Child
 
         mapper(Parent, self.table, properties={
-            '_children': relationship(Child, lazy=True, uselist=False)})
+            '_children': relationship(Child, lazy='select', uselist=False)})
 
 
         p = Parent('p')
@@ -884,7 +884,7 @@ class LazyLoadTest(TestBase):
         Parent, Child = self.Parent, self.Child
 
         mapper(Parent, self.table, properties={
-            '_children': relationship(Child, lazy=False, uselist=False)})
+            '_children': relationship(Child, lazy='joined', uselist=False)})
 
 
         p = Parent('p')
index 479e44d63ec02bfbc6823386775941143278499d..96c1c90cf566dccdee13eba6dcf4ea7ba9073798 100644 (file)
@@ -77,7 +77,7 @@ class OrderingListTest(TestBase):
                 return '<Bullet "%s" pos %s>' % (self.text, self.position)
 
         mapper(Slide, slides_table, properties={
-            'bullets': relationship(Bullet, lazy=False,
+            'bullets': relationship(Bullet, lazy='joined',
                                 collection_class=test_collection_class,
                                 backref='slide',
                                 order_by=[bullets_table.c.position])
index 904660e775523284d92495742ea238a827cb34d5..2f9295e17e8170ef7de497d4475707d4e29ef404 100644 (file)
@@ -383,8 +383,8 @@ class EagerLazyTest(_base.MappedTest):
 
         foos = mapper(Foo, foo)
         bars = mapper(Bar, bar, inherits=foos)
-        bars.add_property('lazy', relationship(foos, bar_foo, lazy=True))
-        bars.add_property('eager', relationship(foos, bar_foo, lazy=False))
+        bars.add_property('lazy', relationship(foos, bar_foo, lazy='select'))
+        bars.add_property('eager', relationship(foos, bar_foo, lazy='joined'))
 
         foo.insert().execute(data='foo1')
         bar.insert().execute(id=1, data='bar1')
@@ -492,7 +492,7 @@ class FlushTest(_base.MappedTest):
         class Admin(User):pass
         role_mapper = mapper(Role, roles)
         user_mapper = mapper(User, users, properties = {
-                'roles' : relationship(Role, secondary=user_roles, lazy=False)
+                'roles' : relationship(Role, secondary=user_roles, lazy='joined')
             }
         )
         admin_mapper = mapper(Admin, admins, inherits=user_mapper)
@@ -528,7 +528,7 @@ class FlushTest(_base.MappedTest):
 
         role_mapper = mapper(Role, roles)
         user_mapper = mapper(User, users, properties = {
-                'roles' : relationship(Role, secondary=user_roles, lazy=False)
+                'roles' : relationship(Role, secondary=user_roles, lazy='joined')
             }
         )
 
index 27f6e3753d0df856a1ac7a6cfceff4b11ebb15e2..36ac7f91920b78440cfab90020bb6ec4b9277728 100644 (file)
@@ -132,7 +132,7 @@ def generate_round_trip_test(use_unions=False, use_joins=False):
         location_name_mapper = mapper(LocationName, location_name_table)
 
         location_mapper = mapper(Location, location_table, properties = {
-            'issue': relationship(Issue, backref=backref('locations', lazy=False, cascade="all, delete-orphan")),
+            'issue': relationship(Issue, backref=backref('locations', lazy='joined', cascade="all, delete-orphan")),
             '_name': relationship(LocationName),
         })
 
index 1bdbe795bf5a4f5b5344078333b519d402a5f38e..8390e2a1b754b1ec6e96bb7f8e5ef31633fbcca5 100644 (file)
@@ -56,7 +56,7 @@ class InheritTest(_base.MappedTest):
 
         mapper(Group, groups, inherits=Principal, properties={
             'users': relationship(User, secondary=user_group_map,
-                              lazy=True, backref="groups")
+                              lazy='select', backref="groups")
             })
 
         g = Group(name="group1")
@@ -116,7 +116,7 @@ class InheritTest2(_base.MappedTest):
             pass
 
         mapper(Bar, bar, inherits=Foo, properties={
-            'foos': relationship(Foo, secondary=foo_bar, lazy=False)
+            'foos': relationship(Foo, secondary=foo_bar, lazy='joined')
         })
 
         sess = create_session()
@@ -185,7 +185,7 @@ class InheritTest3(_base.MappedTest):
                 return "Bar id %d, data %s" % (self.id, self.data)
 
         mapper(Bar, bar, inherits=Foo, properties={
-            'foos' :relationship(Foo, secondary=bar_foo, lazy=True)
+            'foos' :relationship(Foo, secondary=bar_foo, lazy='select')
         })
 
         sess = create_session()
@@ -220,8 +220,8 @@ class InheritTest3(_base.MappedTest):
                 return "Blub id %d, data %s, bars %s, foos %s" % (self.id, self.data, repr([b for b in self.bars]), repr([f for f in self.foos]))
 
         mapper(Blub, blub, inherits=Bar, properties={
-            'bars':relationship(Bar, secondary=blub_bar, lazy=False),
-            'foos':relationship(Foo, secondary=blub_foo, lazy=False),
+            'bars':relationship(Bar, secondary=blub_bar, lazy='joined'),
+            'foos':relationship(Foo, secondary=blub_foo, lazy='joined'),
         })
 
         sess = create_session()
index bc954c47d0fec5c09bf7847641e3ccf88be20e7c..e16c95555be8039041c77681abd9330bf2d5ca0c 100644 (file)
@@ -87,7 +87,7 @@ class PolymorphicCircularTest(_base.MappedTest):
 
         # currently, the "eager" relationships degrade to lazy relationships
         # due to the polymorphic load.
-        # the "nxt" relationship used to have a "lazy=False" on it, but the EagerLoader raises the "self-referential"
+        # the "nxt" relationship used to have a "lazy='joined'" on it, but the EagerLoader raises the "self-referential"
         # exception now.  since eager loading would never work for that relationship anyway, its better that the user
         # gets an exception instead of it silently not eager loading.
         # NOTE: using "nxt" instead of "next" to avoid 2to3 turning it into __next__() for some reason.
@@ -99,7 +99,7 @@ class PolymorphicCircularTest(_base.MappedTest):
                                'nxt': relationship(Table1,
                                    backref=backref('prev', remote_side=table1.c.id, uselist=False),
                                    uselist=False, primaryjoin=table1.c.id==table1.c.related_id),
-                               'data':relationship(mapper(Data, data), lazy=False, order_by=data.c.id)
+                               'data':relationship(mapper(Data, data), lazy='joined', order_by=data.c.id)
                                 },
                                 order_by=table1.c.id
                         )
index ffe6201de3ddef654a52a69a67ba93e231a8112a..9852e8b094e35b62a56231f74bea5cc6a02b75f2 100644 (file)
@@ -167,14 +167,14 @@ class RelationshipTest2(_base.MappedTest):
         if usedata:
             mapper(Manager, managers, inherits=Person, inherit_condition=people.c.person_id==managers.c.person_id, polymorphic_identity='manager',
                   properties={
-                    'colleague':relationship(Person, primaryjoin=managers.c.manager_id==people.c.person_id, lazy=True, uselist=False),
+                    'colleague':relationship(Person, primaryjoin=managers.c.manager_id==people.c.person_id, lazy='select', uselist=False),
                     'data':relationship(Data, uselist=False)
                  }
             )
         else:
             mapper(Manager, managers, inherits=Person, inherit_condition=people.c.person_id==managers.c.person_id, polymorphic_identity='manager',
                   properties={
-                    'colleague':relationship(Person, primaryjoin=managers.c.manager_id==people.c.person_id, lazy=True, uselist=False)
+                    'colleague':relationship(Person, primaryjoin=managers.c.manager_id==people.c.person_id, lazy='select', uselist=False)
                  }
             )
 
@@ -462,7 +462,7 @@ class RelationshipTest5(_base.MappedTest):
         person_mapper   = mapper(Person, people, polymorphic_on=people.c.type, polymorphic_identity='person')
         engineer_mapper = mapper(Engineer, engineers, inherits=person_mapper, polymorphic_identity='engineer')
         manager_mapper  = mapper(Manager, managers, inherits=person_mapper, polymorphic_identity='manager')
-        car_mapper      = mapper(Car, cars, properties= {'manager':relationship(manager_mapper, lazy=False)})
+        car_mapper      = mapper(Car, cars, properties= {'manager':relationship(manager_mapper, lazy='joined')})
 
         sess = create_session()
         car1 = Car()
@@ -505,7 +505,7 @@ class RelationshipTest6(_base.MappedTest):
         # to parent.mapped_table
         mapper(Manager, managers, inherits=Person, inherit_condition=people.c.person_id==managers.c.person_id,
               properties={
-                'colleague':relationship(Manager, primaryjoin=managers.c.colleague_id==managers.c.person_id, lazy=True, uselist=False)
+                'colleague':relationship(Manager, primaryjoin=managers.c.colleague_id==managers.c.person_id, lazy='select', uselist=False)
              }
         )
 
@@ -1049,7 +1049,7 @@ class InheritingEagerTest(_base.MappedTest):
                self.label = label
 
         mapper(Person, people, polymorphic_on=people.c._type,polymorphic_identity='person', properties={
-            'tags': relationship(Tag, secondary=peopleTags,backref='people', lazy=False)
+            'tags': relationship(Tag, secondary=peopleTags,backref='people', lazy='joined')
         })
         mapper(Employee, employees, inherits=Person,polymorphic_identity='employee')
         mapper(Tag, tags)
index 45090035547d2bd7646959e553fb7c4456bf0b7d..dc81d9245cfff7fb7d5b8a09c07e815e81357432 100644 (file)
@@ -95,12 +95,12 @@ class InheritTest(_base.MappedTest):
                 master=relationship(Assembly,
                     foreign_keys=[specification_table.c.master_id],
                     primaryjoin=specification_table.c.master_id==products_table.c.product_id,
-                    lazy=True, backref=backref('specification'),
+                    lazy='select', backref=backref('specification'),
                     uselist=False),
                 slave=relationship(Product,
                     foreign_keys=[specification_table.c.slave_id],
                     primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
-                    lazy=True, uselist=False),
+                    lazy='select', uselist=False),
                 quantity=specification_table.c.quantity,
                 )
             )
@@ -139,7 +139,7 @@ class InheritTest(_base.MappedTest):
                 slave=relationship(Product,
                     foreign_keys=[specification_table.c.slave_id],
                     primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
-                    lazy=True, uselist=False),
+                    lazy='select', uselist=False),
                 )
             )
 
@@ -168,12 +168,12 @@ class InheritTest(_base.MappedTest):
 
         specification_mapper = mapper(SpecLine, specification_table,
             properties=dict(
-                master=relationship(Assembly, lazy=False, uselist=False,
+                master=relationship(Assembly, lazy='joined', uselist=False,
                     foreign_keys=[specification_table.c.master_id],
                     primaryjoin=specification_table.c.master_id==products_table.c.product_id,
                     backref=backref('specification', cascade="all, delete-orphan"),
                     ),
-                slave=relationship(Product, lazy=False,  uselist=False,
+                slave=relationship(Product, lazy='joined',  uselist=False,
                     foreign_keys=[specification_table.c.slave_id],
                     primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
                     ),
@@ -187,7 +187,7 @@ class InheritTest(_base.MappedTest):
             properties=dict(
                 name=documents_table.c.name,
                 data=deferred(documents_table.c.data),
-                product=relationship(Product, lazy=True, backref=backref('documents', cascade="all, delete-orphan")),
+                product=relationship(Product, lazy='select', backref=backref('documents', cascade="all, delete-orphan")),
                 ),
             )
         raster_document_mapper = mapper(RasterDocument, inherits=document_mapper,
@@ -227,7 +227,7 @@ class InheritTest(_base.MappedTest):
             properties=dict(
                 name=documents_table.c.name,
                 data=deferred(documents_table.c.data),
-                product=relationship(Product, lazy=True, backref=backref('documents', cascade="all, delete-orphan")),
+                product=relationship(Product, lazy='select', backref=backref('documents', cascade="all, delete-orphan")),
                 ),
             )
         raster_document_mapper = mapper(RasterDocument, inherits=document_mapper,
@@ -260,12 +260,12 @@ class InheritTest(_base.MappedTest):
 
         specification_mapper = mapper(SpecLine, specification_table,
             properties=dict(
-                master=relationship(Assembly, lazy=False, uselist=False,
+                master=relationship(Assembly, lazy='joined', uselist=False,
                     foreign_keys=[specification_table.c.master_id],
                     primaryjoin=specification_table.c.master_id==products_table.c.product_id,
                     backref=backref('specification'),
                     ),
-                slave=relationship(Product, lazy=False,  uselist=False,
+                slave=relationship(Product, lazy='joined',  uselist=False,
                     foreign_keys=[specification_table.c.slave_id],
                     primaryjoin=specification_table.c.slave_id==products_table.c.product_id,
                     ),
@@ -276,7 +276,7 @@ class InheritTest(_base.MappedTest):
         product_mapper = mapper(Product, products_table,
             polymorphic_on=products_table.c.product_type,
             polymorphic_identity='product', properties={
-            'documents' : relationship(Document, lazy=True,
+            'documents' : relationship(Document, lazy='select',
                     backref='product', cascade='all, delete-orphan'),
             })
 
index 64915942c68ed377cc963496f5e84de9b6673d13..c9b1584bb7fd91b0b78a3b4ea60f13b2e217ac29 100644 (file)
@@ -55,7 +55,7 @@ class AssociationTest(_base.MappedTest):
 
         mapper(Keyword, keywords)
         mapper(KeywordAssociation, item_keywords, properties={
-            'keyword':relationship(Keyword, lazy=False)},
+            'keyword':relationship(Keyword, lazy='joined')},
                primary_key=[item_keywords.c.item_id, item_keywords.c.keyword_id],
                order_by=[item_keywords.c.data])
 
index e58a61329110537356bc9d88d00c51f0119cc229..20736b8fe9f8ad186d6423260a343cf2b8947f53 100644 (file)
@@ -238,11 +238,11 @@ class EagerTest2(_base.MappedTest):
         mapper(Right, right)
         mapper(Middle, middle, properties=dict(
             left=relationship(Left,
-                          lazy=False,
-                          backref=backref('middle',lazy=False)),
+                          lazy='joined',
+                          backref=backref('middle',lazy='joined')),
             right=relationship(Right,
-                           lazy=False,
-                           backref=backref('middle', lazy=False)))),
+                           lazy='joined',
+                           backref=backref('middle', lazy='joined')))),
 
     @testing.fails_on('maxdb', 'FIXME: unknown')
     @testing.resolve_artifact_names
@@ -375,7 +375,7 @@ class EagerTest4(_base.MappedTest):
         mapper(Employee, employees)
         mapper(Department, departments, properties=dict(
             employees=relationship(Employee,
-                               lazy=False,
+                               lazy='joined',
                                backref='department')))
 
         d1 = Department(name='One')
@@ -451,7 +451,7 @@ class EagerTest5(_base.MappedTest):
         commentMapper = mapper(Comment, comments)
 
         baseMapper = mapper(Base, base, properties=dict(
-            comments=relationship(Comment, lazy=False,
+            comments=relationship(Comment, lazy='joined',
                               cascade='all, delete-orphan')))
 
         mapper(Derived, derived, inherits=baseMapper)
@@ -528,7 +528,7 @@ class EagerTest6(_base.MappedTest):
         p_m = mapper(Part, parts)
 
         mapper(InheritedPart, inherited_part, properties=dict(
-            part=relationship(Part, lazy=False)))
+            part=relationship(Part, lazy='joined')))
 
         d_m = mapper(Design, design, properties=dict(
             inheritedParts=relationship(InheritedPart,
@@ -538,11 +538,11 @@ class EagerTest6(_base.MappedTest):
         mapper(DesignType, design_types)
 
         d_m.add_property(
-            "type", relationship(DesignType, lazy=False, backref="designs"))
+            "type", relationship(DesignType, lazy='joined', backref="designs"))
 
         p_m.add_property(
             "design", relationship(
-                Design, lazy=False,
+                Design, lazy='joined',
                 backref=backref("parts", cascade="all, delete-orphan")))
 
 
@@ -613,10 +613,10 @@ class EagerTest7(_base.MappedTest):
         mapper(Address, addresses)
 
         mapper(Company, companies, properties={
-            'addresses' : relationship(Address, lazy=False)})
+            'addresses' : relationship(Address, lazy='joined')})
 
         mapper(Invoice, invoices, properties={
-            'company': relationship(Company, lazy=False)})
+            'company': relationship(Company, lazy='joined')})
 
         a1 = Address(address='a1 address')
         a2 = Address(address='a2 address')
@@ -646,19 +646,19 @@ class EagerTest7(_base.MappedTest):
         mapper(Phone, phone_numbers)
 
         mapper(Address, addresses, properties={
-            'phones': relationship(Phone, lazy=False, backref='address',
+            'phones': relationship(Phone, lazy='joined', backref='address',
                                order_by=phone_numbers.c.phone_id)})
 
         mapper(Company, companies, properties={
-            'addresses': relationship(Address, lazy=False, backref='company',
+            'addresses': relationship(Address, lazy='joined', backref='company',
                                   order_by=addresses.c.address_id)})
 
         mapper(Item, items)
 
         mapper(Invoice, invoices, properties={
-            'items': relationship(Item, lazy=False, backref='invoice',
+            'items': relationship(Item, lazy='joined', backref='invoice',
                               order_by=items.c.item_id),
-            'company': relationship(Company, lazy=False, backref='invoices')})
+            'company': relationship(Company, lazy='joined', backref='invoices')})
 
         c1 = Company(company_name='company 1', addresses=[
             Address(address='a1 address',
@@ -776,7 +776,7 @@ class EagerTest8(_base.MappedTest):
         jjj = sa.join(task, jj, task.c.id == jj.c.task_id)
 
         mapper(Joined, jjj, properties=dict(
-            type=relationship(Task_Type, lazy=False)))
+            type=relationship(Task_Type, lazy='joined')))
 
         session = create_session()
 
@@ -831,11 +831,11 @@ class EagerTest9(_base.MappedTest):
         mapper(Entry, entries, properties=dict(
             account=relationship(Account,
                              uselist=False,
-                             backref=backref('entries', lazy=True,
+                             backref=backref('entries', lazy='select',
                                              order_by=entries.c.entry_id)),
             transaction=relationship(Transaction,
                                  uselist=False,
-                                 backref=backref('entries', lazy=False,
+                                 backref=backref('entries', lazy='joined',
                                                  order_by=entries.c.entry_id))))
 
     @testing.fails_on('maxdb', 'FIXME: unknown')
index 2725d7b0e9b873d5603d10b72b97a1cb8008f2be..a7152ecc112d9770ae4e4cb24ab2f2fc27ba4ef6 100644 (file)
@@ -403,7 +403,7 @@ class M2OCascadeTest(_base.MappedTest):
             extra = relationship(Extra, cascade="all, delete")
         ))
         mapper(User, users, properties = dict(
-            pref = relationship(Pref, lazy=False, cascade="all, delete-orphan", single_parent=True  ),
+            pref = relationship(Pref, lazy='joined', cascade="all, delete-orphan", single_parent=True  ),
             foo = relationship(Foo) # straight m2o
         ))
         mapper(Foo, foo)
index 9d70ece16ede55778c98159770f94a4bcbc36f54..101e4143a8b05f9a418dc6326f7f23b7bdf22181 100644 (file)
@@ -52,17 +52,17 @@ class CompileTest(_base.ORMTest):
             polymorphic_on=order_join.c.type,
             polymorphic_identity='order',
             properties={
-                'orderproducts': relationship(OrderProduct, lazy=True, backref='order')}
+                'orderproducts': relationship(OrderProduct, lazy='select', backref='order')}
             )
 
         mapper(Product, product,
             properties={
-                'orderproducts': relationship(OrderProduct, lazy=True, backref='product')}
+                'orderproducts': relationship(OrderProduct, lazy='select', backref='product')}
             )
 
         mapper(Employee, employee,
             properties={
-                'orders': relationship(Order, lazy=True, backref='employee')})
+                'orders': relationship(Order, lazy='select', backref='employee')})
 
         mapper(OrderProduct, orderproduct)
 
@@ -105,12 +105,12 @@ class CompileTest(_base.ORMTest):
             polymorphic_on=order_join.c.type,
             polymorphic_identity='order',
             properties={
-                'orderproducts': relationship(OrderProduct, lazy=True, backref='product')}
+                'orderproducts': relationship(OrderProduct, lazy='select', backref='product')}
             )
 
         mapper(Product, product,
             properties={
-                'orderproducts': relationship(OrderProduct, lazy=True, backref='product')}
+                'orderproducts': relationship(OrderProduct, lazy='select', backref='product')}
             )
 
         mapper(OrderProduct, orderproduct)
index fa233f681fda7860d994659a6e07b0b8a9ee4eb8..c197cb627c14b900140bad96c5576bb260906dd0 100644 (file)
@@ -47,7 +47,7 @@ class SelfReferentialTest(_base.MappedTest):
             'parent':relationship(C1,
                               primaryjoin=t1.c.parent_c1 == t1.c.c1,
                               remote_side=t1.c.c1,
-                              lazy=True,
+                              lazy='select',
                               uselist=False)})
         a = C1('head c1')
         a.c1s.append(C1('another c1'))
@@ -755,7 +755,7 @@ class SelfReferentialPostUpdateTest(_base.MappedTest):
             'children': relationship(
                 Node,
                 primaryjoin=node.c.id==node.c.parent_id,
-                lazy=True,
+                lazy='select',
                 cascade="all",
                 backref=backref("parent", remote_side=node.c.id)
             ),
@@ -763,13 +763,13 @@ class SelfReferentialPostUpdateTest(_base.MappedTest):
                 Node,
                 primaryjoin=node.c.prev_sibling_id==node.c.id,
                 remote_side=node.c.id,
-                lazy=True,
+                lazy='select',
                 uselist=False),
             'next_sibling': relationship(
                 Node,
                 primaryjoin=node.c.next_sibling_id==node.c.id,
                 remote_side=node.c.id,
-                lazy=True,
+                lazy='select',
                 uselist=False,
                 post_update=True)})
 
index f6e8e8143c1605e38686a50db9310dc0ecfa8a7e..746b8b2e5a6c0aadf69f66d466c24d29f3918560 100644 (file)
@@ -20,7 +20,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     @testing.resolve_artifact_names
     def test_basic(self):
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=False, order_by=Address.id)
+            'addresses':relationship(mapper(Address, addresses), lazy='joined', order_by=Address.id)
         })
         sess = create_session()
         q = sess.query(User)
@@ -50,7 +50,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         """An eagerly loaded child object is not marked as an orphan"""
         
         mapper(User, users, properties={
-            'addresses':relationship(Address, cascade="all,delete-orphan", lazy=False)
+            'addresses':relationship(Address, cascade="all,delete-orphan", lazy='joined')
         })
         mapper(Address, addresses)
 
@@ -65,7 +65,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     def test_orderby(self):
         mapper(User, users, properties = {
             'addresses':relationship(mapper(Address, addresses), 
-                        lazy=False, order_by=addresses.c.email_address),
+                        lazy='joined', order_by=addresses.c.email_address),
         })
         q = create_session().query(User)
         eq_([
@@ -87,7 +87,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     def test_orderby_multi(self):
         mapper(User, users, properties = {
             'addresses':relationship(mapper(Address, addresses), 
-                            lazy=False
+                            lazy='joined'
                             order_by=[addresses.c.email_address, addresses.c.id]),
         })
         q = create_session().query(User)
@@ -113,7 +113,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
             
         mapper(Address, addresses)
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=False, order_by=addresses.c.id),
+            addresses = relationship(Address, lazy='joined', order_by=addresses.c.id),
         ))
 
         q = create_session().query(User)
@@ -137,7 +137,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     def test_orderby_desc(self):
         mapper(Address, addresses)
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=False,
+            addresses = relationship(Address, lazy='joined',
                                  order_by=[sa.desc(addresses.c.email_address)]),
         ))
         sess = create_session()
@@ -160,7 +160,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     def test_deferred_fk_col(self):
         mapper(Address, addresses, properties={
             'user_id':deferred(addresses.c.user_id),
-            'user':relationship(User, lazy=False)
+            'user':relationship(User, lazy='joined')
         })
         mapper(User, users)
 
@@ -203,7 +203,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
             'user_id':deferred(addresses.c.user_id),
         })
         mapper(User, users, properties={
-            'addresses':relationship(Address, lazy=False)})
+            'addresses':relationship(Address, lazy='joined')})
 
         for q in [
             sess.query(User).filter(User.id==7),
@@ -225,10 +225,10 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         sa.orm.clear_mappers()
 
         mapper(User, users, properties={
-            'addresses':relationship(Address, lazy=False)})
+            'addresses':relationship(Address, lazy='joined')})
         mapper(Address, addresses, properties={
             'user_id':deferred(addresses.c.user_id),
-            'dingalings':relationship(Dingaling, lazy=False)})
+            'dingalings':relationship(Dingaling, lazy='joined')})
         mapper(Dingaling, dingalings, properties={
             'address_id':deferred(dingalings.c.address_id)})
         sess.expunge_all()
@@ -291,7 +291,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         mapper(Keyword, keywords)
         mapper(Item, items, properties = dict(
                 keywords = relationship(Keyword, secondary=item_keywords,
-                                    lazy=False, order_by=keywords.c.id)))
+                                    lazy='joined', order_by=keywords.c.id)))
 
         q = create_session().query(Item).order_by(Item.id)
         def go():
@@ -313,7 +313,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     def test_eager_option(self):
         mapper(Keyword, keywords)
         mapper(Item, items, properties = dict(
-                keywords = relationship(Keyword, secondary=item_keywords, lazy=True,
+                keywords = relationship(Keyword, secondary=item_keywords, lazy='select',
                                     order_by=keywords.c.id)))
 
         q = create_session().query(Item)
@@ -331,12 +331,12 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
 
         mapper(Address, addresses)
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=False,
-                                 backref=sa.orm.backref('user', lazy=False),
+            addresses = relationship(Address, lazy='joined',
+                                 backref=sa.orm.backref('user', lazy='joined'),
                                             order_by=Address.id)
         ))
-        is_(sa.orm.class_mapper(User).get_property('addresses').lazy, False)
-        is_(sa.orm.class_mapper(Address).get_property('user').lazy, False)
+        eq_(sa.orm.class_mapper(User).get_property('addresses').lazy, 'joined')
+        eq_(sa.orm.class_mapper(Address).get_property('user').lazy, 'joined')
 
         sess = create_session()
         eq_(self.static.user_address_result, sess.query(User).order_by(User.id).all())
@@ -356,17 +356,17 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         closed_mapper = mapper(Order, closedorders, non_primary=True)
         
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=False, order_by=addresses.c.id),
+            addresses = relationship(Address, lazy='joined', order_by=addresses.c.id),
             open_orders = relationship(
                 open_mapper,
                 primaryjoin=sa.and_(openorders.c.isopen == 1,
                                  users.c.id==openorders.c.user_id),
-                lazy=False, order_by=openorders.c.id),
+                lazy='joined', order_by=openorders.c.id),
             closed_orders = relationship(
                 closed_mapper,
                 primaryjoin=sa.and_(closedorders.c.isopen == 0,
                                  users.c.id==closedorders.c.user_id),
-                lazy=False, order_by=closedorders.c.id)))
+                lazy='joined', order_by=closedorders.c.id)))
 
         q = create_session().query(User).order_by(User.id)
 
@@ -402,21 +402,21 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
 
         mapper(Address, addresses)
         mapper(Order, orders, properties={
-            'items': relationship(Item, secondary=order_items, lazy=False,
+            'items': relationship(Item, secondary=order_items, lazy='joined',
                               order_by=items.c.id)})
         mapper(Item, items)
         mapper(User, users, properties=dict(
-            addresses=relationship(Address, lazy=False, order_by=addresses.c.id),
+            addresses=relationship(Address, lazy='joined', order_by=addresses.c.id),
             open_orders=relationship(
                 Order,
                 primaryjoin=sa.and_(orders.c.isopen == 1,
                                  users.c.id==orders.c.user_id),
-                lazy=False, order_by=orders.c.id),
+                lazy='joined', order_by=orders.c.id),
             closed_orders=relationship(
                 Order,
                 primaryjoin=sa.and_(orders.c.isopen == 0,
                                  users.c.id==orders.c.user_id),
-                lazy=False, order_by=orders.c.id)))
+                lazy='joined', order_by=orders.c.id)))
         q = create_session().query(User).order_by(User.id)
 
         def go():
@@ -468,8 +468,8 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         part of their eager load."""
 
         mapper(User, users, properties={
-            'addresses':relationship(Address, lazy=False),
-            'orders':relationship(Order, lazy=False)
+            'addresses':relationship(Address, lazy='joined'),
+            'orders':relationship(Order, lazy='joined')
         })
         mapper(Address, addresses)
         mapper(Order, orders)
@@ -492,12 +492,12 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
 
         mapper(Item, items)
         mapper(Order, orders, properties={
-            'items':relationship(Item, secondary=order_items, lazy=False,
+            'items':relationship(Item, secondary=order_items, lazy='joined',
                 order_by=items.c.id)
         })
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=False, order_by=addresses.c.id),
-            'orders':relationship(Order, lazy=True, order_by=orders.c.id)
+            'addresses':relationship(mapper(Address, addresses), lazy='joined', order_by=addresses.c.id),
+            'orders':relationship(Order, lazy='select', order_by=orders.c.id)
         })
 
         sess = create_session()
@@ -515,7 +515,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         s = sa.union_all(u2.select(use_labels=True), u2.select(use_labels=True), u2.select(use_labels=True)).alias('u')
 
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=False, order_by=addresses.c.id),
+            'addresses':relationship(mapper(Address, addresses), lazy='joined', order_by=addresses.c.id),
         })
 
         sess = create_session()
@@ -531,7 +531,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     def test_limit_2(self):
         mapper(Keyword, keywords)
         mapper(Item, items, properties = dict(
-                keywords = relationship(Keyword, secondary=item_keywords, lazy=False, order_by=[keywords.c.id]),
+                keywords = relationship(Keyword, secondary=item_keywords, lazy='joined', order_by=[keywords.c.id]),
             ))
 
         sess = create_session()
@@ -553,13 +553,13 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
 
         mapper(Item, items)
         mapper(Order, orders, properties = dict(
-                items = relationship(Item, secondary=order_items, lazy=False)
+                items = relationship(Item, secondary=order_items, lazy='joined')
         ))
 
         mapper(Address, addresses)
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=False, order_by=addresses.c.id),
-            orders = relationship(Order, lazy=False, order_by=orders.c.id),
+            addresses = relationship(Address, lazy='joined', order_by=addresses.c.id),
+            orders = relationship(Order, lazy='joined', order_by=orders.c.id),
         ))
         sess = create_session()
 
@@ -592,7 +592,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         sel = sa.select([users, addresses.c.email_address],
                         users.c.id==addresses.c.user_id).alias('useralias')
         mapper(User, sel, properties={
-            'orders':relationship(Order, primaryjoin=sel.c.id==orders.c.user_id, lazy=False)
+            'orders':relationship(Order, primaryjoin=sel.c.id==orders.c.user_id, lazy='joined')
         })
         mapper(Order, orders)
 
@@ -696,7 +696,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     def test_one_to_many_scalar(self):
         mapper(User, users, properties = dict(
             address = relationship(mapper(Address, addresses), 
-                                    lazy=False, uselist=False)
+                                    lazy='joined', uselist=False)
         ))
         q = create_session().query(User)
 
@@ -709,7 +709,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     @testing.resolve_artifact_names
     def test_many_to_one(self):
         mapper(Address, addresses, properties = dict(
-            user = relationship(mapper(User, users), lazy=False)
+            user = relationship(mapper(User, users), lazy='joined')
         ))
         sess = create_session()
         q = sess.query(Address)
@@ -737,7 +737,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
                     addresses.c.email_address != None
                 ),
             
-            lazy=False)
+            lazy='joined')
         ))
         sess = create_session()
 
@@ -758,11 +758,11 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         contains a many-to-many relationship to a third object."""
 
         mapper(User, users, properties={
-            'orders':relationship(Order, lazy=False, order_by=orders.c.id)
+            'orders':relationship(Order, lazy='joined', order_by=orders.c.id)
         })
         mapper(Item, items)
         mapper(Order, orders, properties = dict(
-                items = relationship(Item, secondary=order_items, lazy=False, order_by=items.c.id)
+                items = relationship(Item, secondary=order_items, lazy='joined', order_by=items.c.id)
             ))
 
         q = create_session().query(User)
@@ -784,11 +784,11 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
 
         mapper(Order, orders)
         mapper(User, users, properties={
-               'orders':relationship(Order, backref='user', lazy=False,
+               'orders':relationship(Order, backref='user', lazy='joined',
                                             order_by=orders.c.id),
                'max_order':relationship(
                                 mapper(Order, max_orders, non_primary=True), 
-                                lazy=False, uselist=False)
+                                lazy='joined', uselist=False)
                })
 
         q = create_session().query(User)
@@ -825,7 +825,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         
     @testing.resolve_artifact_names
     def test_wide(self):
-        mapper(Order, orders, properties={'items':relationship(Item, secondary=order_items, lazy=False,
+        mapper(Order, orders, properties={'items':relationship(Item, secondary=order_items, lazy='joined',
                                                            order_by=items.c.id)})
         mapper(Item, items)
         mapper(User, users, properties = dict(
@@ -843,7 +843,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
         s = sa.select([orders], orders.c.isopen==1).alias('openorders')
 
         mapper(Order, s, properties={
-            'user':relationship(User, lazy=False)
+            'user':relationship(User, lazy='joined')
         })
         mapper(User, users)
         mapper(Item, items)
@@ -866,7 +866,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
 
         mapper(User, users, properties = dict(
             addresses = relationship(mapper(Address, addresses), 
-                                    lazy=False, order_by=addresses.c.id)
+                                    lazy='joined', order_by=addresses.c.id)
         ))
         q = create_session().query(User)
         l = q.filter(addresses.c.email_address == 'ed@lala.com').filter(
@@ -876,7 +876,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     @testing.resolve_artifact_names
     def test_inner_join(self):
         mapper(User, users, properties = dict(
-            addresses = relationship(mapper(Address, addresses), lazy=False, innerjoin=True, order_by=addresses.c.id)
+            addresses = relationship(mapper(Address, addresses), lazy='joined', innerjoin=True, order_by=addresses.c.id)
         ))
         sess = create_session()
         eq_(
@@ -1004,12 +1004,12 @@ class AddEntityTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_mapper_configured(self):
         mapper(User, users, properties={
-            'addresses':relationship(Address, lazy=False),
+            'addresses':relationship(Address, lazy='joined'),
             'orders':relationship(Order)
         })
         mapper(Address, addresses)
         mapper(Order, orders, properties={
-            'items':relationship(Item, secondary=order_items, lazy=False, order_by=items.c.id)
+            'items':relationship(Item, secondary=order_items, lazy='joined', order_by=items.c.id)
         })
         mapper(Item, items)
 
@@ -1093,7 +1093,7 @@ class OrderBySecondaryTest(_base.MappedTest):
         class B(_base.ComparableEntity):pass
 
         mapper(A, a, properties={
-            'bs':relationship(B, secondary=m2m, lazy=False, order_by=m2m.c.id)
+            'bs':relationship(B, secondary=m2m, lazy='joined', order_by=m2m.c.id)
         })
         mapper(B, b)
 
@@ -1121,7 +1121,7 @@ class SelfReferentialEagerTest(_base.MappedTest):
 
         mapper(Node, nodes, properties={
             'children':relationship(Node, 
-                                        lazy=False
+                                        lazy='joined'
                                         join_depth=3, order_by=nodes.c.id)
         })
         sess = create_session()
@@ -1170,7 +1170,7 @@ class SelfReferentialEagerTest(_base.MappedTest):
                 self.children.append(node)
 
         mapper(Node, nodes, properties={
-            'children':relationship(Node, lazy=False, join_depth=1,
+            'children':relationship(Node, lazy='joined', join_depth=1,
                                     order_by=nodes.c.id)
         })
         sess = create_session()
@@ -1211,7 +1211,7 @@ class SelfReferentialEagerTest(_base.MappedTest):
                 self.children.append(node)
 
         mapper(Node, nodes, properties={
-            'children':relationship(Node, lazy=False, join_depth=3,
+            'children':relationship(Node, lazy='joined', join_depth=3,
                                     order_by=nodes.c.id),
             'data':deferred(nodes.c.data)
         })
@@ -1253,7 +1253,7 @@ class SelfReferentialEagerTest(_base.MappedTest):
                 self.children.append(node)
 
         mapper(Node, nodes, properties={
-            'children':relationship(Node, lazy=True, order_by=nodes.c.id)
+            'children':relationship(Node, lazy='select', order_by=nodes.c.id)
         }, order_by=nodes.c.id)
         sess = create_session()
         n1 = Node(data='n1')
@@ -1301,7 +1301,7 @@ class SelfReferentialEagerTest(_base.MappedTest):
                 self.children.append(node)
 
         mapper(Node, nodes, properties={
-            'children':relationship(Node, lazy=False)
+            'children':relationship(Node, lazy='joined')
         })
         sess = create_session()
         n1 = Node(data='n1')
@@ -1427,7 +1427,7 @@ class SelfReferentialM2MEagerTest(_base.MappedTest):
             'children': relationship(Widget, secondary=widget_rel,
                 primaryjoin=widget_rel.c.parent_id==widget.c.id,
                 secondaryjoin=widget_rel.c.child_id==widget.c.id,
-                lazy=False, join_depth=1,
+                lazy='joined', join_depth=1,
             )
         })
 
@@ -1612,7 +1612,7 @@ class CyclicalInheritingEagerTest(_base.MappedTest):
 
         mapper(T, t1, polymorphic_on=t1.c.type, polymorphic_identity='t1')
         mapper(SubT, None, inherits=T, polymorphic_identity='subt1', properties={
-            't2s':relationship(SubT2, lazy=False, backref=sa.orm.backref('subt', lazy=False))
+            't2s':relationship(SubT2, lazy='joined', backref=sa.orm.backref('subt', lazy='joined'))
         })
         mapper(T2, t2, polymorphic_on=t2.c.type, polymorphic_identity='t2')
         mapper(SubT2, None, inherits=T2, polymorphic_identity='subt2')
@@ -1679,7 +1679,7 @@ class SubqueryTest(_base.MappedTest):
 
 
             mapper(User, users_table, properties={
-                'tags': relationship(Tag, backref='user', lazy=False),
+                'tags': relationship(Tag, backref='user', lazy='joined'),
                 'query_score': sa.orm.column_property(user_score),
             })
 
index e0e32e63e9dc90543bd0a25c16a88da011f9396e..2fe4bb15a31cac17a6068d6f118b435d7855cf8f 100644 (file)
@@ -324,7 +324,7 @@ class ExpireTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_expired_eager(self):
         mapper(User, users, properties={
-            'addresses':relationship(Address, backref='user', lazy=False),
+            'addresses':relationship(Address, backref='user', lazy='joined'),
             })
         mapper(Address, addresses)
 
@@ -359,7 +359,7 @@ class ExpireTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_relationship_changes_preserved(self):
         mapper(User, users, properties={
-            'addresses':relationship(Address, backref='user', lazy=False),
+            'addresses':relationship(Address, backref='user', lazy='joined'),
             })
         mapper(Address, addresses)
         sess = create_session()
@@ -379,13 +379,13 @@ class ExpireTest(_fixtures.FixtureTest):
         # fires off to load "addresses", but needs foreign key or primary key
         # attributes in order to lazy load; hits those attributes, such as
         # below it hits "u.id".  "u.id" triggers full unexpire operation,
-        # joinedloads addresses since lazy=False.  this is all wihtin lazy load
+        # joinedloads addresses since lazy='joined'.  this is all wihtin lazy load
         # which fires unconditionally; so an unnecessary joinedload (or
         # lazyload) was issued.  would prefer not to complicate lazyloading to
         # "figure out" that the operation should be aborted right now.
 
         mapper(User, users, properties={
-            'addresses':relationship(Address, backref='user', lazy=False),
+            'addresses':relationship(Address, backref='user', lazy='joined'),
             })
         mapper(Address, addresses)
         sess = create_session()
@@ -514,7 +514,7 @@ class ExpireTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_partial_expire_eager(self):
         mapper(User, users, properties={
-            'addresses':relationship(Address, backref='user', lazy=False),
+            'addresses':relationship(Address, backref='user', lazy='joined'),
             })
         mapper(Address, addresses)
 
@@ -643,7 +643,7 @@ class ExpireTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_joinedload_query_refreshes(self):
         mapper(User, users, properties={
-            'addresses':relationship(Address, backref='user', lazy=False),
+            'addresses':relationship(Address, backref='user', lazy='joined'),
             })
         mapper(Address, addresses)
 
@@ -660,7 +660,7 @@ class ExpireTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_expire_all(self):
         mapper(User, users, properties={
-            'addresses':relationship(Address, backref='user', lazy=False),
+            'addresses':relationship(Address, backref='user', lazy='joined'),
             })
         mapper(Address, addresses)
 
@@ -768,7 +768,7 @@ class ExpireTest(_fixtures.FixtureTest):
     def test_state_noload_to_lazy(self):
         """Behavioral test to verify the current activity of loader callables."""
 
-        mapper(User, users, properties={'addresses':relationship(Address, lazy=None)})
+        mapper(User, users, properties={'addresses':relationship(Address, lazy='noload')})
         mapper(Address, addresses)
         
         sess = create_session()
@@ -1002,7 +1002,7 @@ class RefreshTest(_fixtures.FixtureTest):
         """test that a refresh/expire operation loads rows properly and sends correct "isnew" state to eager loaders"""
 
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=False)
+            'addresses':relationship(mapper(Address, addresses), lazy='joined')
         })
 
         s = create_session()
@@ -1025,7 +1025,7 @@ class RefreshTest(_fixtures.FixtureTest):
         s = create_session()
         mapper(Address, addresses)
 
-        mapper(User, users, properties = dict(addresses=relationship(Address,cascade="all, delete-orphan",lazy=False)) )
+        mapper(User, users, properties = dict(addresses=relationship(Address,cascade="all, delete-orphan",lazy='joined')) )
 
         u = User()
         u.name='Justin'
index 502747bfd763dd24f8eefe61e3f7198c492a5957..f6147a3ebf1ea1ebb1cfbbab8fc56c1ff41fe670 100644 (file)
@@ -22,7 +22,7 @@ class LazyTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_basic(self):
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=True)
+            'addresses':relationship(mapper(Address, addresses), lazy='select')
         })
         sess = create_session()
         q = sess.query(User)
@@ -33,7 +33,7 @@ class LazyTest(_fixtures.FixtureTest):
         """test the error raised when parent object is not bound."""
 
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=True)
+            'addresses':relationship(mapper(Address, addresses), lazy='select')
         })
         sess = create_session()
         q = sess.query(User)
@@ -44,7 +44,7 @@ class LazyTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_orderby(self):
         mapper(User, users, properties = {
-            'addresses':relationship(mapper(Address, addresses), lazy=True, order_by=addresses.c.email_address),
+            'addresses':relationship(mapper(Address, addresses), lazy='select', order_by=addresses.c.email_address),
         })
         q = create_session().query(User)
         assert [
@@ -69,7 +69,7 @@ class LazyTest(_fixtures.FixtureTest):
         mapper(Address, addresses)
 
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=True),
+            addresses = relationship(Address, lazy='select'),
         ))
         q = create_session().query(User)
         l = q.filter(users.c.id==addresses.c.user_id).order_by(addresses.c.email_address).all()
@@ -92,7 +92,7 @@ class LazyTest(_fixtures.FixtureTest):
         mapper(Address, addresses)
 
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=True,  order_by=[sa.desc(addresses.c.email_address)]),
+            addresses = relationship(Address, lazy='select',  order_by=[sa.desc(addresses.c.email_address)]),
         ))
         sess = create_session()
         assert [
@@ -115,7 +115,7 @@ class LazyTest(_fixtures.FixtureTest):
         """test that a lazily loaded child object is not marked as an orphan"""
 
         mapper(User, users, properties={
-            'addresses':relationship(Address, cascade="all,delete-orphan", lazy=True)
+            'addresses':relationship(Address, cascade="all,delete-orphan", lazy='select')
         })
         mapper(Address, addresses)
 
@@ -130,11 +130,11 @@ class LazyTest(_fixtures.FixtureTest):
 
         mapper(Item, items)
         mapper(Order, orders, properties={
-            'items':relationship(Item, secondary=order_items, lazy=True)
+            'items':relationship(Item, secondary=order_items, lazy='select')
         })
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=True),
-            'orders':relationship(Order, lazy=True)
+            'addresses':relationship(mapper(Address, addresses), lazy='select'),
+            'orders':relationship(Order, lazy='select')
         })
 
         sess = create_session()
@@ -151,11 +151,11 @@ class LazyTest(_fixtures.FixtureTest):
     def test_distinct(self):
         mapper(Item, items)
         mapper(Order, orders, properties={
-            'items':relationship(Item, secondary=order_items, lazy=True)
+            'items':relationship(Item, secondary=order_items, lazy='select')
         })
         mapper(User, users, properties={
-            'addresses':relationship(mapper(Address, addresses), lazy=True),
-            'orders':relationship(Order, lazy=True)
+            'addresses':relationship(mapper(Address, addresses), lazy='select'),
+            'orders':relationship(Order, lazy='select')
         })
 
         sess = create_session()
@@ -182,7 +182,7 @@ class LazyTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_one_to_many_scalar(self):
         mapper(User, users, properties = dict(
-            address = relationship(mapper(Address, addresses), lazy=True, uselist=False)
+            address = relationship(mapper(Address, addresses), lazy='select', uselist=False)
         ))
         q = create_session().query(User)
         l = q.filter(users.c.id == 7).all()
@@ -224,8 +224,8 @@ class LazyTest(_fixtures.FixtureTest):
         closed_mapper = mapper(Order, closedorders, non_primary=True)
         mapper(User, users, properties = dict(
             addresses = relationship(Address, lazy = True),
-            open_orders = relationship(open_mapper, primaryjoin = sa.and_(openorders.c.isopen == 1, users.c.id==openorders.c.user_id), lazy=True),
-            closed_orders = relationship(closed_mapper, primaryjoin = sa.and_(closedorders.c.isopen == 0, users.c.id==closedorders.c.user_id), lazy=True)
+            open_orders = relationship(open_mapper, primaryjoin = sa.and_(openorders.c.isopen == 1, users.c.id==openorders.c.user_id), lazy='select'),
+            closed_orders = relationship(closed_mapper, primaryjoin = sa.and_(closedorders.c.isopen == 0, users.c.id==closedorders.c.user_id), lazy='select')
         ))
         q = create_session().query(User)
 
@@ -262,7 +262,7 @@ class LazyTest(_fixtures.FixtureTest):
 
         mapper(Keyword, keywords)
         mapper(Item, items, properties = dict(
-                keywords = relationship(Keyword, secondary=item_keywords, lazy=True),
+                keywords = relationship(Keyword, secondary=item_keywords, lazy='select'),
         ))
 
         q = create_session().query(Item)
@@ -280,7 +280,7 @@ class LazyTest(_fixtures.FixtureTest):
             addresses.c.user_id==users.c.id
         ):
             mapper(Address, addresses, properties = dict(
-                user = relationship(mapper(User, users), lazy=True, primaryjoin=pj)
+                user = relationship(mapper(User, users), lazy='select', primaryjoin=pj)
             ))
 
             sess = create_session()
@@ -349,7 +349,7 @@ class LazyTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_many_to_one(self):
         mapper(Address, addresses, properties = dict(
-            user = relationship(mapper(User, users), lazy=True)
+            user = relationship(mapper(User, users), lazy='select')
         ))
         sess = create_session()
         q = sess.query(Address)
index bb7ca878308fa436047a6e36bc6e5445bc2c5a6f..84c60fc280d3b69bd8f16e6bbecc9eacd527c92d 100644 (file)
@@ -88,7 +88,7 @@ class M2MTest(_base.MappedTest):
             Place.mapper, secondary=place_place, primaryjoin=place.c.place_id==place_place.c.pl1_id,
             secondaryjoin=place.c.place_id==place_place.c.pl2_id,
             order_by=place_place.c.pl2_id,
-            lazy=True,
+            lazy='select',
             ))
 
         sess = create_session()
@@ -134,12 +134,12 @@ class M2MTest(_base.MappedTest):
         two different association tables.  aliases are required."""
 
         Place.mapper = mapper(Place, place, properties = {
-            'thingies':relationship(mapper(PlaceThingy, place_thingy), lazy=False)
+            'thingies':relationship(mapper(PlaceThingy, place_thingy), lazy='joined')
         })
 
         Transition.mapper = mapper(Transition, transition, properties = dict(
-            inputs = relationship(Place.mapper, place_output, lazy=False),
-            outputs = relationship(Place.mapper, place_input, lazy=False),
+            inputs = relationship(Place.mapper, place_output, lazy='joined'),
+            outputs = relationship(Place.mapper, place_input, lazy='joined'),
             )
         )
 
@@ -164,8 +164,8 @@ class M2MTest(_base.MappedTest):
         """tests a many-to-many backrefs"""
         Place.mapper = mapper(Place, place)
         Transition.mapper = mapper(Transition, transition, properties = dict(
-            inputs = relationship(Place.mapper, place_output, lazy=True, backref='inputs'),
-            outputs = relationship(Place.mapper, place_input, lazy=True, backref='outputs'),
+            inputs = relationship(Place.mapper, place_output, lazy='select', backref='inputs'),
+            outputs = relationship(Place.mapper, place_input, lazy='select', backref='outputs'),
             )
         )
 
@@ -263,7 +263,7 @@ class M2MTest2(_base.MappedTest):
 
         mapper(Student, student)
         mapper(Course, course, properties = {
-            'students': relationship(Student, enroll, lazy=True,
+            'students': relationship(Student, enroll, lazy='select',
                                  backref='courses')})
 
         sess = create_session()
@@ -316,11 +316,11 @@ class M2MTest3(_base.MappedTest):
         mapper(A, a, properties={
             'tbs': relationship(B, primaryjoin=sa.and_(b.c.a1 == a.c.a1,
                                                    b.c.b2 == True),
-                            lazy=False)})
+                            lazy='joined')})
 
         mapper(C, c, properties={
-            'a1s': relationship(A, secondary=c2a1, lazy=False),
-            'a2s': relationship(A, secondary=c2a2, lazy=False)})
+            'a1s': relationship(A, secondary=c2a1, lazy='joined'),
+            'a2s': relationship(A, secondary=c2a2, lazy='joined')})
 
         assert create_session().query(C).with_labels().statement is not None
         
index 4bb58cbeb213bb6c0fb9fdfe85ade9053cde7b12..de8124dbc5745169fe5ffa76d847fc994a6b4c12 100644 (file)
@@ -674,7 +674,7 @@ class MapperTest(_fixtures.FixtureTest):
     def test_many_to_many_count(self):
         mapper(Keyword, keywords)
         mapper(Item, items, properties=dict(
-            keywords = relationship(Keyword, item_keywords, lazy=True)))
+            keywords = relationship(Keyword, item_keywords, lazy='select')))
 
         session = create_session()
         q = (session.query(Item).
@@ -731,7 +731,7 @@ class MapperTest(_fixtures.FixtureTest):
             uname = extendedproperty(_get_name, _set_name)
 
         mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=True),
+            addresses = relationship(mapper(Address, addresses), lazy='select'),
             uname = synonym('name'),
             adlist = synonym('addresses'),
             adname = synonym('addresses')
@@ -810,7 +810,7 @@ class MapperTest(_fixtures.FixtureTest):
 
         mapper(Address, addresses)
         mapper(User, users, properties = {
-            'addresses':relationship(Address, lazy=True),
+            'addresses':relationship(Address, lazy='select'),
             'name':synonym('_name', map_column=True)
         })
 
@@ -1086,7 +1086,7 @@ class OptionsTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_synonym_options(self):
         mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=True,
+            addresses = relationship(mapper(Address, addresses), lazy='select',
                                  order_by=addresses.c.id),
             adlist = synonym('addresses')))
 
@@ -1121,7 +1121,7 @@ class OptionsTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_eager_options_with_limit(self):
         mapper(User, users, properties=dict(
-            addresses=relationship(mapper(Address, addresses), lazy=True)))
+            addresses=relationship(mapper(Address, addresses), lazy='select')))
 
         sess = create_session()
         u = (sess.query(User).
@@ -1143,7 +1143,7 @@ class OptionsTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_lazy_options_with_limit(self):
         mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=False)))
+            addresses = relationship(mapper(Address, addresses), lazy='joined')))
 
         sess = create_session()
         u = (sess.query(User).
@@ -1159,7 +1159,7 @@ class OptionsTest(_fixtures.FixtureTest):
     def test_eager_degrade(self):
         """An eager relationship automatically degrades to a lazy relationship if eager columns are not available"""
         mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=False)))
+            addresses = relationship(mapper(Address, addresses), lazy='joined')))
 
         sess = create_session()
         # first test straight eager load, 1 statement
@@ -1192,17 +1192,17 @@ class OptionsTest(_fixtures.FixtureTest):
 
         mapper(Item, items, properties=dict(
             keywords=relationship(Keyword, secondary=item_keywords,
-                              lazy=False,
+                              lazy='joined',
                               order_by=item_keywords.c.keyword_id)))
 
         mapper(Order, orders, properties=dict(
-            items=relationship(Item, secondary=order_items, lazy=False,
+            items=relationship(Item, secondary=order_items, lazy='joined',
                            order_by=order_items.c.item_id)))
 
         mapper(User, users, properties=dict(
-            addresses=relationship(Address, lazy=False,
+            addresses=relationship(Address, lazy='joined',
                                order_by=addresses.c.id),
-            orders=relationship(Order, lazy=False,
+            orders=relationship(Order, lazy='joined',
                             order_by=orders.c.id)))
 
         sess = create_session()
@@ -1227,7 +1227,7 @@ class OptionsTest(_fixtures.FixtureTest):
     def test_lazy_options(self):
         """An eager relationship can be upgraded to a lazy relationship."""
         mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=False)
+            addresses = relationship(mapper(Address, addresses), lazy='joined')
         ))
 
         sess = create_session()
@@ -2309,7 +2309,7 @@ class NoLoadTest(_fixtures.FixtureTest):
     def test_basic(self):
         """A basic one-to-many lazy load"""
         m = mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=None)
+            addresses = relationship(mapper(Address, addresses), lazy='noload')
         ))
         q = create_session().query(m)
         l = [None]
@@ -2326,7 +2326,7 @@ class NoLoadTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_options(self):
         m = mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=None)
+            addresses = relationship(mapper(Address, addresses), lazy='noload')
         ))
         q = create_session().query(m).options(sa.orm.lazyload('addresses'))
         l = [None]
index 113f8f1f231139f442ec1bd7506779c82df4aa18..cd8252417e87fb49af1af6ff16f60f6422fea928 100644 (file)
@@ -3338,13 +3338,13 @@ class CustomJoinTest(QueryTest):
         """test aliasing of joins with a custom join condition"""
         mapper(Address, addresses)
         mapper(Order, orders, properties={
-            'items':relationship(Item, secondary=order_items, lazy=True, order_by=items.c.id),
+            'items':relationship(Item, secondary=order_items, lazy='select', order_by=items.c.id),
         })
         mapper(Item, items)
         mapper(User, users, properties = dict(
-            addresses = relationship(Address, lazy=True),
-            open_orders = relationship(Order, primaryjoin = and_(orders.c.isopen == 1, users.c.id==orders.c.user_id), lazy=True),
-            closed_orders = relationship(Order, primaryjoin = and_(orders.c.isopen == 0, users.c.id==orders.c.user_id), lazy=True)
+            addresses = relationship(Address, lazy='select'),
+            open_orders = relationship(Order, primaryjoin = and_(orders.c.isopen == 1, users.c.id==orders.c.user_id), lazy='select'),
+            closed_orders = relationship(Order, primaryjoin = and_(orders.c.isopen == 0, users.c.id==orders.c.user_id), lazy='select')
         ))
         q = create_session().query(User)
         
@@ -3376,7 +3376,7 @@ class SelfReferentialTest(_base.MappedTest, AssertsCompiledSQL):
                 self.children.append(node)
 
         mapper(Node, nodes, properties={
-            'children':relationship(Node, lazy=True, join_depth=3,
+            'children':relationship(Node, lazy='select', join_depth=3,
                 backref=backref('parent', remote_side=[nodes.c.id])
             )
         })
@@ -3661,7 +3661,7 @@ class SelfReferentialM2MTest(_base.MappedTest):
             pass
 
         mapper(Node, nodes, properties={
-            'children':relationship(Node, lazy=True, secondary=node_to_nodes,
+            'children':relationship(Node, lazy='select', secondary=node_to_nodes,
                 primaryjoin=nodes.c.id==node_to_nodes.c.left_node_id,
                 secondaryjoin=nodes.c.id==node_to_nodes.c.right_node_id,
             )
@@ -3938,7 +3938,7 @@ class UpdateDeleteTest(_base.MappedTest):
     def setup_mappers(cls):
         mapper(User, users)
         mapper(Document, documents, properties={
-            'user': relationship(User, lazy=False, backref=backref('documents', lazy=True))
+            'user': relationship(User, lazy='joined', backref=backref('documents', lazy='select'))
         })
 
     @testing.resolve_artifact_names
index 116bc1077ff87b54fb29630d1d22300269a0c16e..7f67631a9870e42412de64cd384394476adecbfb 100644 (file)
@@ -342,7 +342,7 @@ class RelationshipTest3(_base.MappedTest):
                  primaryjoin=sa.and_(pages.c.jobno==pageversions.c.jobno,
                                      pages.c.pagename==pageversions.c.pagename),
                  order_by=pageversions.c.version,
-                 backref=backref('page',lazy=False)
+                 backref=backref('page',lazy='joined')
                 )})
         mapper(PageComment, pagecomments, properties={
             'page': relationship(
@@ -666,7 +666,7 @@ class RelationshipTest5(_base.MappedTest):
                order_by=sa.asc(container_select.c.type),
                properties=dict(
                    lineItems=relationship(LineItem,
-                       lazy=True,
+                       lazy='select',
                        cascade='all, delete-orphan',
                        order_by=sa.asc(items.c.id),
                        primaryjoin=sa.and_(
index eca8e9af175994f79b21f00cce5bd55098d51253..bcbd2c24597617c8ceb4b888af61da07f3d82a28 100644 (file)
@@ -423,7 +423,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
             'addresses':relationship(mapper(Address, addresses), 
                             lazy='subquery', 
                             order_by=addresses.c.id),
-            'orders':relationship(Order, lazy=True, order_by=orders.c.id)
+            'orders':relationship(Order, lazy='select', order_by=orders.c.id)
         })
 
         sess = create_session()
index d79634a64a7f68a0551f951ffc01e68b36385a50..fe4fac89e2025a3ce5b8858748789d645efc797a 100644 (file)
@@ -35,7 +35,7 @@ class HistoryTest(_fixtures.FixtureTest):
     def test_backref(self):
         am = mapper(Address, addresses)
         m = mapper(User, users, properties=dict(
-            addresses = relationship(am, backref='user', lazy=False)))
+            addresses = relationship(am, backref='user', lazy='joined')))
 
         session = create_session(autocommit=False)
 
@@ -1052,7 +1052,7 @@ class OneToManyTest(_fixtures.FixtureTest):
         """Basic save of one to many."""
 
         m = mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=True)
+            addresses = relationship(mapper(Address, addresses), lazy='select')
         ))
         u = User(name= 'one2manytester')
         a = Address(email_address='one2many@test.org')
@@ -1092,7 +1092,7 @@ class OneToManyTest(_fixtures.FixtureTest):
         """Modifying the child items of an object."""
 
         m = mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=True)))
+            addresses = relationship(mapper(Address, addresses), lazy='select')))
 
         u1 = User(name='user1')
         u1.addresses = []
@@ -1140,7 +1140,7 @@ class OneToManyTest(_fixtures.FixtureTest):
 
         """
         m = mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=True)))
+            addresses = relationship(mapper(Address, addresses), lazy='select')))
 
         u1 = User(name='user1')
         u2 = User(name='user2')
@@ -1164,7 +1164,7 @@ class OneToManyTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_child_move_2(self):
         m = mapper(User, users, properties=dict(
-            addresses = relationship(mapper(Address, addresses), lazy=True)))
+            addresses = relationship(mapper(Address, addresses), lazy='select')))
 
         u1 = User(name='user1')
         u2 = User(name='user2')
@@ -1188,7 +1188,7 @@ class OneToManyTest(_fixtures.FixtureTest):
     def test_o2m_delete_parent(self):
         m = mapper(User, users, properties=dict(
             address = relationship(mapper(Address, addresses),
-                               lazy=True,
+                               lazy='select',
                                uselist=False)))
 
         u = User(name='one2onetester')
@@ -1211,7 +1211,7 @@ class OneToManyTest(_fixtures.FixtureTest):
     def test_one_to_one(self):
         m = mapper(User, users, properties=dict(
             address = relationship(mapper(Address, addresses),
-                               lazy=True,
+                               lazy='select',
                                uselist=False)))
 
         u = User(name='one2onetester')
@@ -1231,7 +1231,7 @@ class OneToManyTest(_fixtures.FixtureTest):
     def test_bidirectional(self):
         m1 = mapper(User, users)
         m2 = mapper(Address, addresses, properties=dict(
-            user = relationship(m1, lazy=False, backref='addresses')))
+            user = relationship(m1, lazy='joined', backref='addresses')))
 
 
         u = User(name='test')
@@ -1550,7 +1550,7 @@ class ManyToOneTest(_fixtures.FixtureTest):
     def test_m2o_one_to_one(self):
         # TODO: put assertion in here !!!
         m = mapper(Address, addresses, properties=dict(
-            user = relationship(mapper(User, users), lazy=True, uselist=False)))
+            user = relationship(mapper(User, users), lazy='select', uselist=False)))
 
         session = create_session()
 
@@ -1601,7 +1601,7 @@ class ManyToOneTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_many_to_one_1(self):
         m = mapper(Address, addresses, properties=dict(
-            user = relationship(mapper(User, users), lazy=True)))
+            user = relationship(mapper(User, users), lazy='select')))
 
         a1 = Address(email_address='emailaddress1')
         u1 = User(name='user1')
@@ -1626,7 +1626,7 @@ class ManyToOneTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_many_to_one_2(self):
         m = mapper(Address, addresses, properties=dict(
-            user = relationship(mapper(User, users), lazy=True)))
+            user = relationship(mapper(User, users), lazy='select')))
 
         a1 = Address(email_address='emailaddress1')
         a2 = Address(email_address='emailaddress2')
@@ -1657,7 +1657,7 @@ class ManyToOneTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_many_to_one_3(self):
         m = mapper(Address, addresses, properties=dict(
-            user = relationship(mapper(User, users), lazy=True)))
+            user = relationship(mapper(User, users), lazy='select')))
 
         a1 = Address(email_address='emailaddress1')
         u1 = User(name='user1')
@@ -1685,7 +1685,7 @@ class ManyToOneTest(_fixtures.FixtureTest):
     @testing.resolve_artifact_names
     def test_bidirectional_no_load(self):
         mapper(User, users, properties={
-            'addresses':relationship(Address, backref='user', lazy=None)})
+            'addresses':relationship(Address, backref='user', lazy='noload')})
         mapper(Address, addresses)
 
         # try it on unsaved objects
@@ -1717,7 +1717,7 @@ class ManyToManyTest(_fixtures.FixtureTest):
         m = mapper(Item, items, properties=dict(
                 keywords=relationship(Keyword,
                                   item_keywords,
-                                  lazy=False,
+                                  lazy='joined',
                                   order_by=keywords.c.name)))
 
         data = [Item,
@@ -1823,7 +1823,7 @@ class ManyToManyTest(_fixtures.FixtureTest):
         """
         mapper(Keyword, keywords)
         mapper(Item, items, properties=dict(
-            keywords = relationship(Keyword, item_keywords, lazy=False),
+            keywords = relationship(Keyword, item_keywords, lazy='joined'),
             ))
 
         i = Item(description='i1')
@@ -1864,7 +1864,7 @@ class ManyToManyTest(_fixtures.FixtureTest):
         mapper(Item, items, properties=dict(
             keywords=relationship(Keyword,
                               secondary=item_keywords,
-                              lazy=False,
+                              lazy='joined',
                               order_by=keywords.c.name)))
 
         k1 = Keyword(name='keyword 1')
@@ -1904,14 +1904,14 @@ class ManyToManyTest(_fixtures.FixtureTest):
                primary_key=[item_keywords.c.item_id, item_keywords.c.keyword_id],
                properties=dict(
                  keyword=relationship(mapper(Keyword, keywords, non_primary=True),
-                                  lazy=False,
+                                  lazy='joined',
                                   uselist=False,
                                   order_by=keywords.c.name      # note here is a valid place where order_by can be used
                                   )))                           # on a scalar relationship(); to determine eager ordering of
                                                                 # the parent object within its collection.
 
         mapper(Item, items, properties=dict(
-            keywords=relationship(IKAssociation, lazy=False)))
+            keywords=relationship(IKAssociation, lazy='joined')))
 
         session = create_session()
 
@@ -1946,7 +1946,7 @@ class SaveTest2(_fixtures.FixtureTest):
     def test_m2o_nonmatch(self):
         mapper(User, users)
         mapper(Address, addresses, properties=dict(
-            user = relationship(User, lazy=True, uselist=False)))
+            user = relationship(User, lazy='select', uselist=False)))
 
         session = create_session()
 
@@ -2003,7 +2003,7 @@ class SaveTest3(_base.MappedTest):
 
         mapper(Keyword, keywords)
         mapper(Item, items, properties=dict(
-                keywords = relationship(Keyword, secondary=assoc, lazy=False),))
+                keywords = relationship(Keyword, secondary=assoc, lazy='joined'),))
 
         i = Item()
         k1 = Keyword()
index ab3f00fa4edd30f5fdf447361a80339925628c6d..2ed8d2803b7c5b166d4699adf4b43c8960c5bb42 100644 (file)
@@ -17,7 +17,7 @@ subitems = Table('subitems', meta,
 
 class Item(object):pass
 class SubItem(object):pass
-mapper(Item, items, properties={'subs':relationship(SubItem, lazy=False)})
+mapper(Item, items, properties={'subs':relationship(SubItem, lazy='joined')})
 mapper(SubItem, subitems)
 
 def load():
index f98873afddba2db1d6bf0d33f9385603a4a5f282..fad22189abffd6b9751613d7c5884aa37cccef21 100644 (file)
@@ -27,7 +27,7 @@ class Email(object):
                                   getattr(self, 'address', None))
 
 mapper(Person, Person_table, properties={
-    'emails': relationship(Email, backref='owner', lazy=False)
+    'emails': relationship(Email, backref='owner', lazy='joined')
     })
 mapper(Email, Email_table)
 compile_mappers()
index 0df440aabf14274fb1747ba9d940c242e4d8b6eb..0b01fc5a37ab1950a53b9d1b4df26c3f527d7f9d 100644 (file)
@@ -61,14 +61,14 @@ def define_tables():
 @profiled('mapper')
 def setup_mappers():
     mapper(Item, items, properties={
-            'subitems': relationship(SubItem, backref='item', lazy=True)
+            'subitems': relationship(SubItem, backref='item', lazy='select')
             })
     mapper(SubItem, subitems)
     mapper(Customer, customers, properties={
-            'purchases': relationship(Purchase, lazy=True, backref='customer')
+            'purchases': relationship(Purchase, lazy='select', backref='customer')
             })
     mapper(Purchase, purchases, properties={
-            'items': relationship(Item, lazy=True, secondary=purchaseitems)
+            'items': relationship(Item, lazy='select', secondary=purchaseitems)
             })
 
 @profiled('inserts')
index 45d10151207e4811a7a16b46dff2b9b3f4a16206..4ad542ec147e363334a0bc75e04aadf6e09c1000 100644 (file)
@@ -22,7 +22,7 @@ def zblog_mappers():
     # ways. this will also attach a 'blogs' property to the user mapper.
     mapper(Blog, tables.blogs, properties={
         'id':tables.blogs.c.blog_id,
-        'owner':relationship(user.User, lazy=False,
+        'owner':relationship(user.User, lazy='joined',
                          backref=backref('blogs', cascade="all, delete-orphan")),
     })
 
@@ -38,7 +38,7 @@ def zblog_mappers():
                 primary_key=[tables.topic_xref.c.post_id,
                              tables.topic_xref.c.topic_id],
                 properties={
-                    'topic':relationship(Topic, lazy=False),
+                    'topic':relationship(Topic, lazy='joined'),
                 })
 
     # Post mapper, these are posts within a blog.
@@ -66,11 +66,11 @@ def zblog_mappers():
     mapper(Post, posts_with_ccount, properties={
         'id':posts_with_ccount.c.post_id,
         'body':deferred(tables.posts.c.body),
-        'user':relationship(user.User, lazy=True,
+        'user':relationship(user.User, lazy='select',
                         backref=backref('posts', cascade="all, delete-orphan")),
-        'blog':relationship(Blog, lazy=True,
+        'blog':relationship(Blog, lazy='select',
                         backref=backref('posts', cascade="all, delete-orphan")),
-        'topics':relationship(TopicAssociation, lazy=False,
+        'topics':relationship(TopicAssociation, lazy='joined',
                           cascade="all, delete-orphan",
                           backref='post')
     }, order_by=[desc(posts_with_ccount.c.datetime)])
@@ -81,21 +81,21 @@ def zblog_mappers():
     # list of child comments.
     mapper(Comment, tables.comments, properties={
         'id':tables.comments.c.comment_id,
-        'post':relationship(Post, lazy=True,
+        'post':relationship(Post, lazy='select',
                         backref=backref('comments',
                                         cascade="all, delete-orphan")),
-        'user':relationship(user.User, lazy=False,
+        'user':relationship(user.User, lazy='joined',
                         backref=backref('comments',
                                         cascade="all, delete-orphan")),
         'parent':relationship(Comment,
                           primaryjoin=(tables.comments.c.parent_comment_id ==
                                        tables.comments.c.comment_id),
                           foreign_keys=[tables.comments.c.comment_id],
-                          lazy=True, uselist=False),
+                          lazy='select', uselist=False),
         'replies':relationship(Comment,
                            primaryjoin=(tables.comments.c.parent_comment_id ==
                                         tables.comments.c.comment_id),
-                           lazy=True, uselist=True, cascade="all"),
+                           lazy='select', uselist=True, cascade="all"),
     })
 
 # we define one special find-by for the comments of a post, which is going to