cherry-pick changelog from 1.2.5

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index de58e730e1fa4b21cf626656966ef45aea604d65..c85380bbf8d98146a3924e5dee653e26657daee5 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,64 @@
 
 .. changelog::
     :version: 1.2.5
-    :include_notes_from: unreleased_12
+    :released: March 6, 2018
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4210
+        :versions: 1.3.0b1
+
+        Fixed bug in :class:.`CTE` construct along the same lines as that of
+        :ticket:`4204` where a :class:`.CTE` that was aliased would not copy itself
+        correctly during a "clone" operation as is frequent within the ORM as well
+        as when using the :meth:`.ClauseElement.params` method.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4199
+
+        Fixed bug in new "polymorphic selectin" loading when a selection of
+        polymorphic objects were to be partially loaded from a relationship
+        lazy loader, leading to an "empty IN" condition within the load that
+        raises an error for the "inline" form of "IN".
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4204
+
+        Fixed bug in CTE rendering where a :class:`.CTE` that was also turned into
+        an :class:`.Alias` would not render its "ctename AS aliasname" clause
+        appropriately if there were more than one reference to the CTE in a FROM
+        clause.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4209
+        :versions: 1.3.0b1
+
+        Fixed 1.2 regression where a mapper option that contains an
+        :class:`.AliasedClass` object, as is typical when using the
+        :meth:`.QueryableAttribute.of_type` method, could not be pickled.   1.1's
+        behavior was to omit the aliased class objects from the path, so this
+        behavior is restored.
+
+    .. change::
+        :tags: feature, orm
+        :versions: 1.3.0b1
+
+        Added new feature :meth:`.Query.only_return_tuples`.  Causes the
+        :class:`.Query` object to return keyed tuple objects unconditionally even
+        if the query is against a single entity.   Pull request courtesy Eric
+        Atkin.
+
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4198
+
+        Fixed bug in new "expanding IN parameter" feature where the bind parameter
+        processors for values wasn't working at all, tests failed to cover this
+        pretty basic case which includes that ENUM values weren't working.
 
 .. changelog::
     :version: 1.2.4

diff --git a/doc/build/changelog/unreleased_12/4128.rst b/doc/build/changelog/unreleased_12/4128.rst
deleted file mode 100644 (file)
index 908bd11..0000000
--- a/doc/build/changelog/unreleased_12/4128.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4128
-
-    Fixed a long-standing regression that occurred in version
-    1.0, which prevented the use of a custom :class:`.MapperOption`
-    that alters the _params of a :class:`.Query` object for a
-    lazy load, since the lazy loader itself would overwrite those
-    parameters.   This applies to the "temporal range" example
-    on the wiki.  Note however that the
-    :meth:`.Query.populate_existing` method is now required in
-    order to rewrite the mapper options associated with an object
-    already loaded in the identity map.  Also, a custom defined
-    :class:`.MapperOption` will now cause lazy loaders related to
-    the target object to use a non-baked query by default unless
-    the :meth:`.MapperOption._generate_cache_key` method is implemented.

diff --git a/doc/build/changelog/unreleased_12/4198.rst b/doc/build/changelog/unreleased_12/4198.rst
deleted file mode 100644 (file)
index e5cc3cf..0000000
--- a/doc/build/changelog/unreleased_12/4198.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4198
-
-    Fixed bug in new "expanding IN parameter" feature where the bind parameter
-    processors for values wasn't working at all, tests failed to cover this
-    pretty basic case which includes that ENUM values weren't working.

diff --git a/doc/build/changelog/unreleased_12/4199.rst b/doc/build/changelog/unreleased_12/4199.rst
deleted file mode 100644 (file)
index 2852839..0000000
--- a/doc/build/changelog/unreleased_12/4199.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4199
-
-    Fixed bug in new "polymorphic selectin" loading when a selection of
-    polymorphic objects were to be partially loaded from a relationship
-    lazy loader, leading to an "empty IN" condition within the load that
-    raises an error for the "inline" form of "IN".

diff --git a/doc/build/changelog/unreleased_12/4204.rst b/doc/build/changelog/unreleased_12/4204.rst
deleted file mode 100644 (file)
index 424a025..0000000
--- a/doc/build/changelog/unreleased_12/4204.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4204
-
-    Fixed bug in CTE rendering where a :class:`.CTE` that was also turned into
-    an :class:`.Alias` would not render its "ctename AS aliasname" clause
-    appropriately if there were more than one reference to the CTE in a FROM
-    clause.

diff --git a/doc/build/changelog/unreleased_12/4209.rst b/doc/build/changelog/unreleased_12/4209.rst
deleted file mode 100644 (file)
index f61e90e..0000000
--- a/doc/build/changelog/unreleased_12/4209.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4209
-    :versions: 1.3.0b1
-
-    Fixed 1.2 regression where a mapper option that contains an
-    :class:`.AliasedClass` object, as is typical when using the
-    :meth:`.QueryableAttribute.of_type` method, could not be pickled.   1.1's
-    behavior was to omit the aliased class objects from the path, so this
-    behavior is restored.

diff --git a/doc/build/changelog/unreleased_12/4210.rst b/doc/build/changelog/unreleased_12/4210.rst
deleted file mode 100644 (file)
index 04e7e86..0000000
--- a/doc/build/changelog/unreleased_12/4210.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4210
-    :versions: 1.3.0b1
-
-    Fixed bug in :class:.`CTE` construct along the same lines as that of
-    :ticket:`4204` where a :class:`.CTE` that was aliased would not copy itself
-    correctly during a "clone" operation as is frequent within the ORM as well
-    as when using the :meth:`.ClauseElement.params` method.

diff --git a/doc/build/changelog/unreleased_12/post_criteria_subqueryload.rst b/doc/build/changelog/unreleased_12/post_criteria_subqueryload.rst
deleted file mode 100644 (file)
index 2b8942f..0000000
--- a/doc/build/changelog/unreleased_12/post_criteria_subqueryload.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, orm
-
-    Fixed bug where the new :meth:`.baked.Result.with_post_criteria`
-    method would not interact with a subquery-eager loader correctly,
-    in that the "post criteria" would not be applied to embedded
-    subquery eager loaders.   This is related to :ticket:`4128` in that
-    the post criteria feature is now used by the lazy loader.

diff --git a/doc/build/changelog/unreleased_12/single_entity.rst b/doc/build/changelog/unreleased_12/single_entity.rst
deleted file mode 100644 (file)
index 3eb7e56..0000000
--- a/doc/build/changelog/unreleased_12/single_entity.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: feature, orm
-    :versions: 1.3.0b1
-
-    Added new feature :meth:`.Query.only_return_tuples`.  Causes the
-    :class:`.Query` object to return keyed tuple objects unconditionally even
-    if the query is against a single entity.   Pull request courtesy Eric
-    Atkin.
-