cherry-pick changelog from 1.2.15

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index dc1d73dbfa1be468a17a582c3072b50dd973a1f8..40c2aae3dd58ee3033c421997d23a93b994a99ed 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,76 @@
 
 .. changelog::
     :version: 1.2.15
-    :include_notes_from: unreleased_12
+    :released: December 11, 2018
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4367
+
+        Fixed bug where the ORM annotations could be incorrect for the
+        primaryjoin/secondaryjoin a relationship if one used the pattern
+        ``ForeignKey(SomeClass.id)`` in the declarative mappings.   This pattern
+        would leak undesired annotations into the join conditions which can break
+        aliasing operations done within :class:`.Query` that are not supposed to
+        impact elements in that join condition.  These annotations are now removed
+        up front if present.
+
+    .. change::
+       :tags: bug, orm, declarative
+       :tickets: 4374
+
+       A warning is emitted in the case that a :func:`.column` object is applied to
+       a declarative class, as it seems likely this intended to be a
+       :class:`.Column` object.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4366
+
+        In continuing with a similar theme as that of very recent :ticket:`4349`,
+        repaired issue with :meth:`.RelationshipProperty.Comparator.any` and
+        :meth:`.RelationshipProperty.Comparator.has` where the "secondary"
+        selectable needs to be explicitly part of the FROM clause in the
+        EXISTS subquery to suit the case where this "secondary" is a :class:`.Join`
+        object.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4363
+
+        Fixed regression caused by :ticket:`4349` where adding the "secondary"
+        table to the FROM clause for a dynamic loader would affect the ability of
+        the :class:`.Query` to make a subsequent join to another entity.   The fix
+        adds the primary entity as the first element of the FROM list since
+        :meth:`.Query.join` wants to jump from that.   Version 1.3 will have
+        a more comprehensive solution to this problem as well (:ticket:`4365`).
+
+
+
+
+    .. change::
+       :tags: bug, orm
+       :tickests: 4400
+
+       Fixed bug where chaining of mapper options using
+       :meth:`.RelationshipProperty.of_type` in conjunction with a chained option
+       that refers to an attribute name by string only would fail to locate the
+       attribute.
+
+    .. change::
+        :tag: feature, mysql
+        :tickets: 4381
+
+        Added support for the ``write_timeout`` flag accepted by mysqlclient and
+        pymysql to  be passed in the URL string.
+
+    .. change::
+       :tag: bug, postgresql
+       :tickets: 4377, 4380
+
+       Fixed issue where reflection of a PostgreSQL domain that is expressed as an
+       array would fail to be recognized.  Pull request courtesy Jakub Synowiec.
+
 
 .. changelog::
     :version: 1.2.14

diff --git a/doc/build/changelog/unreleased_12/4363.rst b/doc/build/changelog/unreleased_12/4363.rst
deleted file mode 100644 (file)
index 1a05327..0000000
--- a/doc/build/changelog/unreleased_12/4363.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4363
-
-    Fixed regression caused by :ticket:`4349` where adding the "secondary"
-    table to the FROM clause for a dynamic loader would affect the ability of
-    the :class:`.Query` to make a subsequent join to another entity.   The fix
-    adds the primary entity as the first element of the FROM list since
-    :meth:`.Query.join` wants to jump from that.   Version 1.3 will have
-    a more comprehensive solution to this problem as well (:ticket:`4365`).
-
-
-

diff --git a/doc/build/changelog/unreleased_12/4366.rst b/doc/build/changelog/unreleased_12/4366.rst
deleted file mode 100644 (file)
index d333263..0000000
--- a/doc/build/changelog/unreleased_12/4366.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4366
-
-    In continuing with a similar theme as that of very recent :ticket:`4349`,
-    repaired issue with :meth:`.RelationshipProperty.Comparator.any` and
-    :meth:`.RelationshipProperty.Comparator.has` where the "secondary"
-    selectable needs to be explicitly part of the FROM clause in the
-    EXISTS subquery to suit the case where this "secondary" is a :class:`.Join`
-    object.
\ No newline at end of file

diff --git a/doc/build/changelog/unreleased_12/4367.rst b/doc/build/changelog/unreleased_12/4367.rst
deleted file mode 100644 (file)
index 9db364c..0000000
--- a/doc/build/changelog/unreleased_12/4367.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4367
-
-    Fixed bug where the ORM annotations could be incorrect for the
-    primaryjoin/secondaryjoin a relationship if one used the pattern
-    ``ForeignKey(SomeClass.id)`` in the declarative mappings.   This pattern
-    would leak undesired annotations into the join conditions which can break
-    aliasing operations done within :class:`.Query` that are not supposed to
-    impact elements in that join condition.  These annotations are now removed
-    up front if present.

diff --git a/doc/build/changelog/unreleased_12/4374.rst b/doc/build/changelog/unreleased_12/4374.rst
deleted file mode 100644 (file)
index 716ff5b..0000000
--- a/doc/build/changelog/unreleased_12/4374.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-   :tags: bug, orm, declarative
-   :tickets: 4374
-
-   A warning is emitted in the case that a :func:`.column` object is applied to
-   a declarative class, as it seems likely this intended to be a
-   :class:`.Column` object.

diff --git a/doc/build/changelog/unreleased_12/4377.rst b/doc/build/changelog/unreleased_12/4377.rst
deleted file mode 100644 (file)
index 9d3477e..0000000
--- a/doc/build/changelog/unreleased_12/4377.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-   :tag: bug, postgresql
-   :tickets: 4377, 4380
-
-   Fixed issue where reflection of a PostgreSQL domain that is expressed as an
-   array would fail to be recognized.  Pull request courtesy Jakub Synowiec.
-

diff --git a/doc/build/changelog/unreleased_12/4381.rst b/doc/build/changelog/unreleased_12/4381.rst
deleted file mode 100644 (file)
index 8e6dff9..0000000
--- a/doc/build/changelog/unreleased_12/4381.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tag: feature, mysql
-    :tickets: 4381
-
-    Added support for the ``write_timeout`` flag accepted by mysqlclient and
-    pymysql to  be passed in the URL string.

diff --git a/doc/build/changelog/unreleased_12/4400.rst b/doc/build/changelog/unreleased_12/4400.rst
deleted file mode 100644 (file)
index 4a76fb5..0000000
--- a/doc/build/changelog/unreleased_12/4400.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-   :tags: bug, orm
-   :tickests: 4400
-
-   Fixed bug where chaining of mapper options using
-   :meth:`.RelationshipProperty.of_type` in conjunction with a chained option
-   that refers to an attribute name by string only would fail to locate the
-   attribute.