From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 6 Apr 2022 15:34:24 +0000 (-0400)
Subject: cherry-pick changelog from 1.4.35
X-Git-Tag: rel_2_0_0b1~372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=975bcecb74a0f8e4b33ff74fc0715a2f5fe763c9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cherry-pick changelog from 1.4.35
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index 179bd9176d..422b1fc843 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -15,7 +15,40 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.35
-    :include_notes_from: unreleased_14
+    :released: April 6, 2022
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 7890
+
+        Fixed bug in newly implemented
+        :paramref:`.FunctionElement.table_valued.joins_implicitly` feature where
+        the parameter would not automatically propagate from the original
+        :class:`.TableValuedAlias` object to the secondary object produced when
+        calling upon :meth:`.TableValuedAlias.render_derived` or
+        :meth:`.TableValuedAlias.alias`.
+
+        Additionally repaired these issues in :class:`.TableValuedAlias`:
+
+        * repaired a potential memory issue which could occur when
+          repeatedly calling :meth:`.TableValuedAlias.render_derived` against
+          successive copies of the same object (for .alias(), we currently
+          have to still continue chaining from the previous element.  not sure
+          if this can be improved but this is standard behavior for .alias()
+          elsewhere)
+        * repaired issue where the individual element types would be lost when
+          calling upon :meth:`.TableValuedAlias.render_derived` or
+          :meth:`.TableValuedAlias.alias`.
+
+    .. change::
+        :tags: bug, sql, regression
+        :tickets: 7903
+
+        Fixed regression caused by :ticket:`7823` which impacted the caching
+        system, such that bound parameters that had been "cloned" within ORM
+        operations, such as polymorphic loading, would in some cases not acquire
+        their correct execution-time value leading to incorrect bind values being
+        rendered.
 
 .. changelog::
     :version: 1.4.34
diff --git a/doc/build/changelog/unreleased_14/7890.rst b/doc/build/changelog/unreleased_14/7890.rst
deleted file mode 100644
index 94a29abde5..0000000000
--- a/doc/build/changelog/unreleased_14/7890.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 7890
-
-    Fixed bug in newly implemented
-    :paramref:`.FunctionElement.table_valued.joins_implicitly` feature where
-    the parameter would not automatically propagate from the original
-    :class:`.TableValuedAlias` object to the secondary object produced when
-    calling upon :meth:`.TableValuedAlias.render_derived` or
-    :meth:`.TableValuedAlias.alias`.
-
-    Additionally repaired these issues in :class:`.TableValuedAlias`:
-
-    * repaired a potential memory issue which could occur when
-      repeatedly calling :meth:`.TableValuedAlias.render_derived` against
-      successive copies of the same object (for .alias(), we currently
-      have to still continue chaining from the previous element.  not sure
-      if this can be improved but this is standard behavior for .alias()
-      elsewhere)
-    * repaired issue where the individual element types would be lost when
-      calling upon :meth:`.TableValuedAlias.render_derived` or
-      :meth:`.TableValuedAlias.alias`.
diff --git a/doc/build/changelog/unreleased_14/7903.rst b/doc/build/changelog/unreleased_14/7903.rst
deleted file mode 100644
index 816504cfe3..0000000000
--- a/doc/build/changelog/unreleased_14/7903.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, sql, regression
-    :tickets: 7903
-
-    Fixed regression caused by :ticket:`7823` which impacted the caching
-    system, such that bound parameters that had been "cloned" within ORM
-    operations, such as polymorphic loading, would in some cases not acquire
-    their correct execution-time value leading to incorrect bind values being
-    rendered.