cherry-pick changelog from 1.2.18

7 files changed, 61 insertions, 55 deletions

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 983d9a716..825c6237c 100644
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,67 @@
 
 .. changelog::
     :version: 1.2.18
-    :include_notes_from: unreleased_12
+    :released: February 15, 2019
+
+    .. change::
+       :tags: bug, orm
+       :tickets: 4468
+
+       Fixed a regression in 1.2 where a wildcard/load_only loader option would
+       not work correctly against a loader path where of_type() were used to limit
+       to a particular subclass.  The fix only works for of_type() of a simple
+       subclass so far, not a with_polymorphic entity which will be addressed in a
+       separate issue; it is unlikely this latter case was working previously.
+
+
+    .. change::
+       :tags: bug, orm
+       :tickets: 4489
+
+       Fixed fairly simple but critical issue where the
+       :meth:`.SessionEvents.pending_to_persistent` event would be invoked for
+       objects not just when they move from pending to persistent, but when they
+       were also already persistent and just being updated, thus causing the event
+       to be invoked for all objects on every update.
+
+    .. change::
+       :tags: bug, sql
+       :tickets: 4485
+
+       Fixed issue where the :class:`.JSON` type had a read-only
+       :attr:`.JSON.should_evaluate_none` attribute, which would cause failures
+       when making use of the :meth:`.TypeEngine.evaluates_none` method in
+       conjunction with this type.  Pull request courtesy Sanjana S.
+
+    .. change::
+       :tags: bug, mssql
+       :tickets: 4499
+
+       Fixed bug where the SQL Server "IDENTITY_INSERT" logic that allows an INSERT
+       to proceed with an explicit value on an IDENTITY column was not detecting
+       the case where :meth:`.Insert.values` were used with a dictionary that
+       contained a :class:`.Column` as key and a SQL expression as a value.
+
+    .. change::
+       :tags: bug, sqlite
+       :tickets: 4474
+
+       Fixed bug in SQLite DDL where using an expression as a server side default
+       required that it be contained within parenthesis to be accepted by the
+       sqlite parser.  Pull request courtesy Bartlomiej Biernacki.
+
+    .. change::
+       :tags: bug, mysql
+       :tickets: 4492
+
+       Fixed a second regression caused by :ticket:`4344` (the first was
+       :ticket:`4361`), which works around MySQL issue 88718, where the lower
+       casing function used was not correct for Python 2 with OSX/Windows casing
+       conventions, which would then raise ``TypeError``.  Full coverage has been
+       added to this logic so that every codepath is exercised in a mock style for
+       all three casing conventions on all versions of Python. MySQL 8.0 has
+       meanwhile fixed issue 88718 so the workaround is only applies to a
+       particular span of MySQL 8.0 versions.
 
 .. changelog::
     :version: 1.2.17
diff --git a/doc/build/changelog/unreleased_12/4468.rst b/doc/build/changelog/unreleased_12/4468.rst
deleted file mode 100644
index 674dc4475..000000000
--- a/doc/build/changelog/unreleased_12/4468.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-   :tags: bug, orm
-   :tickets: 4468
-
-   Fixed a regression in 1.2 where a wildcard/load_only loader option would
-   not work correctly against a loader path where of_type() were used to limit
-   to a particular subclass.  The fix only works for of_type() of a simple
-   subclass so far, not a with_polymorphic entity which will be addressed in a
-   separate issue; it is unlikely this latter case was working previously.
-
diff --git a/doc/build/changelog/unreleased_12/4474.rst b/doc/build/changelog/unreleased_12/4474.rst
deleted file mode 100644
index ba4c6b7c6..000000000
--- a/doc/build/changelog/unreleased_12/4474.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-   :tags: bug, sqlite
-   :tickets: 4474
-
-   Fixed bug in SQLite DDL where using an expression as a server side default
-   required that it be contained within parenthesis to be accepted by the
-   sqlite parser.  Pull request courtesy Bartlomiej Biernacki.
diff --git a/doc/build/changelog/unreleased_12/4485.rst b/doc/build/changelog/unreleased_12/4485.rst
deleted file mode 100644
index dc5860440..000000000
--- a/doc/build/changelog/unreleased_12/4485.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-   :tags: bug, sql
-   :tickets: 4485
-
-   Fixed issue where the :class:`.JSON` type had a read-only
-   :attr:`.JSON.should_evaluate_none` attribute, which would cause failures
-   when making use of the :meth:`.TypeEngine.evaluates_none` method in
-   conjunction with this type.  Pull request courtesy Sanjana S.
diff --git a/doc/build/changelog/unreleased_12/4489.rst b/doc/build/changelog/unreleased_12/4489.rst
deleted file mode 100644
index 6f50c4bdb..000000000
--- a/doc/build/changelog/unreleased_12/4489.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-   :tags: bug, orm
-   :tickets: 4489
-
-   Fixed fairly simple but critical issue where the
-   :meth:`.SessionEvents.pending_to_persistent` event would be invoked for
-   objects not just when they move from pending to persistent, but when they
-   were also already persistent and just being updated, thus causing the event
-   to be invoked for all objects on every update.
diff --git a/doc/build/changelog/unreleased_12/4492.rst b/doc/build/changelog/unreleased_12/4492.rst
deleted file mode 100644
index 7c7c901f3..000000000
--- a/doc/build/changelog/unreleased_12/4492.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. change::
-   :tags: bug, mysql
-   :tickets: 4492
-
-   Fixed a second regression caused by :ticket:`4344` (the first was
-   :ticket:`4361`), which works around MySQL issue 88718, where the lower
-   casing function used was not correct for Python 2 with OSX/Windows casing
-   conventions, which would then raise ``TypeError``.  Full coverage has been
-   added to this logic so that every codepath is exercised in a mock style for
-   all three casing conventions on all versions of Python. MySQL 8.0 has
-   meanwhile fixed issue 88718 so the workaround is only applies to a
-   particular span of MySQL 8.0 versions.
diff --git a/doc/build/changelog/unreleased_12/4499.rst b/doc/build/changelog/unreleased_12/4499.rst
deleted file mode 100644
index ca6be04ae..000000000
--- a/doc/build/changelog/unreleased_12/4499.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-   :tags: bug, mssql
-   :tickets: 4499
-
-   Fixed bug where the SQL Server "IDENTITY_INSERT" logic that allows an INSERT
-   to proceed with an explicit value on an IDENTITY column was not detecting
-   the case where :meth:`.Insert.values` were used with a dictionary that
-   contained a :class:`.Column` as key and a SQL expression as a value.