From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 20 Jan 2021 22:08:35 +0000 (-0500)
Subject: Add missing changelog file
X-Git-Tag: rel_1_4_0b2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1569de61cc15d4c0f907acf530bcde317e3b1f1b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Add missing changelog file

In 8860117c9655a4bdeafeba we forgot to add the changelog file.

Fixes: #5169
Change-Id: Ia7a106e9e49aacbfd788eaec46b7826e8e4e065a
---

diff --git a/doc/build/changelog/unreleased_14/5169.rst b/doc/build/changelog/unreleased_14/5169.rst
new file mode 100644
index 0000000000..e43e451cce
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/5169.rst
@@ -0,0 +1,13 @@
+.. change::
+    :tags: bug, sql, postgresql, mysql, sqlite
+    :tickets: 5169
+
+    An informative error message is now raised for a selected set of DML
+    methods (currently all part of :class:`_dml.Insert` constructs) if they are
+    called a second time, which would implicitly cancel out the previous
+    setting.  The methods altered include:
+    :class:`_sqlite.Insert.on_conflict_do_update`,
+    :class:`_sqlite.Insert.on_conflict_do_nothing` (SQLite),
+    :class:`_postgresql.Insert.on_conflict_do_update`,
+    :class:`_postgresql.Insert.on_conflict_do_nothing` (PostgreSQL),
+    :class:`_mysql.Insert.on_duplicate_key_update` (MySQL)
\ No newline at end of file