From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 6 Feb 2023 21:25:15 +0000 (-0500)
Subject: changelog fixup
X-Git-Tag: rel_2_0_2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=066b1d607e670ed00177e05969c4a30f750d1315;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

changelog fixup

re-classify the large amount of recent issues involving
declarative under "orm declarative" and reword one of the
issue notes.

Change-Id: Id3a861b235573bf048a9ee4d38faeaade8a9dbdd
---

diff --git a/doc/build/changelog/changelog_20.rst b/doc/build/changelog/changelog_20.rst
index fe2bc97011..64bd6c4b3e 100644
--- a/doc/build/changelog/changelog_20.rst
+++ b/doc/build/changelog/changelog_20.rst
@@ -45,7 +45,7 @@
 
 
     .. change::
-        :tags: bug, orm
+        :tags: bug, orm declarative
         :tickets: 9175
 
         Added support for :pep:`484` ``NewType`` to be used in the
@@ -66,7 +66,7 @@
 
 
     .. change::
-        :tags: bug, orm
+        :tags: bug, orm declarative
         :tickets: 9179
 
         When using the :class:`.MappedAsDataclass` superclass, all classes within
@@ -96,7 +96,7 @@
         :class:`_schema.Index`.
 
     .. change::
-        :tags: bug, orm
+        :tags: bug, orm declarative
         :tickets: 9187
 
         Added support for :pep:`586` ``Literal[]`` to be used in the
@@ -119,7 +119,7 @@
 
 
     .. change::
-        :tags: bug, orm
+        :tags: bug, orm declarative
         :tickets: 9200
 
         Fixed issue involving the use of :class:`.sqltypes.Enum` within the
@@ -131,7 +131,7 @@
 
 
     .. change::
-        :tags: bug, orm, regression
+        :tags: bug, orm declarative, regression
         :tickets: 9171
 
         Fixed regression in :class:`.DeclarativeBase` class where the registry's
@@ -167,7 +167,7 @@
         only ``TypeEngine[T]`` was accepted.  Pull request courtesy Yurii Karabas.
 
     .. change::
-        :tags: bug, orm
+        :tags: bug, orm declarative
         :tickets: 9177
 
         Improved the ruleset used to interpret :pep:`593` ``Annotated`` types when
diff --git a/doc/build/changelog/unreleased_20/9211.rst b/doc/build/changelog/unreleased_20/9211.rst
index f15a64b053..87e256d625 100644
--- a/doc/build/changelog/unreleased_20/9211.rst
+++ b/doc/build/changelog/unreleased_20/9211.rst
@@ -1,5 +1,5 @@
 .. change::
-    :tags: bug, orm
+    :tags: bug, orm declarative
     :tickets: 9211
 
     An explicit error is raised if a mapping attempts to mix the use of
diff --git a/doc/build/changelog/unreleased_20/9226.rst b/doc/build/changelog/unreleased_20/9226.rst
index 36547602b1..be077d8273 100644
--- a/doc/build/changelog/unreleased_20/9226.rst
+++ b/doc/build/changelog/unreleased_20/9226.rst
@@ -1,9 +1,9 @@
 .. change::
-    :tags: bug, orm
+    :tags: bug, orm declarative
     :tickets: 9226
 
-    More adjustments to ORM Declarative Dataclasses mappings, building on the
-    improved support for mixins with dataclasses added in 2.0.1 via
-    :ticket:`9179`, where a combination of using mixins plus ORM inheritance
-    would mis-classify fields in some cases leading to their dataclass
-    arguments such as ``init=False`` being lost.
+    Fixed issue in ORM Declarative Dataclass mappings related to newly added
+    support for mixins added in 2.0.1 via :ticket:`9179`, where a combination
+    of using mixins plus ORM inheritance would mis-classify fields in some
+    cases leading to field-level dataclass arguments such as ``init=False`` being
+    lost.
diff --git a/doc/build/changelog/unreleased_20/9240.rst b/doc/build/changelog/unreleased_20/9240.rst
index 23e807f62d..8949465f14 100644
--- a/doc/build/changelog/unreleased_20/9240.rst
+++ b/doc/build/changelog/unreleased_20/9240.rst
@@ -1,5 +1,5 @@
 .. change::
-    :tags: bug, orm
+    :tags: bug, orm declarative
     :tickets: 9240
 
     Repaired ORM Declarative mappings to allow for the
diff --git a/doc/build/changelog/unreleased_20/9249.rst b/doc/build/changelog/unreleased_20/9249.rst
index 1ffd63a012..ab1ff48fe7 100644
--- a/doc/build/changelog/unreleased_20/9249.rst
+++ b/doc/build/changelog/unreleased_20/9249.rst
@@ -1,5 +1,5 @@
 .. change::
-    :tags: bug, orm
+    :tags: bug, orm declarative
     :tickets: 9249
 
     Fixed regression caused by the fix for :ticket:`9171`, which itself was