add backports for 2.0/ 1.4 changes

Change-Id: I5aab8b25337f67385fc998954ab1fa883c175cc2

14 files changed, 41 insertions, 9 deletions

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index b33f4c45b..4723779cb 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -24,6 +24,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, sql
         :tickets: 8790
+        :versions: 2.0.0b4
 
         Fixed critical memory issue identified in cache key generation, where for
         very large and complex ORM statements that make use of lots of ORM aliases
@@ -35,6 +36,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, postgresql, mssql
         :tickets: 8770
+        :versions: 2.0.0b4
 
         For the PostgreSQL and SQL Server dialects only, adjusted the compiler so
         that when rendering column expressions in the RETURNING clause, the "non
@@ -59,6 +61,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, tests
         :tickets: 8793
+        :versions: 2.0.0b4
 
         Fixed issue where the ``--disable-asyncio`` parameter to the test suite
         would fail to not actually run greenlet tests and would also not prevent
@@ -83,6 +86,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8738
+        :versions: 2.0.0b3
 
         Fixed issue in joined eager loading where an assertion fail would occur
         with a particular combination of outer/inner joined eager loads, when
@@ -93,6 +97,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, oracle
         :tickets: 8708
+        :versions: 2.0.0b3
 
         Fixed issue where bound parameter names, including those automatically
         derived from similarly-named database columns, which contained characters
@@ -108,6 +113,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8721
+        :versions: 2.0.0b3
 
         Fixed bug involving :class:`.Select` constructs, where combinations of
         :meth:`.Select.select_from` with :meth:`.Select.join`, as well as when
@@ -123,6 +129,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, mssql
         :tickets: 8714
+        :versions: 2.0.0b3
 
         Fixed issue with :meth:`.Inspector.has_table`, which when used against a
         temporary table with the SQL Server dialect would fail on some Azure
@@ -132,6 +139,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8711
+        :versions: 2.0.0b3
 
         An informative exception is now raised when the
         :func:`_orm.with_loader_criteria` option is used as a loader option added
@@ -143,6 +151,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, oracle
         :tickets: 8744
+        :versions: 2.0.0b3
 
         Fixed issue where the ``nls_session_parameters`` view queried on first
         connect in order to get the default decimal point character may not be
@@ -155,6 +164,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8753
+        :versions: 2.0.0b3
 
         Improved "dictionary mode" for :meth:`_orm.Session.get` so that synonym
         names which refer to primary key attribute names may be indicated in the
@@ -163,6 +173,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, engine, regression
         :tickets: 8717
+        :versions: 2.0.0b3
 
         Fixed issue where the :meth:`.PoolEvents.reset` event hook would not be be
         called in all cases when a :class:`_engine.Connection` were closed and was
@@ -188,6 +199,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8704
+        :versions: 2.0.0b3
 
         Fixed issue where "selectin_polymorphic" loading for inheritance mappers
         would not function correctly if the :paramref:`_orm.Mapper.polymorphic_on`
@@ -197,6 +209,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8710
+        :versions: 2.0.0b3
 
         Fixed issue where the underlying DBAPI cursor would not be closed when
         using the :class:`_orm.Query` object as an iterator, if a user-defined exception
@@ -229,6 +242,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, mssql, reflection
         :tickets: 8700
+        :versions: 2.0.0b3
 
         Fixed issue with :meth:`.Inspector.has_table`, which when used against a
         view with the SQL Server dialect would erroneously return ``False``, due to
@@ -240,6 +254,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, sql
         :tickets: 8724
+        :versions: 2.0.0b3
 
         Fixed issue which prevented the :func:`_sql.literal_column` construct from
         working properly within the context of a :class:`.Select` construct as well
diff --git a/doc/build/changelog/unreleased_14/8748.rst b/doc/build/changelog/unreleased_14/8748.rst
index 27e067922..a3e6d2057 100644
--- a/doc/build/changelog/unreleased_14/8748.rst
+++ b/doc/build/changelog/unreleased_14/8748.rst
@@ -1,6 +1,7 @@
 .. change::
-    :tags: bug postgresql
+    :tags: bug, postgresql
     :tickets: 8748
+    :versions: 2.0.0b4
 
     Made an adjustment to how the PostgreSQL dialect considers column types
     when it reflects columns from a table, to accommodate for alternative
diff --git a/doc/build/changelog/unreleased_14/8800.rst b/doc/build/changelog/unreleased_14/8800.rst
index 8a42975df..b7a6c6a8b 100644
--- a/doc/build/changelog/unreleased_14/8800.rst
+++ b/doc/build/changelog/unreleased_14/8800.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: usecase, sql
     :tickets: 8800
+    :versions: 2.0.0b4
 
     An informative re-raise is now thrown in the case where any "literal
     bindparam" render operation fails, indicating the value itself and
diff --git a/doc/build/changelog/unreleased_14/8804.rst b/doc/build/changelog/unreleased_14/8804.rst
index c3f91a16d..ebcf449ff 100644
--- a/doc/build/changelog/unreleased_14/8804.rst
+++ b/doc/build/changelog/unreleased_14/8804.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: usecase, sqlite
     :tickets: 8804
+    :versions: 2.0.0b4
 
     Added support for reflection of expression-oriented WHERE criteria included
     in indexes on the SQLite dialect, in a manner similar to that of the
diff --git a/doc/build/changelog/unreleased_14/8827.rst b/doc/build/changelog/unreleased_14/8827.rst
index 677277e45..d71a30db5 100644
--- a/doc/build/changelog/unreleased_14/8827.rst
+++ b/doc/build/changelog/unreleased_14/8827.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: bug, sql
     :tickets: 8827
+    :versions: 2.0.0b4
 
     Fixed a series of issues regarding positionally rendered bound parameters,
     such as those used for SQLite, asyncpg, MySQL and others. Some compiled
diff --git a/doc/build/changelog/unreleased_14/8862.rst b/doc/build/changelog/unreleased_14/8862.rst
index 3be007890..890a37525 100644
--- a/doc/build/changelog/unreleased_14/8862.rst
+++ b/doc/build/changelog/unreleased_14/8862.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: bug, orm
     :tickets: 8862
+    :versions: 2.0.0b4
 
     Fixed bug where :meth:`_orm.Session.merge` would fail to preserve the
     current loaded contents of relationship attributes that were indicated with
diff --git a/doc/build/changelog/unreleased_14/8866.rst b/doc/build/changelog/unreleased_14/8866.rst
new file mode 100644
index 000000000..0b82e8d30
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/8866.rst
@@ -0,0 +1,8 @@
+.. change::
+    :tags: bug, sqlite
+    :tickets: 8866
+
+    Backported a fix for SQLite reflection of unique constraints in attached
+    schemas, released in 2.0 as a small part of :ticket:`4379`. Previously,
+    unique constraints in attached schemas would be ignored by SQLite
+    reflection. Pull request courtesy Michael Gorven.
diff --git a/doc/build/changelog/unreleased_14/8881.rst b/doc/build/changelog/unreleased_14/8881.rst
index f3fe5e66e..d0202e9a2 100644
--- a/doc/build/changelog/unreleased_14/8881.rst
+++ b/doc/build/changelog/unreleased_14/8881.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: bug, orm
     :tickets: 8881
+    :versions: 2.0.0b4
 
     Fixed issues in :func:`_orm.with_expression` where expressions that were
     composed of columns within a subquery being SELECTed from, or when using
diff --git a/doc/build/changelog/unreleased_14/8903.rst b/doc/build/changelog/unreleased_14/8903.rst
index fe1590c04..93345f646 100644
--- a/doc/build/changelog/unreleased_14/8903.rst
+++ b/doc/build/changelog/unreleased_14/8903.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: usecase, sqlite
     :tickets: 8903
+    :versions: 2.0.0b4
 
     Added support for the SQLite backend to reflect the "DEFERRABLE" and
     "INITIALLY" keywords which may be present on a foreign key construct. Pull
diff --git a/doc/build/changelog/unreleased_20/8765.rst b/doc/build/changelog/unreleased_20/8765.rst
index 1f7fe144b..17ada62f8 100644
--- a/doc/build/changelog/unreleased_20/8765.rst
+++ b/doc/build/changelog/unreleased_20/8765.rst
@@ -3,13 +3,14 @@
     :tickets: 8765
 
     Complementing :ticket:`8690`, new comparison methods such as
-    ``adjacent_to()``, ``difference()``, ``union()``, etc., were added to the
-    PG-specific range objects, bringing them in par with the standard
-    operators implemented by the underlying
+    :meth:`_postgresql.Range.adjacent_to`,
+    :meth:`_postgresql.Range.difference`, :meth:`_postgresql.Range.union`,
+    etc., were added to the PG-specific range objects, bringing them in par
+    with the standard operators implemented by the underlying
     :attr:`_postgresql.AbstractRange.comparator_factory`.
 
-    In addition, the ``__bool__()_`` method of the class has been corrected to
-    be consistent with the common Python *containers* behavior as well as how
+    In addition, the ``__bool__()`` method of the class has been corrected to
+    be consistent with the common Python containers behavior as well as how
     other popular PostgreSQL drivers do: it now tells whether the range
     instance is *not* empty, rather than the other way around.
 
diff --git a/doc/build/changelog/unreleased_20/8783.rst b/doc/build/changelog/unreleased_20/8783.rst
index 1462cf779..baffb7c18 100644
--- a/doc/build/changelog/unreleased_20/8783.rst
+++ b/doc/build/changelog/unreleased_20/8783.rst
@@ -1,5 +1,5 @@
 .. change::
-    :tags: bug
+    :tags: bug, typing
     :tickets: 8783
 
     Adjusted internal use of the Python ``IntFlag`` class which changed its
diff --git a/doc/build/changelog/unreleased_20/8796.rst b/doc/build/changelog/unreleased_20/8796.rst
index 5248ca233..cd4f7457f 100644
--- a/doc/build/changelog/unreleased_20/8796.rst
+++ b/doc/build/changelog/unreleased_20/8796.rst
@@ -1,5 +1,5 @@
 .. change::
-    :tags: bug, performance
+    :tags: bug, orm, performance
     :tickets: 8796
 
     Additional performance enhancements within ORM-enabled SQL statements,
diff --git a/doc/build/changelog/unreleased_20/8878.rst b/doc/build/changelog/unreleased_20/8878.rst
index ddcf0667e..0c380e951 100644
--- a/doc/build/changelog/unreleased_20/8878.rst
+++ b/doc/build/changelog/unreleased_20/8878.rst
@@ -1,5 +1,5 @@
 .. change::
-    :tags: usecase, ext
+    :tags: usecase, orm extensions
     :tickets: 8878
 
     Added support for the :func:`.association_proxy` extension function to
diff --git a/doc/build/conf.py b/doc/build/conf.py
index a4440e83a..db7979c99 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -67,6 +67,7 @@ changelog_sections = [
     "orm declarative",
     "orm querying",
     "orm configuration",
+    "orm extensions",
     "examples",
     "engine",
     "sql",