diff options
Diffstat (limited to 'doc/build')
-rw-r--r-- | doc/build/changelog/changelog_05.rst | 2 | ||||
-rw-r--r-- | doc/build/changelog/changelog_07.rst | 2 | ||||
-rw-r--r-- | doc/build/changelog/migration_05.rst | 4 | ||||
-rw-r--r-- | doc/build/changelog/migration_08.rst | 2 | ||||
-rw-r--r-- | doc/build/changelog/migration_09.rst | 2 | ||||
-rw-r--r-- | doc/build/core/pooling.rst | 4 | ||||
-rw-r--r-- | doc/build/orm/relationships.rst | 2 | ||||
-rw-r--r-- | doc/build/orm/session.rst | 6 |
8 files changed, 12 insertions, 12 deletions
diff --git a/doc/build/changelog/changelog_05.rst b/doc/build/changelog/changelog_05.rst index 96a0fb19f..04ab11dca 100644 --- a/doc/build/changelog/changelog_05.rst +++ b/doc/build/changelog/changelog_05.rst @@ -1557,7 +1557,7 @@ :tickets: Column with no name (as in declarative) won't raise a - NoneType error when it's string output is requsted + NoneType error when its string output is requested (such as in a stack trace). .. change:: diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst index d6fe4af90..5504a0ad6 100644 --- a/doc/build/changelog/changelog_07.rst +++ b/doc/build/changelog/changelog_07.rst @@ -4084,7 +4084,7 @@ The Column.references() method now returns True if it has a foreign key referencing the - given column exactly, not just it's parent + given column exactly, not just its parent table. .. change:: diff --git a/doc/build/changelog/migration_05.rst b/doc/build/changelog/migration_05.rst index c79f8b0f6..01ceef1c6 100644 --- a/doc/build/changelog/migration_05.rst +++ b/doc/build/changelog/migration_05.rst @@ -338,7 +338,7 @@ extend the ORM. Heres a summary: * **SessionExtension.** - This is an easy to use extension class for session events. In particular, it provides ``before_flush()``, ``after_flush()`` and - ``after_flush_postexec()`` methods. It's usage is + ``after_flush_postexec()`` methods. This usage is recommended over ``MapperExtension.before_XXX`` in many cases since within ``before_flush()`` you can modify the flush plan of the session freely, something which cannot @@ -545,7 +545,7 @@ Removed * **get()/load() cleanup** - The ``load()`` method has been removed. It's + The ``load()`` method has been removed. Its functionality was kind of arbitrary and basically copied from Hibernate, where it's also not a particularly meaningful method. diff --git a/doc/build/changelog/migration_08.rst b/doc/build/changelog/migration_08.rst index ab43e22ee..717a24c73 100644 --- a/doc/build/changelog/migration_08.rst +++ b/doc/build/changelog/migration_08.rst @@ -632,7 +632,7 @@ not really a column, CAST operator, or SQL function that really drives what kinds of operations are present, it's the *type* of the expression. The implementation details are minimal - only a few extra methods are added to the core -:class:`.ColumnElement` type so that it consults it's +:class:`.ColumnElement` type so that it consults its :class:`.TypeEngine` object for an optional set of operators. New or revised operations can be associated with any type, either via subclassing of an existing type, by using diff --git a/doc/build/changelog/migration_09.rst b/doc/build/changelog/migration_09.rst index 72ef80c12..3825af091 100644 --- a/doc/build/changelog/migration_09.rst +++ b/doc/build/changelog/migration_09.rst @@ -1504,7 +1504,7 @@ Label constructs can now render as their name alone in an ORDER BY For the case where a :class:`.Label` is used in both the columns clause as well as the ORDER BY clause of a SELECT, the label will render as -just it's name in the ORDER BY clause, assuming the underlying dialect +just its name in the ORDER BY clause, assuming the underlying dialect reports support of this feature. E.g. an example like:: diff --git a/doc/build/core/pooling.rst b/doc/build/core/pooling.rst index fcd8fd55c..698c10327 100644 --- a/doc/build/core/pooling.rst +++ b/doc/build/core/pooling.rst @@ -127,7 +127,7 @@ within a transparent proxy:: cursor.execute("select foo") The purpose of the transparent proxy is to intercept the ``close()`` call, -such that instead of the DBAPI connection being closed, it's returned to the +such that instead of the DBAPI connection being closed, it is returned to the pool:: # "close" the connection. Returns @@ -229,7 +229,7 @@ Disconnect Handling - Pessimistic At the expense of some extra SQL emitted for each connection checked out from the pool, a "ping" operation established by a checkout event handler -can detect an invalid connection before it's used:: +can detect an invalid connection before it is used:: from sqlalchemy import exc from sqlalchemy import event diff --git a/doc/build/orm/relationships.rst b/doc/build/orm/relationships.rst index 32f056456..c65f06cbc 100644 --- a/doc/build/orm/relationships.rst +++ b/doc/build/orm/relationships.rst @@ -1013,7 +1013,7 @@ to just ``city='Boston'``. When using Declarative, rudimentary SQL functions l The custom criteria we use in a :paramref:`~.relationship.primaryjoin` is generally only significant when SQLAlchemy is rendering SQL in -order to load or represent this relationship. That is, it's used in +order to load or represent this relationship. That is, it's used in the SQL statement that's emitted in order to perform a per-attribute lazy load, or when a join is constructed at query time, such as via :meth:`.Query.join`, or via the eager "joined" or "subquery" styles of diff --git a/doc/build/orm/session.rst b/doc/build/orm/session.rst index 657d8e4b5..4a4e5deca 100644 --- a/doc/build/orm/session.rst +++ b/doc/build/orm/session.rst @@ -663,8 +663,8 @@ new session. Here's some examples: copies of itself that are local to individual :class:`~.Session` objects. - In the caching use case, it's common that the ``load=False`` flag - is used to remove the overhead of reconciling the object's state + In the caching use case, it's common to use the ``load=False`` + flag to remove the overhead of reconciling the object's state with the database. There's also a "bulk" version of :meth:`~.Session.merge` called :meth:`~.Query.merge_result` that was designed to work with cache-extended :class:`.Query` @@ -1868,7 +1868,7 @@ Using Subtransactions with Autocommit A subtransaction indicates usage of the :meth:`.Session.begin` method in conjunction with the ``subtransactions=True`` flag. This produces a non-transactional, delimiting construct that allows nesting of calls to :meth:`~.Session.begin` and :meth:`~.Session.commit`. -It's purpose is to allow the construction of code that can function within a transaction +Its purpose is to allow the construction of code that can function within a transaction both independently of any external code that starts a transaction, as well as within a block that has already demarcated a transaction. |