summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/postgresql/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-11-07 21:41:11 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-11-07 22:03:16 -0500
commit942c2429c033255979b6a55de836b9b26370673e (patch)
tree6d0d97312a67814cda5d39cf23d09b1360b5884b /lib/sqlalchemy/dialects/postgresql/base.py
parentc4a8afa4c6bf5e76c24e8ed0b5c11acc0c8904e3 (diff)
downloadsqlalchemy-942c2429c033255979b6a55de836b9b26370673e.tar.gz
Put include_table=True for DO UPDATE..WHERE, but not ON CONFLICT
Fixed regression caused by the fix in :ticket:`3807` (version 1.1.0) where we ensured that the tablename was qualified in the WHERE clause of the DO UPDATE portion of PostgreSQL's ON CONFLICT, however you *cannot* put the table name in the WHERE clause in the actual ON CONFLICT itself. This was an incorrect assumption, so that portion of the change in :ticket:`3807` is rolled back. Change-Id: I442d8629496a8e405b54711cfcf487761810ae8a Fixes: #3846 Fixes: #3807
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/base.py')
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 9898e4ba4..4c82325f5 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1433,6 +1433,7 @@ class PGCompiler(compiler.SQLCompiler):
target_text += ' WHERE %s' % \
self.process(
clause.inferred_target_whereclause,
+ include_table=False,
use_schema=False
)
else: