diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-06-14 15:23:17 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ln3.zzzcomputing.com> | 2016-06-14 15:23:17 -0400 |
| commit | cfb59ecc9bbd2f5040dd5bb8c82491851b186681 (patch) | |
| tree | 15d65e78e29b8d8bed2cc16d2d11be1fe6a7f214 /lib/sqlalchemy/sql | |
| parent | f38f890849700ee1bf719a31275260e2da455bc3 (diff) | |
| parent | 4e9ab7a72f0ad506cf519069fd67127f63e5f2aa (diff) | |
| download | sqlalchemy-cfb59ecc9bbd2f5040dd5bb8c82491851b186681.tar.gz | |
Merge "Add ON CONFLICT support for Postgresql"
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/dml.py | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 6d9ab9039..94c7db20a 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -1984,6 +1984,12 @@ class SQLCompiler(Compiled): text += " VALUES (%s)" % \ ', '.join([c[1] for c in crud_params]) + if insert_stmt._post_values_clause is not None: + post_values_clause = self.process( + insert_stmt._post_values_clause, **kw) + if post_values_clause: + text += " " + post_values_clause + if returning_clause and not self.returning_precedes_values: text += " " + returning_clause diff --git a/lib/sqlalchemy/sql/dml.py b/lib/sqlalchemy/sql/dml.py index 8f368dcdb..b54b4792d 100644 --- a/lib/sqlalchemy/sql/dml.py +++ b/lib/sqlalchemy/sql/dml.py @@ -194,6 +194,7 @@ class ValuesBase(UpdateBase): _has_multi_parameters = False _preserve_parameter_order = False select = None + _post_values_clause = None def __init__(self, table, values, prefixes): self.table = _interpret_as_from(table) |