Merge "Enhance "raise" strategy to include "raise_on_sql" option"

2 files changed, 59 insertions, 3 deletions

diff --git a/test/ext/test_baked.py b/test/ext/test_baked.py
index 4250e363b..2f501eb6c 100644
--- a/test/ext/test_baked.py
+++ b/test/ext/test_baked.py
@@ -576,7 +576,7 @@ class ResultTest(BakedTest):
                 Address(id=4, email_address='ed@lala.com'),
             ]),
             User(id=9,
-                addresses=[Address(id=5)], 
+                addresses=[Address(id=5)],
                 orders=[Order(id=2), Order(id=4)]),
             User(id=10, addresses=[])
         ]
@@ -728,7 +728,6 @@ class LazyLoaderTest(BakedTest):
 
     def test_systemwide_loaders_loadable_via_lazyloader(self):
         from sqlalchemy.orm import configure_mappers
-        from sqlalchemy.orm.strategies import LazyLoader
 
         baked.bake_lazy_loaders()
         try:
@@ -738,7 +737,7 @@ class LazyLoaderTest(BakedTest):
 
             is_(
                 User.addresses.property.
-                _get_strategy_by_cls(LazyLoader).__class__,
+                _get_strategy((('lazy', 'select'), )).__class__,
                 BakedLazyLoader
             )
         finally:
diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py
index 045016bb3..8c4171125 100644
--- a/test/orm/test_mapper.py
+++ b/test/orm/test_mapper.py
@@ -2874,6 +2874,63 @@ class RaiseLoadTest(_fixtures.FixtureTest):
 
         self.sql_count_(0, go)
 
+    def test_m2o_raise_on_sql_option(self):
+        Address, addresses, users, User = (
+            self.classes.Address,
+            self.tables.addresses,
+            self.tables.users,
+            self.classes.User)
+        mapper(Address, addresses, properties={
+            'user': relationship(User)
+        })
+        mapper(User, users)
+        s = Session()
+        a1 = s.query(Address).filter_by(id=1).options(
+            sa.orm.raiseload('user', sql_only=True)).first()
+
+        def go():
+            assert_raises_message(
+                sa.exc.InvalidRequestError,
+                "'Address.user' is not available due to lazy='raise_on_sql'",
+                lambda: a1.user)
+
+        self.sql_count_(0, go)
+
+        s.close()
+
+        u1 = s.query(User).first()
+        a1 = s.query(Address).filter_by(id=1).options(
+            sa.orm.raiseload('user', sql_only=True)).first()
+        assert 'user' not in a1.__dict__
+        is_(a1.user, u1)
+
+    def test_m2o_non_use_get_raise_on_sql_option(self):
+        Address, addresses, users, User = (
+            self.classes.Address,
+            self.tables.addresses,
+            self.tables.users,
+            self.classes.User)
+        mapper(Address, addresses, properties={
+            'user': relationship(
+                User,
+                primaryjoin=sa.and_(
+                    addresses.c.user_id == users.c.id ,
+                    users.c.name != None
+                )
+            )
+        })
+        mapper(User, users)
+        s = Session()
+        u1 = s.query(User).first()
+        a1 = s.query(Address).filter_by(id=1).options(
+            sa.orm.raiseload('user', sql_only=True)).first()
+
+        def go():
+            assert_raises_message(
+                sa.exc.InvalidRequestError,
+                "'Address.user' is not available due to lazy='raise_on_sql'",
+                lambda: a1.user)
+
 
 class RequirementsTest(fixtures.MappedTest):