From 8a3a165a8a6243a34799d40c2055d47c05ff89c1 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 10 Nov 2018 11:43:55 -0500 Subject: [PATCH] Revert "- 1.2.14" Pypi is down for maintenance right now, so leave the branch open for further changes in case we aren't able to release soon. This reverts commit 7fcadf64fb75658d32e454636903810471596644. --- doc/build/changelog/changelog_12.rst | 36 +--------------------- doc/build/changelog/unreleased_12/4347.rst | 9 ++++++ doc/build/changelog/unreleased_12/4357.rst | 11 +++++++ doc/build/changelog/unreleased_12/4361.rst | 11 +++++++ doc/build/conf.py | 4 +-- 5 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 doc/build/changelog/unreleased_12/4347.rst create mode 100644 doc/build/changelog/unreleased_12/4357.rst create mode 100644 doc/build/changelog/unreleased_12/4361.rst diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst index 58ea4c896f..c2cea4fdf3 100644 --- a/doc/build/changelog/changelog_12.rst +++ b/doc/build/changelog/changelog_12.rst @@ -12,41 +12,7 @@ .. changelog:: :version: 1.2.14 - :released: November 10, 2018 - - .. change:: - :tags: bug, orm - :tickets: 4357 - - Fixed bug in :meth:`.Session.bulk_update_mappings` where alternate mapped - attribute names would result in the primary key column of the UPDATE - statement being included in the SET clause, as well as the WHERE clause; - while usually harmless, for SQL Server this can raise an error due to the - IDENTITY column. This is a continuation of the same bug that was fixed in - :ticket:`3849`, where testing was insufficient to catch this additional - flaw. - - .. change:: - :tags: bug, mysql - :tickets: 4361 - - Fixed regression caused by :ticket:`4344` released in 1.2.13, where the fix - for MySQL 8.0's case sensitivity problem with referenced column names when - reflecting foreign key referents is worked around using the - ``information_schema.columns`` view. The workaround was failing on OSX / - ``lower_case_table_names=2`` which produces non-matching casing for the - ``information_schema.columns`` vs. that of ``SHOW CREATE TABLE``, so in - case-insensitive SQL modes case-insensitive matching is now used. - - .. change:: - :tags: bug, orm - :tickets: 4347 - - Fixed a minor performance issue which could in some cases add unnecessary - overhead to result fetching, involving the use of ORM columns and entities - that include those same columns at the same time within a query. The issue - has to do with hash / eq overhead when referring to the column in different - ways. + :include_notes_from: unreleased_12 .. changelog:: :version: 1.2.13 diff --git a/doc/build/changelog/unreleased_12/4347.rst b/doc/build/changelog/unreleased_12/4347.rst new file mode 100644 index 0000000000..c24f87b0d8 --- /dev/null +++ b/doc/build/changelog/unreleased_12/4347.rst @@ -0,0 +1,9 @@ +.. change:: + :tags: bug, orm + :tickets: 4347 + + Fixed a minor performance issue which could in some cases add unnecessary + overhead to result fetching, involving the use of ORM columns and entities + that include those same columns at the same time within a query. The issue + has to do with hash / eq overhead when referring to the column in different + ways. diff --git a/doc/build/changelog/unreleased_12/4357.rst b/doc/build/changelog/unreleased_12/4357.rst new file mode 100644 index 0000000000..3de1eb6546 --- /dev/null +++ b/doc/build/changelog/unreleased_12/4357.rst @@ -0,0 +1,11 @@ +.. change:: + :tags: bug, orm + :tickets: 4357 + + Fixed bug in :meth:`.Session.bulk_update_mappings` where alternate mapped + attribute names would result in the primary key column of the UPDATE + statement being included in the SET clause, as well as the WHERE clause; + while usually harmless, for SQL Server this can raise an error due to the + IDENTITY column. This is a continuation of the same bug that was fixed in + :ticket:`3849`, where testing was insufficient to catch this additional + flaw. diff --git a/doc/build/changelog/unreleased_12/4361.rst b/doc/build/changelog/unreleased_12/4361.rst new file mode 100644 index 0000000000..3ce8c7ad1b --- /dev/null +++ b/doc/build/changelog/unreleased_12/4361.rst @@ -0,0 +1,11 @@ +.. change:: + :tags: bug, mysql + :tickets: 4361 + + Fixed regression caused by :ticket:`4344` released in 1.2.13, where the fix + for MySQL 8.0's case sensitivity problem with referenced column names when + reflecting foreign key referents is worked around using the + ``information_schema.columns`` view. The workaround was failing on OSX / + ``lower_case_table_names=2`` which produces non-matching casing for the + ``information_schema.columns`` vs. that of ``SHOW CREATE TABLE``, so in + case-insensitive SQL modes case-insensitive matching is now used. diff --git a/doc/build/conf.py b/doc/build/conf.py index 78159bcc1b..0136105f3d 100644 --- a/doc/build/conf.py +++ b/doc/build/conf.py @@ -110,9 +110,9 @@ copyright = u'2007-2018, the SQLAlchemy authors and contributors' # The short X.Y version. version = "1.2" # The full version, including alpha/beta/rc tags. -release = "1.2.14" +release = "1.2.13" -release_date = "November 10, 2018" +release_date = "October 31, 2018" site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org") site_adapter_template = "docs_adapter.mako" -- 2.47.2