From faa23f1729ec86ee1e0d7ba4d0fd30fb331f867b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 31 Mar 2022 18:10:43 -0400 Subject: [PATCH] - 1.4.34 --- doc/build/changelog/changelog_14.rst | 22 +++++++++++++++++++++- doc/build/changelog/unreleased_14/7878.rst | 7 ------- doc/build/changelog/unreleased_14/7880.rst | 11 ----------- doc/build/conf.py | 2 +- 4 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 doc/build/changelog/unreleased_14/7878.rst delete mode 100644 doc/build/changelog/unreleased_14/7880.rst diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst index 3b1b051387..80205285ac 100644 --- a/doc/build/changelog/changelog_14.rst +++ b/doc/build/changelog/changelog_14.rst @@ -15,7 +15,27 @@ This document details individual issue-level changes made throughout .. changelog:: :version: 1.4.34 - :include_notes_from: unreleased_14 + :released: March 31, 2022 + + .. change:: + :tags: bug, orm, regression + :tickets: 7878 + + Fixed regression caused by :ticket:`7861` where invoking an + :class:`.Insert` construct which contained ORM entities directly via + :meth:`_orm.Session.execute` would fail. + + .. change:: + :tags: bug, postgresql + :tickets: 7880 + + Scaled back a fix made for :ticket:`6581` where "executemany values" mode + for psycopg2 were disabled for all "ON CONFLICT" styles of INSERT, to + not apply to the "ON CONFLICT DO NOTHING" clause, which does not include + any parameters and is safe for "executemany values" mode. "ON CONFLICT + DO UPDATE" is still blocked from "executemany values" as there may + be additional parameters in the DO UPDATE clause that cannot be batched + (which is the original issue fixed by :ticket:`6581`). .. changelog:: :version: 1.4.33 diff --git a/doc/build/changelog/unreleased_14/7878.rst b/doc/build/changelog/unreleased_14/7878.rst deleted file mode 100644 index 6c9e92929e..0000000000 --- a/doc/build/changelog/unreleased_14/7878.rst +++ /dev/null @@ -1,7 +0,0 @@ -.. change:: - :tags: bug, orm, regression - :tickets: 7878 - - Fixed regression caused by :ticket:`7861` where invoking an - :class:`.Insert` construct which contained ORM entities directly via - :meth:`_orm.Session.execute` would fail. diff --git a/doc/build/changelog/unreleased_14/7880.rst b/doc/build/changelog/unreleased_14/7880.rst deleted file mode 100644 index 9abbac1cfa..0000000000 --- a/doc/build/changelog/unreleased_14/7880.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. change:: - :tags: bug, postgresql - :tickets: 7880 - - Scaled back a fix made for :ticket:`6581` where "executemany values" mode - for psycopg2 were disabled for all "ON CONFLICT" styles of INSERT, to - not apply to the "ON CONFLICT DO NOTHING" clause, which does not include - any parameters and is safe for "executemany values" mode. "ON CONFLICT - DO UPDATE" is still blocked from "executemany values" as there may - be additional parameters in the DO UPDATE clause that cannot be batched - (which is the original issue fixed by :ticket:`6581`). diff --git a/doc/build/conf.py b/doc/build/conf.py index 591478dacd..aedb460820 100644 --- a/doc/build/conf.py +++ b/doc/build/conf.py @@ -213,7 +213,7 @@ copyright = u"2007-2022, the SQLAlchemy authors and contributors" # noqa # The short X.Y version. version = "1.4" # The full version, including alpha/beta/rc tags. -release = "1.4.33" +release = "1.4.34" release_date = "March 31, 2022" -- 2.47.2