From 46c89fa3e94ba7e64ec9043c7ede73885b48dcc9 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 13 Jul 2018 19:03:48 -0400 Subject: [PATCH] cherry-pick changelog from 1.2.10 --- doc/build/changelog/changelog_12.rst | 30 +++++++++++++++++++++- doc/build/changelog/unreleased_12/4295.rst | 8 ------ doc/build/changelog/unreleased_12/4298.rst | 7 ----- doc/build/changelog/unreleased_12/4300.rst | 10 -------- 4 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 doc/build/changelog/unreleased_12/4295.rst delete mode 100644 doc/build/changelog/unreleased_12/4298.rst delete mode 100644 doc/build/changelog/unreleased_12/4300.rst diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst index bd70927a4d..e563995c51 100644 --- a/doc/build/changelog/changelog_12.rst +++ b/doc/build/changelog/changelog_12.rst @@ -12,7 +12,35 @@ .. changelog:: :version: 1.2.10 - :include_notes_from: unreleased_12 + :released: July 13, 2018 + + .. change:: + :tags: bug, sql + :tickets: 4300 + + Fixed bug where a :class:`.Sequence` would be dropped explicitly before any + :class:`.Table` that refers to it, which breaks in the case when the + sequence is also involved in a server-side default for that table, when + using :meth:`.MetaData.drop_all`. The step which processes sequences + to be dropped via non server-side column default functions is now invoked + after the table itself is dropped. + + .. change:: + :tags: bug, orm + :tickets: 4295 + + Fixed bug in :class:`.Bundle` construct where placing two columns of the + same name would be de-duplicated, when the :class:`.Bundle` were used as + part of the rendered SQL, such as in the ORDER BY or GROUP BY of the statement. + + + .. change:: + :tags: bug, orm + :tickets: 4298 + + Fixed regression in 1.2.9 due to :ticket:`4287` where using a + :class:`.Load` option in conjunction with a string wildcard would result + in a TypeError. .. changelog:: :version: 1.2.9 diff --git a/doc/build/changelog/unreleased_12/4295.rst b/doc/build/changelog/unreleased_12/4295.rst deleted file mode 100644 index acfc8a0746..0000000000 --- a/doc/build/changelog/unreleased_12/4295.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. change:: - :tags: bug, orm - :tickets: 4295 - - Fixed bug in :class:`.Bundle` construct where placing two columns of the - same name would be de-duplicated, when the :class:`.Bundle` were used as - part of the rendered SQL, such as in the ORDER BY or GROUP BY of the statement. - diff --git a/doc/build/changelog/unreleased_12/4298.rst b/doc/build/changelog/unreleased_12/4298.rst deleted file mode 100644 index 4c54be58ba..0000000000 --- a/doc/build/changelog/unreleased_12/4298.rst +++ /dev/null @@ -1,7 +0,0 @@ -.. change:: - :tags: bug, orm - :tickets: 4298 - - Fixed regression in 1.2.9 due to :ticket:`4287` where using a - :class:`.Load` option in conjunction with a string wildcard would result - in a TypeError. diff --git a/doc/build/changelog/unreleased_12/4300.rst b/doc/build/changelog/unreleased_12/4300.rst deleted file mode 100644 index b34742cc3c..0000000000 --- a/doc/build/changelog/unreleased_12/4300.rst +++ /dev/null @@ -1,10 +0,0 @@ -.. change:: - :tags: bug, sql - :tickets: 4300 - - Fixed bug where a :class:`.Sequence` would be dropped explicitly before any - :class:`.Table` that refers to it, which breaks in the case when the - sequence is also involved in a server-side default for that table, when - using :meth:`.MetaData.drop_all`. The step which processes sequences - to be dropped via non server-side column default functions is now invoked - after the table itself is dropped. -- 2.47.3