From: Mike Bayer Date: Wed, 30 Mar 2022 15:44:23 +0000 (-0400) Subject: further changelog / doc fixes X-Git-Tag: rel_1_4_33~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aade1973639517dff06d9f5147c2ec67fc5e3a8d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git further changelog / doc fixes Change-Id: I959f242272ff5147b7c1f721cf119d09309a8c57 (cherry picked from commit 9731484f5c991b56e64349ef7b9775ef83b18402) --- diff --git a/doc/build/changelog/unreleased_14/7860.rst b/doc/build/changelog/unreleased_14/7860.rst index 40ecf38fda..cc41aa00bf 100644 --- a/doc/build/changelog/unreleased_14/7860.rst +++ b/doc/build/changelog/unreleased_14/7860.rst @@ -5,7 +5,7 @@ Added support so that the :paramref:`.Table.to_metadata.referred_schema_fn` callable passed to :meth:`.Table.to_metadata` may return the value :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 + 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 a8fc2e4748..7c5b7dd668 100644 --- a/doc/build/core/metadata.rst +++ b/doc/build/core/metadata.rst @@ -576,7 +576,7 @@ Column, Table, MetaData API 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` + where the object is being copied for a :meth:`.Table.to_metadata` operation, should retain the schema name that it already has. diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 0667370be6..621efd36ce 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -62,7 +62,7 @@ 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` + where the object is being copied for a :meth:`.Table.to_metadata` operation, should retain the schema name that it already has. """