summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2018-07-13 19:03:48 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2018-07-13 19:03:48 -0400
commit46c89fa3e94ba7e64ec9043c7ede73885b48dcc9 (patch)
tree0cbeeb52bf804f182b725c2d1054ad4a46fa03f9
parent2fdf26020878edcbaa7792a869b3d45b715cc05a (diff)
downloadsqlalchemy-46c89fa3e94ba7e64ec9043c7ede73885b48dcc9.tar.gz
cherry-pick changelog from 1.2.10
-rw-r--r--doc/build/changelog/changelog_12.rst30
-rw-r--r--doc/build/changelog/unreleased_12/4295.rst8
-rw-r--r--doc/build/changelog/unreleased_12/4298.rst7
-rw-r--r--doc/build/changelog/unreleased_12/4300.rst10
4 files changed, 29 insertions, 26 deletions
diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index bd70927a4..e563995c5 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 acfc8a074..000000000
--- 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 4c54be58b..000000000
--- 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 b34742cc3..000000000
--- 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.