Merge "turn off eager configure_mappers() outside of Query, Load"

3 files changed, 24 insertions, 5 deletions

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 4e2b4cdeb..bbad6b05a 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -179,7 +179,10 @@ class Query(
     def _set_entities(self, entities):
         self._raw_columns = [
             coercions.expect(
-                roles.ColumnsClauseRole, ent, apply_propagate_attrs=self
+                roles.ColumnsClauseRole,
+                ent,
+                apply_propagate_attrs=self,
+                post_inspect=True,
             )
             for ent in util.to_list(entities)
         ]
@@ -1415,7 +1418,10 @@ class Query(
 
         self._raw_columns.extend(
             coercions.expect(
-                roles.ColumnsClauseRole, c, apply_propagate_attrs=self
+                roles.ColumnsClauseRole,
+                c,
+                apply_propagate_attrs=self,
+                post_inspect=True,
             )
             for c in column
         )
@@ -3217,7 +3223,10 @@ class FromStatement(GroupedElement, SelectBase, Executable):
     def __init__(self, entities, element):
         self._raw_columns = [
             coercions.expect(
-                roles.ColumnsClauseRole, ent, apply_propagate_attrs=self
+                roles.ColumnsClauseRole,
+                ent,
+                apply_propagate_attrs=self,
+                post_inspect=True,
             )
             for ent in util.to_list(entities)
         ]
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index f24f42a6b..932c4a37d 100644
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -89,6 +89,8 @@ class Load(Generative, LoaderOption):
 
     def __init__(self, entity):
         insp = inspect(entity)
+        insp._post_inspect
+
         self.path = insp._path_registry
         # note that this .context is shared among all descendant
         # Load objects
diff --git a/lib/sqlalchemy/sql/coercions.py b/lib/sqlalchemy/sql/coercions.py
index 8c7963205..76ba7e214 100644
--- a/lib/sqlalchemy/sql/coercions.py
+++ b/lib/sqlalchemy/sql/coercions.py
@@ -109,7 +109,14 @@ def _expression_collection_was_a_list(attrname, fnname, args):
         return args
 
 
-def expect(role, element, apply_propagate_attrs=None, argname=None, **kw):
+def expect(
+    role,
+    element,
+    apply_propagate_attrs=None,
+    argname=None,
+    post_inspect=False,
+    **kw
+):
     if (
         role.allows_lambda
         # note callable() will not invoke a __getattr__() method, whereas
@@ -157,7 +164,8 @@ def expect(role, element, apply_propagate_attrs=None, argname=None, **kw):
                 if impl._use_inspection:
                     insp = inspection.inspect(element, raiseerr=False)
                     if insp is not None:
-                        insp._post_inspect
+                        if post_inspect:
+                            insp._post_inspect
                         try:
                             resolved = insp.__clause_element__()
                         except AttributeError: