summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-04-27 14:33:54 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-04-27 14:33:54 -0400
commit63ff0140705207198545e3a0d7868a5ba8486e93 (patch)
treee86b5b0fd75b9b3569681235ee016f0192c661bd /lib/sqlalchemy
parent19d2424e05fadf66044d914b13a405cb212b4100 (diff)
downloadsqlalchemy-63ff0140705207198545e3a0d7868a5ba8486e93.tar.gz
- ensure that sqlalchemy.ext is set up for importlater
otherwise, it fails if you import from ext before orm: from sqlalchemy import * from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import * and then do a lazyload, as the ext.baked importlater is not initialized. Change-Id: I24dcbfc9ca9022316da28507772562833e45dd95
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/__init__.py1
-rw-r--r--lib/sqlalchemy/orm/strategies.py1
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 8d46324e8..adfe2360a 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -274,5 +274,6 @@ def __go(lcls):
if not (name.startswith('_') or _inspect.ismodule(obj)))
_sa_util.dependencies.resolve_all("sqlalchemy.orm")
+ _sa_util.dependencies.resolve_all("sqlalchemy.ext")
__go(locals())
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index ddf5397fd..00aabed0b 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -596,7 +596,6 @@ class LazyLoader(AbstractRelationshipLoader, util.MemoizedSlots):
"sqlalchemy.orm.strategy_options")
def _emit_lazyload(
self, strategy_options, session, state, ident_key, passive):
-
# emit lazy load now using BakedQuery, to cut way down on the overhead
# of generating queries.
# there are two big things we are trying to guard against here: