diff options
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/decl_api.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/loading.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/persistence.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 20 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/relationships.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/lib/sqlalchemy/orm/decl_api.py b/lib/sqlalchemy/orm/decl_api.py index 89d18bcac..e6983675b 100644 --- a/lib/sqlalchemy/orm/decl_api.py +++ b/lib/sqlalchemy/orm/decl_api.py @@ -291,7 +291,7 @@ def declarative_base( Base = declarative_base() - Is equvialent to:: + Is equivalent to:: from sqlalchemy.orm import registry @@ -612,7 +612,7 @@ class registry(object): """Map a class declaratively. In this form of mapping, the class is scanned for mapping information, - including for columns to be associaed with a table, and/or an + including for columns to be associated with a table, and/or an actual table object. Returns the :class:`_orm.Mapper` object. diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index 6c38931b4..a63a4236d 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -1329,7 +1329,7 @@ def load_scalar_attributes(mapper, state, attribute_names, passive): # in the case of inheritance, particularly concrete and abstract # concrete inheritance, the class manager might have some keys # of attributes on the superclass that we didn't actually map. - # These could be mapped as "concrete, dont load" or could be completely + # These could be mapped as "concrete, don't load" or could be completely # excluded from the mapping and we know nothing about them. Filter them # here to prevent them from coming through. if attribute_names: diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 5a9bc102e..4ad91dd06 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -155,7 +155,7 @@ class Mapper( legacy_is_orphan=False, _compiled_cache_size=100, ): - r"""Direct consructor for a new :class:`_orm.Mapper` object. + r"""Direct constructor for a new :class:`_orm.Mapper` object. The :func:`_orm.mapper` function is normally invoked through the use of the :class:`_orm.registry` object through either the diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index 7ba3a26d0..03de64392 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -1984,7 +1984,7 @@ class BulkUDCompileState(CompileState): and eval_condition(state.obj()) and ( update_options._refresh_identity_token is None - # TODO: coverage for the case where horiziontal sharding + # TODO: coverage for the case where horizontal sharding # invokes an update() or delete() given an explicit identity # token up front or state.identity_token diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 1422fd6a1..d36818254 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -96,7 +96,7 @@ class Query( :meth:`_query.Query.with_session` method. - For a full walkthrough of :class:`_query.Query` usage, see the + For a full walk through of :class:`_query.Query` usage, see the :ref:`ormtutorial_toplevel`. """ @@ -796,9 +796,9 @@ class Query( rows (which are most). As of SQLAlchemy 1.4, the :meth:`_orm.Query.yield_per` method is - equvalent to using the ``yield_per`` execution option at the ORM level. - See the section :ref:`orm_queryguide_yield_per` for further background - on this option. + equivalent to using the ``yield_per`` execution option at the ORM + level. See the section :ref:`orm_queryguide_yield_per` for further + background on this option. """ self.load_options += {"_yield_per": count} @@ -961,7 +961,7 @@ class Query( """Return a Query with a specific 'autoflush' setting. As of SQLAlchemy 1.4, the :meth:`_orm.Query.autoflush` method - is equvalent to using the ``autoflush`` execution option at the + is equivalent to using the ``autoflush`` execution option at the ORM level. See the section :ref:`orm_queryguide_autoflush` for further background on this option. @@ -975,9 +975,9 @@ class Query( as they are loaded, or reused from the current :class:`.Session`. As of SQLAlchemy 1.4, the :meth:`_orm.Query.populate_existing` method - is equvalent to using the ``populate_existing`` execution option at the - ORM level. See the section :ref:`orm_queryguide_populate_existing` for - further background on this option. + is equivalent to using the ``populate_existing`` execution option at + the ORM level. See the section :ref:`orm_queryguide_populate_existing` + for further background on this option. """ self.load_options += {"_populate_existing": True} @@ -1160,7 +1160,7 @@ class Query( **automatic aliasing** to the entities inside the subquery, when they are referenced on the outside. Above, if we continue to refer to the ``User`` entity without any additional aliasing applied - to it, those references wil be in terms of the subquery:: + to it, those references will be in terms of the subquery:: q = session.query(User).filter(User.name.like('e%')).\ limit(5).from_self().\ @@ -1326,7 +1326,7 @@ class Query( # this enables clause adaptation for non-ORM # expressions. # legacy. see test/orm/test_froms.py for various - # "oldstyle" tests that rely on this and the correspoinding + # "oldstyle" tests that rely on this and the corresponding # "newtyle" that do not. self._compile_options += {"_orm_only_from_obj_alias": False} diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py index 550ff3833..41c3a5e53 100644 --- a/lib/sqlalchemy/orm/relationships.py +++ b/lib/sqlalchemy/orm/relationships.py @@ -3650,7 +3650,7 @@ class JoinCondition(object): class _ColInAnnotations(object): - """Seralizable object that tests for a name in c._annotations.""" + """Serializable object that tests for a name in c._annotations.""" __slots__ = ("name",) diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 06a69b425..9b2c402c6 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -414,7 +414,7 @@ class ORMExecuteState(util.MemoizedSlots): Handlers will very likely not want to add any options to queries when such an operation is occurring, as loader options are already - capable of being propigated to relationship loaders and should + capable of being propagated to relationship loaders and should be already present. .. seealso:: @@ -979,7 +979,7 @@ class Session(_SessionClassMethods): :param autocommit: Defaults to ``False``. When ``True``, the :class:`.Session` does not automatically begin transactions for - individual statement exections, will acquire connections from the + individual statement executions, will acquire connections from the engine on an as-needed basis, releasing to the connection pool after each statement. Flushes will begin and commit (or possibly rollback) their own transaction if no transaction is present. |