summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2020-06-03 09:50:04 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2020-06-03 11:36:37 -0400
commit7f0cb933f2b1979a8d781855618b7fd3bf280037 (patch)
tree22957c23cdd906a929cd7e3daecacef5e0675513 /lib/sqlalchemy/sql/compiler.py
parent58ea81121877330e4bacd5aa4934c2742fc11693 (diff)
downloadsqlalchemy-7f0cb933f2b1979a8d781855618b7fd3bf280037.tar.gz
Inline a few ORM arguments, others
small changes Change-Id: Id89a0651196c431d0aaf6935f5a4e7b12dd70c6c
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 4bd19e04b..f4160b552 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -2829,10 +2829,12 @@ class SQLCompiler(Compiled):
if self.linting & COLLECT_CARTESIAN_PRODUCTS:
from_linter = FromLinter({}, set())
+ warn_linting = self.linting & WARN_LINTING
if toplevel:
self.from_linter = from_linter
else:
from_linter = None
+ warn_linting = False
if froms:
text += " \nFROM "
@@ -2872,10 +2874,7 @@ class SQLCompiler(Compiled):
if t:
text += " \nWHERE " + t
- if (
- self.linting & COLLECT_CARTESIAN_PRODUCTS
- and self.linting & WARN_LINTING
- ):
+ if warn_linting:
from_linter.warn()
if select._group_by_clauses: