From: Mike Bayer Date: Tue, 21 Jun 2022 20:41:06 +0000 (-0400) Subject: post-edits for ORM rework X-Git-Tag: rel_1_4_38~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d39415a3c68f5278f04998b8b0d1fb309c0df461;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git post-edits for ORM rework amends f9f1e8b6c5890eb17b6ba055ff563 Change-Id: I2fd6de56db82aad4d22abf5807e5849e48693124 (cherry picked from commit 8fe6a3fa550f18068e7566e25a9e96f60a186430) --- diff --git a/doc/build/orm/dataclasses.rst b/doc/build/orm/dataclasses.rst index 4c1c91285e..fa37e011e5 100644 --- a/doc/build/orm/dataclasses.rst +++ b/doc/build/orm/dataclasses.rst @@ -360,7 +360,7 @@ The SQLAlchemy ORM supports mapping an attrs_ class using **Declarative with Imperative Table** or **Imperative** mapping. The general form of these two styles is fully equivalent to the :ref:`orm_declarative_dataclasses_declarative_table` and -:ref:`orm_declarative_attrs_imperative_table` mapping forms used with +:ref:`orm_declarative_dataclasses_imperative_table` mapping forms used with dataclasses, where the inline attribute directives used by dataclasses or attrs are unchanged, and SQLAlchemy's table-oriented instrumentation is applied at runtime. diff --git a/doc/build/orm/declarative_tables.rst b/doc/build/orm/declarative_tables.rst index b8804a21d5..dad145c42f 100644 --- a/doc/build/orm/declarative_tables.rst +++ b/doc/build/orm/declarative_tables.rst @@ -192,7 +192,7 @@ Appending additional columns to an existing Declarative mapped class ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ A declarative table configuration allows the addition of new -:class:`_schema.Column` objects an existing mapping after the :class:`.Table` +:class:`_schema.Column` objects to an existing mapping after the :class:`.Table` metadata has already been generated. For a declarative class that is declared using a declarative base class, diff --git a/doc/build/orm/mapping_styles.rst b/doc/build/orm/mapping_styles.rst index edacadf71d..1b33aa2e29 100644 --- a/doc/build/orm/mapping_styles.rst +++ b/doc/build/orm/mapping_styles.rst @@ -517,7 +517,6 @@ as well as specific history on modifications to attributes since the last flush: .. _dataclasses: https://docs.python.org/3/library/dataclasses.html -.. _attrs: https://pypi.org/project/attrs/ .. [1] When running under Python 2, a Python 2 "old style" class is the only kind of class that isn't compatible. When running code on Python 2,