diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-03-11 12:36:59 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-03-11 12:36:59 -0400 |
| commit | 9ca0142c3973ebdd48fd60da398941c213680896 (patch) | |
| tree | f363420cb6b1c366880990ddd38c96531340fd52 | |
| parent | ceba13d4be5e73fed4522d6f66ab4c54f60fd983 (diff) | |
| download | sqlalchemy-9ca0142c3973ebdd48fd60da398941c213680896.tar.gz | |
cherry-pick changelog from 1.3.15
| -rw-r--r-- | doc/build/changelog/changelog_13.rst | 23 | ||||
| -rw-r--r-- | doc/build/changelog/unreleased_13/5194.rst | 11 | ||||
| -rw-r--r-- | doc/build/changelog/unreleased_13/5196.rst | 8 |
3 files changed, 22 insertions, 20 deletions
diff --git a/doc/build/changelog/changelog_13.rst b/doc/build/changelog/changelog_13.rst index 86ddda16c..1b80ad371 100644 --- a/doc/build/changelog/changelog_13.rst +++ b/doc/build/changelog/changelog_13.rst @@ -12,7 +12,28 @@ .. changelog:: :version: 1.3.15 - :include_notes_from: unreleased_13 + :released: March 11, 2020 + + .. change:: + :tags: bug, orm + :tickets: 5194 + + Adjusted the error message emitted by :meth:`.Query.join` when a left hand + side can't be located that the :meth:`.Query.select_from` method is the + best way to resolve the issue. Also, within the 1.3 series, used a + deterministic ordering when determining the FROM clause from a given column + entity passed to :class:`.Query` so that the same expression is determined + each time. + + + .. change:: + :tags: orm, bug + :tickets: 5196 + + Fixed regression in 1.3.14 due to :ticket:`4849` where a sys.exc_info() + call failed to be invoked correctly when a flush error would occur. Test + coverage has been added for this exception case. + .. changelog:: :version: 1.3.14 diff --git a/doc/build/changelog/unreleased_13/5194.rst b/doc/build/changelog/unreleased_13/5194.rst deleted file mode 100644 index 7047fb34b..000000000 --- a/doc/build/changelog/unreleased_13/5194.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. change:: - :tags: bug, orm - :tickets: 5194 - - Adjusted the error message emitted by :meth:`.Query.join` when a left hand - side can't be located that the :meth:`.Query.select_from` method is the - best way to resolve the issue. Also, within the 1.3 series, used a - deterministic ordering when determining the FROM clause from a given column - entity passed to :class:`.Query` so that the same expression is determined - each time. - diff --git a/doc/build/changelog/unreleased_13/5196.rst b/doc/build/changelog/unreleased_13/5196.rst deleted file mode 100644 index 3183164a7..000000000 --- a/doc/build/changelog/unreleased_13/5196.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. change:: - :tags: orm, bug - :tickets: 5196 - - Fixed regression in 1.3.14 due to :ticket:`4849` where a sys.exc_info() - call failed to be invoked correctly when a flush error would occur. Test - coverage has been added for this exception case. - |