From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 31 Mar 2022 22:28:33 +0000 (-0400)
Subject: cherry-pick changelog from 1.4.34
X-Git-Tag: rel_2_0_0b1~382
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4ba1a37c8afe42161dba86a6cf45afe248dd68;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cherry-pick changelog from 1.4.34
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index 5bf48f2d33..2ca5947518 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -15,7 +15,27 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.34
-    :include_notes_from: unreleased_14
+    :released: March 31, 2022
+
+    .. change::
+        :tags: bug, orm, regression
+        :tickets: 7878
+
+        Fixed regression caused by :ticket:`7861` where invoking an
+        :class:`.Insert` construct which contained ORM entities directly via
+        :meth:`_orm.Session.execute` would fail.
+
+    .. change::
+        :tags: bug, postgresql
+        :tickets: 7880
+
+        Scaled back a fix made for :ticket:`6581` where "executemany values" mode
+        for psycopg2 were disabled for all "ON CONFLICT" styles of INSERT, to
+        not apply to the "ON CONFLICT DO NOTHING" clause, which does not include
+        any parameters and is safe for "executemany values" mode.  "ON CONFLICT
+        DO UPDATE" is still blocked from "executemany values" as there may
+        be additional parameters in the DO UPDATE clause that cannot be batched
+        (which is the original issue fixed by :ticket:`6581`).
 
 .. changelog::
     :version: 1.4.33
diff --git a/doc/build/changelog/unreleased_14/7878.rst b/doc/build/changelog/unreleased_14/7878.rst
deleted file mode 100644
index 6c9e92929e..0000000000
--- a/doc/build/changelog/unreleased_14/7878.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, orm, regression
-    :tickets: 7878
-
-    Fixed regression caused by :ticket:`7861` where invoking an
-    :class:`.Insert` construct which contained ORM entities directly via
-    :meth:`_orm.Session.execute` would fail.
diff --git a/doc/build/changelog/unreleased_14/7880.rst b/doc/build/changelog/unreleased_14/7880.rst
deleted file mode 100644
index 9abbac1cfa..0000000000
--- a/doc/build/changelog/unreleased_14/7880.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change::
-    :tags: bug, postgresql
-    :tickets: 7880
-
-    Scaled back a fix made for :ticket:`6581` where "executemany values" mode
-    for psycopg2 were disabled for all "ON CONFLICT" styles of INSERT, to
-    not apply to the "ON CONFLICT DO NOTHING" clause, which does not include
-    any parameters and is safe for "executemany values" mode.  "ON CONFLICT
-    DO UPDATE" is still blocked from "executemany values" as there may
-    be additional parameters in the DO UPDATE clause that cannot be batched
-    (which is the original issue fixed by :ticket:`6581`).