summaryrefslogtreecommitdiff
path: root/doc/build/orm
diff options
context:
space:
mode:
authorKarthikeyan Singaravelan <tir.karthi@gmail.com>2020-08-09 10:02:57 +0000
committerKarthikeyan Singaravelan <tir.karthi@gmail.com>2020-08-09 10:02:57 +0000
commit71f14f6de8ee1865fd68d7989f751eed95dde719 (patch)
treeb59ef7821edddcdba1c3782118e7237b6b5e067e /doc/build/orm
parentc0685e5f419e203acd5e46f25c90e851e30e6f03 (diff)
downloadsqlalchemy-71f14f6de8ee1865fd68d7989f751eed95dde719.tar.gz
Fix typos
Diffstat (limited to 'doc/build/orm')
-rw-r--r--doc/build/orm/cascades.rst2
-rw-r--r--doc/build/orm/session_basics.rst12
-rw-r--r--doc/build/orm/session_transaction.rst4
3 files changed, 9 insertions, 9 deletions
diff --git a/doc/build/orm/cascades.rst b/doc/build/orm/cascades.rst
index 8631dedbe..3f06b34c2 100644
--- a/doc/build/orm/cascades.rst
+++ b/doc/build/orm/cascades.rst
@@ -246,7 +246,7 @@ association::
Above, when a ``Parent`` object is marked for deletion
using :meth:`_orm.Session.delete`, the flush process will as usual delete
-the assocation rows from the ``association`` table, however per cascade
+the associated rows from the ``association`` table, however per cascade
rules it will also delete all related ``Child`` rows.
diff --git a/doc/build/orm/session_basics.rst b/doc/build/orm/session_basics.rst
index f63b7abd0..ecf76ae63 100644
--- a/doc/build/orm/session_basics.rst
+++ b/doc/build/orm/session_basics.rst
@@ -110,7 +110,7 @@ When you write your application, the
:class:`.sessionmaker` factory should be globally scoped, the same way as
the :class:`_engine.Engine` object created by :func:`_sa.create_engine` is
also typically globally scoped. As these objects are both factories, they
-can be used by any number of functions and threads simultaenously.
+can be used by any number of functions and threads simultaneously.
.. seealso::
@@ -391,7 +391,7 @@ To emit a bulk UPDATE in :term:`1.x style`, the :meth:`_query.Query.update` meth
may be used::
session.query(User).filter(User.nane == "squidward").\
- update({"name": "spongebob"}, syncronize_session="fetch")
+ update({"name": "spongebob"}, synchronize_session="fetch")
Above, an UPDATE will be emitted against all rows that match the name
"squidward" and be updated to the name "spongebob". The
@@ -410,7 +410,7 @@ be configured with :paramref:`_orm.Session.future` set to ``True``::
from sqlalchemy import update
stmt = update(User).where(User.nane == "squidward").values(name="spongebob")).\
- execution_options(syncronize_session="fetch")
+ execution_options(synchronize_session="fetch")
session.execute(stmt)
@@ -424,7 +424,7 @@ within the :class:`_orm.Session` will be marked as deleted and expunged.
Bulk delete, :term:`1.x style`::
session.query(User).filter(User.nane == "squidward").\
- delete(syncronize_session="fetch")
+ delete(synchronize_session="fetch")
Bulk delete, :term:`2.0 style`. The :meth:`_orm.Session` must
be configured with :paramref:`_orm.Session.future` set to ``True``::
@@ -432,7 +432,7 @@ be configured with :paramref:`_orm.Session.future` set to ``True``::
session = Session(future=True)
from sqlalchemy import delete
- stmt = delete(User).where(User.nane == "squidward").execution_options(syncronize_session="fetch")
+ stmt = delete(User).where(User.nane == "squidward").execution_options(synchronize_session="fetch")
session.execute(stmt)
@@ -478,7 +478,7 @@ values for ``synchronize_session`` are supported:
The bulk UPDATE and DELETE features bypass ORM unit-of-work automation in
favor being able to emit a single UPDATE or DELETE statement at once
- without complextiy.
+ without complexity.
* The operations do not offer in-Python cascading of
relationships - it is assumed that ON UPDATE CASCADE and/or
diff --git a/doc/build/orm/session_transaction.rst b/doc/build/orm/session_transaction.rst
index 6bef0cee6..4cffdc4a3 100644
--- a/doc/build/orm/session_transaction.rst
+++ b/doc/build/orm/session_transaction.rst
@@ -370,7 +370,7 @@ The :meth:`_orm.Session.begin` method and the session's "autobegin" process
use the same sequence of steps to begin the transaction. This includes
that the :meth:`_orm.SessionEvents.after_transaction_create` event is invoked
when it occurs; this hook is used by frameworks in order to integrate their
-own trasactional processes with that of the ORM :class:`_orm.Session`.
+own transactional processes with that of the ORM :class:`_orm.Session`.
.. _session_subtransactions:
@@ -387,7 +387,7 @@ Migrating from the "subtransaction" pattern
The "subtransaction" pattern that was often used with autocommit mode is
also deprecated in 1.4. This pattern allowed the use of the
-:meth:`_orm.Session.begin` method when a tranasction were already begun,
+:meth:`_orm.Session.begin` method when a transaction were already begun,
resulting in a construct called a "subtransaction", which was essentially
a block that would prevent the :meth:`_orm.Session.commit` method from actually
committing.