diff options
Diffstat (limited to 'lib/sqlalchemy/testing')
| -rw-r--r-- | lib/sqlalchemy/testing/assertions.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/provision.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py index c97202516..07a70bf6c 100644 --- a/lib/sqlalchemy/testing/assertions.py +++ b/lib/sqlalchemy/testing/assertions.py @@ -19,7 +19,6 @@ from . import mock from .exclusions import db_spec from .util import fail from .. import exc as sa_exc -from .. import orm from .. import schema from .. import types as sqltypes from .. import util @@ -386,6 +385,8 @@ class AssertsCompiledSQL(object): if render_postcompile: compile_kwargs["render_postcompile"] = True + from sqlalchemy import orm + if isinstance(clause, orm.Query): context = clause._compile_context() context.statement.use_labels = True diff --git a/lib/sqlalchemy/testing/provision.py b/lib/sqlalchemy/testing/provision.py index 6e2e1ccf5..543d91a53 100644 --- a/lib/sqlalchemy/testing/provision.py +++ b/lib/sqlalchemy/testing/provision.py @@ -6,7 +6,6 @@ from . import engines from ..engine import url as sa_url from ..util import compat - log = logging.getLogger(__name__) FOLLOWER_IDENT = None @@ -51,7 +50,9 @@ def setup_config(db_url, options, file_config, follower_ident): # load the dialect, which should also have it set up its provision # hooks - sa_url.make_url(db_url).get_dialect() + dialect = sa_url.make_url(db_url).get_dialect() + dialect.load_provisioning() + if follower_ident: db_url = follower_url_from_main(db_url, follower_ident) db_opts = {} |