From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 30 Apr 2023 21:33:17 +0000 (-0400)
Subject: cherry-pick changelog from 1.4.48
X-Git-Tag: rel_2_0_12~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65bc82717951afee55825e708a63abd200085a70;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cherry-pick changelog from 1.4.48
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index 1e80c684c5..111c220243 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -15,7 +15,41 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.48
-    :include_notes_from: unreleased_14
+    :released: April 30, 2023
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 9728
+        :versions: 2.0.12
+
+        Fixed critical caching issue where the combination of
+        :func:`_orm.aliased()` and :func:`_hybrid.hybrid_property` expression
+        compositions would cause a cache key mismatch, leading to cache keys that
+        held onto the actual :func:`_orm.aliased` object while also not matching
+        that of equivalent constructs, filling up the cache.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 9634
+        :versions: 2.0.10
+
+        Fixed bug where various ORM-specific getters such as
+        :attr:`.ORMExecuteState.is_column_load`,
+        :attr:`.ORMExecuteState.is_relationship_load`,
+        :attr:`.ORMExecuteState.loader_strategy_path` etc. would throw an
+        ``AttributeError`` if the SQL statement itself were a "compound select"
+        such as a UNION.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 9590
+        :versions: 2.0.9
+
+        Fixed endless loop which could occur when using "relationship to aliased
+        class" feature and also indicating a recursive eager loader such as
+        ``lazy="selectinload"`` in the loader, in combination with another eager
+        loader on the opposite side. The check for cycles has been fixed to include
+        aliased class relationships.
 
 .. changelog::
     :version: 1.4.47
diff --git a/doc/build/changelog/unreleased_14/9590.rst b/doc/build/changelog/unreleased_14/9590.rst
deleted file mode 100644
index 472cfc70e8..0000000000
--- a/doc/build/changelog/unreleased_14/9590.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 9590
-    :versions: 2.0.9
-
-    Fixed endless loop which could occur when using "relationship to aliased
-    class" feature and also indicating a recursive eager loader such as
-    ``lazy="selectinload"`` in the loader, in combination with another eager
-    loader on the opposite side. The check for cycles has been fixed to include
-    aliased class relationships.
diff --git a/doc/build/changelog/unreleased_14/9634.rst b/doc/build/changelog/unreleased_14/9634.rst
deleted file mode 100644
index 664e85716b..0000000000
--- a/doc/build/changelog/unreleased_14/9634.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 9634
-    :versions: 2.0.10
-
-    Fixed bug where various ORM-specific getters such as
-    :attr:`.ORMExecuteState.is_column_load`,
-    :attr:`.ORMExecuteState.is_relationship_load`,
-    :attr:`.ORMExecuteState.loader_strategy_path` etc. would throw an
-    ``AttributeError`` if the SQL statement itself were a "compound select"
-    such as a UNION.
diff --git a/doc/build/changelog/unreleased_14/9728.rst b/doc/build/changelog/unreleased_14/9728.rst
deleted file mode 100644
index c5908dbad6..0000000000
--- a/doc/build/changelog/unreleased_14/9728.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 9728
-    :versions: 2.0.12
-
-    Fixed critical caching issue where the combination of
-    :func:`_orm.aliased()` and :func:`_hybrid.hybrid_property` expression
-    compositions would cause a cache key mismatch, leading to cache keys that
-    held onto the actual :func:`_orm.aliased` object while also not matching
-    that of equivalent constructs, filling up the cache.