diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-05-15 23:27:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-05-15 23:27:50 +0000 |
| commit | c4dad3695f4ab9fef3a4cb05893492afbec811f7 (patch) | |
| tree | f165cf4c7e99455ee6a7da0f8241e375232c5384 /lib/sqlalchemy | |
| parent | f9fccdeeb6749d10aeec458f1a549906d58ddad8 (diff) | |
| parent | 927abc3b33f10464ed04db3d7a454faeb6e729f2 (diff) | |
| download | sqlalchemy-c4dad3695f4ab9fef3a4cb05893492afbec811f7.tar.gz | |
Merge "render col name in on conflict set clause, not given key" into main
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/base.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 33563ac2c..c923f7014 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -2522,7 +2522,7 @@ class PGCompiler(compiler.SQLCompiler): value.type = c.type value_text = self.process(value.self_group(), use_schema=False) - key_text = self.preparer.quote(col_key) + key_text = self.preparer.quote(c.name) action_set_ops.append("%s = %s" % (key_text, value_text)) # check for names that don't match columns diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index ab525581a..2ce298436 100644 --- a/lib/sqlalchemy/dialects/sqlite/base.py +++ b/lib/sqlalchemy/dialects/sqlite/base.py @@ -1415,7 +1415,7 @@ class SQLiteCompiler(compiler.SQLCompiler): value.type = c.type value_text = self.process(value.self_group(), use_schema=False) - key_text = self.preparer.quote(col_key) + key_text = self.preparer.quote(c.name) action_set_ops.append("%s = %s" % (key_text, value_text)) # check for names that don't match columns |