diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-10-28 15:28:46 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-10-28 15:28:46 -0400 |
| commit | ec5e4f3543cc2896c83c5854cc5c39a80cc11b2f (patch) | |
| tree | c7243d944c94a872299b092c07b4c99f764c50f0 | |
| parent | 4755e1fb41dd396ffef0b4ae93a3cbc0c151f695 (diff) | |
| parent | 26d9a29514ea0949f09f75622065e737fabeabe1 (diff) | |
| download | sqlalchemy-ec5e4f3543cc2896c83c5854cc5c39a80cc11b2f.tar.gz | |
Merge remote-tracking branch 'origin/pr/4940'
Change-Id: Id88c540fab045f800818c40b7a8f7a20920ab9a6
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 0ea6d4296..909d568a7 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -409,7 +409,7 @@ for UPDATE:: The :meth:`.Insert.on_conflict_do_update` method does **not** take into account Python-side default UPDATE values or generation functions, e.g. - e.g. those specified using :paramref:`.Column.onupdate`. + those specified using :paramref:`.Column.onupdate`. These values will not be exercised for an ON CONFLICT style of UPDATE, unless they are manually specified in the :paramref:`.Insert.on_conflict_do_update.set_` dictionary. |