- 1.2.19

(cherry picked from commit f178bac2fdfa819c27d6b163e51582f6e75f0029)

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 699eef902e284b01230d5a6d32cd14e3f14d2470..169dc55b47390f6b4e3667e7633aa4e1e1295ca2 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,59 @@
 
 .. changelog::
     :version: 1.2.19
-    :include_notes_from: unreleased_12
+    :released: April 15, 2019
+
+    .. change::
+       :tags: bug, orm
+       :tickets: 4507
+
+       Fixed a regression in 1.2 due to the introduction of baked queries for
+       relationship lazy loaders, where a race condition is created during the
+       generation of the "lazy clause" which occurs within a memoized attribute. If
+       two threads initialize the memoized attribute concurrently, the baked query
+       could be generated with bind parameter keys that are then replaced with new
+       keys by the next run, leading to a lazy load query that specifies the
+       related criteria as ``None``. The fix establishes that the parameter names
+       are fixed before the new clause and parameter objects are generated, so that
+       the names are the same every time.
+
+    .. change::
+       :tags: bug, oracle
+       :tickets: 4506
+
+       Added support for reflection of the :class:`.NCHAR` datatype to the Oracle
+       dialect, and added :class:`.NCHAR` to the list of types exported by the
+       Oracle dialect.
+
+
+    .. change::
+       :tags: bug, examples
+       :tickets: 4528
+
+       Fixed bug in large_resultsets example case where a re-named "id" variable
+       due to code reformatting caused the test to fail.  Pull request courtesy
+       Matt Schuchhardt.
+
+    .. change::
+       :tags: bug, mssql
+       :tickets: 4536
+       :versions: 1.3.1
+
+       A commit() is emitted after an isolation level change to SNAPSHOT, as both
+       pyodbc and pymssql open an implicit transaction which blocks subsequent SQL
+       from being emitted in the current transaction.
+
+    .. change::
+       :tags: bug, engine
+       :tickets: 4406
+
+       Comparing two objects of :class:`.URL` using ``__eq__()`` did not take port
+       number into consideration, two objects differing only by port number were
+       considered equal. Port comparison is now added in ``__eq__()`` method of
+       :class:`.URL`, objects differing by port number are now not equal.
+       Additionally, ``__ne__()`` was not implemented for :class:`.URL` which
+       caused unexpected result when ``!=`` was used in Python2, since there are no
+       implied relationships among the comparison operators in Python2.
 
 .. changelog::
     :version: 1.2.18

diff --git a/doc/build/changelog/unreleased_12/4406.rst b/doc/build/changelog/unreleased_12/4406.rst
deleted file mode 100644 (file)
index 513786b..0000000
--- a/doc/build/changelog/unreleased_12/4406.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. change::
-   :tags: bug, engine
-   :tickets: 4406
-   :versions: 1.3.0
-
-   Comparing two objects of :class:`.URL` using ``__eq__()`` did not take port
-   number into consideration, two objects differing only by port number were
-   considered equal. Port comparison is now added in ``__eq__()`` method of
-   :class:`.URL`, objects differing by port number are now not equal.
-   Additionally, ``__ne__()`` was not implemented for :class:`.URL` which
-   caused unexpected result when ``!=`` was used in Python2, since there are no
-   implied relationships among the comparison operators in Python2.

diff --git a/doc/build/changelog/unreleased_12/4506.rst b/doc/build/changelog/unreleased_12/4506.rst
deleted file mode 100644 (file)
index cf49250..0000000
--- a/doc/build/changelog/unreleased_12/4506.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-   :tags: bug, oracle
-   :tickets: 4506
-   :versions: 1.3.0
-
-   Added support for reflection of the :class:`.NCHAR` datatype to the Oracle
-   dialect, and added :class:`.NCHAR` to the list of types exported by the
-   Oracle dialect.
-

diff --git a/doc/build/changelog/unreleased_12/4507.rst b/doc/build/changelog/unreleased_12/4507.rst
deleted file mode 100644 (file)
index 9586c73..0000000
--- a/doc/build/changelog/unreleased_12/4507.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. change::
-   :tags: bug, orm
-   :tickets: 4507
-   :versions: 1.3.0
-
-   Fixed a regression in 1.2 due to the introduction of baked queries for
-   relationship lazy loaders, where a race condition is created during the
-   generation of the "lazy clause" which occurs within a memoized attribute. If
-   two threads initialize the memoized attribute concurrently, the baked query
-   could be generated with bind parameter keys that are then replaced with new
-   keys by the next run, leading to a lazy load query that specifies the
-   related criteria as ``None``. The fix establishes that the parameter names
-   are fixed before the new clause and parameter objects are generated, so that
-   the names are the same every time.

diff --git a/doc/build/changelog/unreleased_12/4528.rst b/doc/build/changelog/unreleased_12/4528.rst
deleted file mode 100644 (file)
index c28a9e3..0000000
--- a/doc/build/changelog/unreleased_12/4528.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-   :tags: bug, examples
-   :tickets: 4528
-   :versions: 1.3.1
-
-   Fixed bug in large_resultsets example case where a re-named "id" variable
-   due to code reformatting caused the test to fail.  Pull request courtesy
-   Matt Schuchhardt.

diff --git a/doc/build/changelog/unreleased_12/4536.rst b/doc/build/changelog/unreleased_12/4536.rst
deleted file mode 100644 (file)
index b216962..0000000
--- a/doc/build/changelog/unreleased_12/4536.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-   :tags: bug, mssql
-   :tickets: 4536
-   :versions: 1.3.1
-
-   A commit() is emitted after an isolation level change to SNAPSHOT, as both
-   pyodbc and pymssql open an implicit transaction which blocks subsequent SQL
-   from being emitted in the current transaction.