diff options
| -rw-r--r-- | doc/build/orm/extensions/declarative/mixins.rst | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/events.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/build/orm/extensions/declarative/mixins.rst b/doc/build/orm/extensions/declarative/mixins.rst index c401b9bc8..3b1146240 100644 --- a/doc/build/orm/extensions/declarative/mixins.rst +++ b/doc/build/orm/extensions/declarative/mixins.rst @@ -436,7 +436,7 @@ against the parent:: Mixing in Columns in Inheritance Scenarios ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In constrast to how ``__tablename__`` and other special names are handled when +In contrast to how ``__tablename__`` and other special names are handled when used with :class:`.declared_attr`, when we mix in columns and properties (e.g. relationships, column properties, etc.), the function is invoked for the **base class only** in the hierarchy. Below, only the diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index 9c837446d..9d95eda3b 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -732,7 +732,7 @@ class MapperEvents(event.Events): def go(): # ... - Constrast this event to :meth:`.MapperEvents.after_configured`, + Contrast this event to :meth:`.MapperEvents.after_configured`, which is invoked after the series of mappers has been configured, as well as :meth:`.MapperEvents.mapper_configured`, which is invoked on a per-mapper basis as each one is configured to the extent possible. @@ -779,7 +779,7 @@ class MapperEvents(event.Events): operation proceeds; unlike that event, when this event is invoked, all cross-configurations (e.g. backrefs) will also have been made available for any mappers that were pending. - Also constrast to :meth:`.MapperEvents.before_configured`, + Also contrast to :meth:`.MapperEvents.before_configured`, which is invoked before the series of mappers has been configured. This event can **only** be applied to the :class:`.Mapper` class |