From a14e5c42ca78435e5fe6ada35796d6fcf14be32e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 12 Sep 2017 12:57:40 -0400 Subject: use the stack to get the insert statement in on conflict Fixed bug in Postgresql :meth:`.postgresql.dml.Insert.on_conflict_do_update` which would prevent the insert statement from being used as a CTE, e.g. via :meth:`.Insert.cte`, within another statement. Change-Id: Ie20972a05e194290bc9d92819750845872949ecc Fixes: #4074 (cherry picked from commit 70516536107a44230762206342c51239c5d85417) --- lib/sqlalchemy/dialects/postgresql/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/dialects/postgresql/base.py') diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 7cb0ea7b0..0ee65651d 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -1520,7 +1520,9 @@ class PGCompiler(compiler.SQLCompiler): set_parameters = dict(clause.update_values_to_set) # create a list of column assignment clauses as tuples - cols = self.statement.table.c + + insert_statement = self.stack[-1]['selectable'] + cols = insert_statement.table.c for c in cols: col_key = c.key if col_key in set_parameters: -- cgit v1.2.1