changelog fixes

Change-Id: I24e3de82d656d59719fd067bc81b2948e725b487
(cherry picked from commit 731262b17e0678b2549bf5d41adfd9c82ced01cc)

diff --git a/doc/build/changelog/unreleased_14/7799.rst b/doc/build/changelog/unreleased_14/7799.rst
index 00254738ee95a1794549734b62da8b9160e40c03..8d88d23bc19b84c88edf0865e20f221e3337a22b 100644 (file)
--- a/doc/build/changelog/unreleased_14/7799.rst
+++ b/doc/build/changelog/unreleased_14/7799.rst
@@ -2,7 +2,7 @@
     :tags: bug, orm
     :tickets: 7799
 
-    Fixed issue where the :func:`_orm.polymorphic_selectin` loader option would
+    Fixed issue where the :func:`_orm.selectin_polymorphic` loader option would
     not work with joined inheritance mappers that don't have a fixed
     "polymorphic_on" column.   Additionally added test support for a wider
     variety of usage patterns with this construct.
\ No newline at end of file

diff --git a/doc/build/changelog/unreleased_14/7812.rst b/doc/build/changelog/unreleased_14/7812.rst
index 7e28428acfa68e5c869533500f848a6772d917b1..00c7d3834abc37b3008919a1a5d12ed1f690fd56 100644 (file)
--- a/doc/build/changelog/unreleased_14/7812.rst
+++ b/doc/build/changelog/unreleased_14/7812.rst
@@ -2,6 +2,7 @@
     :tags: bug, mssql, regression
     :tickets: 7812
 
-    Fixed regression caused by :ticket:`7160` where FK reflection on a very
-    old database (compatibility level 80: SQL Server 2000) causes an
-    "Ambiguous column name" error. Patch courtesy of @Lin-Your.
+    Fixed regression caused by :ticket:`7160` where FK reflection in
+    conjunction with a low compatibility level setting (compatibility level 80:
+    SQL Server 2000) causes an "Ambiguous column name" error. Patch courtesy
+    @Lin-Your.

diff --git a/doc/build/changelog/unreleased_14/7860.rst b/doc/build/changelog/unreleased_14/7860.rst
index cb6bcc59fce507cd68ce3af3e124f4ac7ef8060f..40ecf38fda4531a60d58aea5714db0faa3ad33e7 100644 (file)
--- a/doc/build/changelog/unreleased_14/7860.rst
+++ b/doc/build/changelog/unreleased_14/7860.rst
@@ -2,10 +2,10 @@
     :tags: usecase, schema
     :tickets: 7860
 
-    Added support so that the :paramref:`.Table.tometadata.referred_schema_fn`
+    Added support so that the :paramref:`.Table.to_metadata.referred_schema_fn`
     callable passed to :meth:`.Table.to_metadata` may return the value
-    :data:`.BLANK_SCHEMA` to indicate that the referenced foreign key should be
-    reset to None. The :data.`RETAIN_SCHEMA` symbol may also be returned from
+    :attr:`.BLANK_SCHEMA` to indicate that the referenced foreign key should be
+    reset to None. The :attr:`RETAIN_SCHEMA` symbol may also be returned from
     this function to indicate "no change", which will behave the same as
     ``None`` currently does which also indicates no change.
 

diff --git a/doc/build/core/metadata.rst b/doc/build/core/metadata.rst
index c7316d1b650e03853218c9d214d9775e7a2f62f4..a8fc2e4748473b4f79dec96544f02049b5f2ccaf 100644 (file)
--- a/doc/build/core/metadata.rst
+++ b/doc/build/core/metadata.rst
@@ -572,6 +572,14 @@ Column, Table, MetaData API
 
     .. versionadded:: 1.0.14
 
+.. attribute:: sqlalchemy.schema.RETAIN_SCHEMA
+
+    Symbol indicating that a :class:`_schema.Table`, :class:`.Sequence`
+    or in some cases a :class:`_schema.ForeignKey` object, in situations
+    where the object is being copied for a :meth:`.MetaData.to_metadata`
+    operation, should retain the schema name that it already has.
+
+
 
 .. autoclass:: Column
     :members:

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 7c9fef644cfa1ea6c0c78409b3e7d74e498650b7..0667370be66e50dd92da14ce9776ba348a33dce1 100644 (file)
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -58,7 +58,15 @@ from .. import inspection
 from .. import util
 
 
-RETAIN_SCHEMA = util.symbol("retain_schema")
+RETAIN_SCHEMA = util.symbol(
+    "retain_schema"
+    """Symbol indicating that a :class:`_schema.Table`, :class:`.Sequence`
+    or in some cases a :class:`_schema.ForeignKey` object, in situations
+    where the object is being copied for a :meth:`.MetaData.to_metadata`
+    operation, should retain the schema name that it already has.
+
+    """
+)
 
 BLANK_SCHEMA = util.symbol(
     "blank_schema",