summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2021-02-07 09:57:38 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2021-02-07 09:57:38 -0500
commit80010c63149be411e89c7434a9d52096f9de56b8 (patch)
tree4a3042d014f2d18fc12cb4c8da43ba16f162e050 /lib/sqlalchemy/testing
parent10f05288dca4fdbaa4670dd7ef856e441bdb4adc (diff)
parentbc9221bf781adfffdddf12860d4eed7650457a0a (diff)
downloadsqlalchemy-80010c63149be411e89c7434a9d52096f9de56b8.tar.gz
Merge branch 'master' of ssh://gerrit.sqlalchemy.org:29418/sqlalchemy/sqlalchemy
Change-Id: Idc5c09e2953c998aa5b9a49715e23026bba2e851
Diffstat (limited to 'lib/sqlalchemy/testing')
-rw-r--r--lib/sqlalchemy/testing/assertions.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index 79125e1f1..44d7405b1 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -394,6 +394,7 @@ class AssertsCompiledSQL(object):
schema_translate_map=None,
render_schema_translate=False,
default_schema_name=None,
+ from_linting=False,
):
if use_default_dialect:
dialect = default.DefaultDialect()
@@ -438,6 +439,9 @@ class AssertsCompiledSQL(object):
if render_schema_translate:
kw["render_schema_translate"] = True
+ if from_linting or getattr(self, "assert_from_linting", False):
+ kw["linting"] = sql.FROM_LINTING
+
from sqlalchemy import orm
if isinstance(clause, orm.dynamic.AppenderQuery):