From: Karthikeyan Singaravelan Date: Sun, 9 Aug 2020 10:02:57 +0000 (+0000) Subject: Fix typos X-Git-Tag: rel_1_3_19~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7cf98481902a8a8c01f5bd7e2d5c9d6af68a9f1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix typos (cherry picked from commit 71f14f6de8ee1865fd68d7989f751eed95dde719) Change-Id: Ie5e32ee12696aa0234dc6282b83220100c2288a0 --- diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst index afb0b14be6..620b65c8c7 100644 --- a/doc/build/changelog/changelog_09.rst +++ b/doc/build/changelog/changelog_09.rst @@ -772,7 +772,7 @@ when True indicates that the Python ``None`` value should be persisted as SQL NULL, rather than JSON-encoded ``'null'``. - Retrival of NULL as None is also repaired for DBAPIs other than + Retrieval of NULL as None is also repaired for DBAPIs other than psycopg2, namely pg8000. .. change:: @@ -2566,7 +2566,7 @@ Added new argument ``include_backrefs=True`` to the :func:`.validates` function; when set to False, a validation event - will not be triggered if the event was initated as a backref to + will not be triggered if the event was initiated as a backref to an attribute operation from the other side. .. seealso:: diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index 7058a2ae23..90a71d9f17 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -136,7 +136,7 @@ .. change:: :tags: bug, mssql - :tickes: 3791 + :tickets: 3791 :versions: 1.1.0 Added error code 20017 "unexpected EOF from the server" to the list of @@ -3275,7 +3275,7 @@ Removing (or adding) an event listener at the same time that the event is being run itself, either from inside the listener or from a concurrent thread, now raises a RuntimeError, as the collection used is - now an instance of ``colletions.deque()`` and does not support changes + now an instance of ``collections.deque()`` and does not support changes while being iterated. Previously, a plain Python list was used where removal from inside the event itself would produce silent failures. diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 013efce385..1988b69b30 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -925,7 +925,7 @@ .. change:: 3882 :tags: bug, sql - :tikets: 3882 + :tickets: 3882 Fixed bug originally introduced in 0.9 via :ticket:`1068` where order_by() would order by the label name based on name diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst index 38f6fd5fa5..6dc7d7f887 100644 --- a/doc/build/changelog/changelog_12.rst +++ b/doc/build/changelog/changelog_12.rst @@ -296,7 +296,7 @@ .. change:: :tags: bug, orm - :tickests: 4400 + :tickets: 4400 Fixed bug where chaining of mapper options using :meth:`.RelationshipProperty.of_type` in conjunction with a chained option diff --git a/doc/build/changelog/changelog_13.rst b/doc/build/changelog/changelog_13.rst index 1118e043aa..140c36ad65 100644 --- a/doc/build/changelog/changelog_13.rst +++ b/doc/build/changelog/changelog_13.rst @@ -1019,7 +1019,7 @@ Fixed issue where by if the "begin" of a transaction failed at the Core engine/connection level, such as due to network error or database is locked for some transactional recipes, within the context of the :class:`.Session` - procuring that connection from the conneciton pool and then immediately + procuring that connection from the connection pool and then immediately returning it, the ORM :class:`.Session` would not close the connection despite this connection not being stored within the state of that :class:`.Session`. This would lead to the connection being cleaned out by @@ -1550,7 +1550,7 @@ by table name only without the column names would not correctly be reflected as far as setting up the "referred columns", since SQLite's PRAGMA does not report on these columns if they weren't given explicitly. - For some reason this was harcoded to assume the name of the local column, + For some reason this was hardcoded to assume the name of the local column, which might work for some cases but is not correct. The new approach reflects the primary key of the referred table and uses the constraint columns list as the referred columns list, if the remote column(s) aren't @@ -1582,7 +1582,7 @@ Added support for reflection of CHECK constraints that include the special PostgreSQL qualifier "NOT VALID", which can be present for CHECK - constraints that were added to an exsiting table with the directive that + constraints that were added to an existing table with the directive that they not be applied to existing data in the table. The PostgreSQL dictionary for CHECK constraints as returned by :meth:`_reflection.Inspector.get_check_constraints` may include an additional entry @@ -1608,7 +1608,7 @@ The dialects that support json are supposed to take arguments ``json_serializer`` and ``json_deserializer`` at the create_engine() level, - however the SQLite dialect calls them ``_json_serilizer`` and + however the SQLite dialect calls them ``_json_serializer`` and ``_json_deserilalizer``. The names have been corrected, the old names are accepted with a change warning, and these parameters are now documented as :paramref:`_sa.create_engine.json_serializer` and @@ -1915,7 +1915,7 @@ Fixed an unlikely issue where the "corresponding column" routine for unions and other :class:`_selectable.CompoundSelect` objects could return the wrong column in - some overlapping column situtations, thus potentially impacting some ORM + some overlapping column situations, thus potentially impacting some ORM operations when set operations are in use, if the underlying :func:`_expression.select` constructs were used previously in other similar kinds of routines, due to a cached value not being cleared. @@ -1991,7 +1991,7 @@ :tags: bug, orm, py3k :tickets: 4674 - Replaced the Python compatbility routines for ``getfullargspec()`` with a + Replaced the Python compatibility routines for ``getfullargspec()`` with a fully vendored version from Python 3.3. Originally, Python was emitting deprecation warnings for this function in Python 3.8 alphas. While this change was reverted, it was observed that Python 3 implementations for @@ -2095,7 +2095,7 @@ :tickets: 4695 Fixed issue where the :paramref:`.AttributeEvents.active_history` flag - would not be set for an event listener that propgated to a subclass via the + would not be set for an event listener that propagated to a subclass via the :paramref:`.AttributeEvents.propagate` flag. This bug has been present for the full span of the :class:`.AttributeEvents` system. diff --git a/doc/build/changelog/migration_13.rst b/doc/build/changelog/migration_13.rst index 99a6e843be..9a86bdec34 100644 --- a/doc/build/changelog/migration_13.rst +++ b/doc/build/changelog/migration_13.rst @@ -1412,7 +1412,7 @@ Once Python 3 was introduced, DBAPIs began to start supporting Unicode more fully, and more importantly, by default. However, the conditions under which a particular DBAPI would or would not return Unicode data from a result, as well as accept Python Unicode values as parameters, remained extremely complicated. -This was the beginning of the obsolesence of the "convert_unicode" flags, +This was the beginning of the obsolescence of the "convert_unicode" flags, because they were no longer sufficient as a means of ensuring that encode/decode was occurring only where needed and not where it wasn't needed. Instead, "convert_unicode" started to be automatically detected by dialects. diff --git a/doc/build/changelog/unreleased_13/5481.rst b/doc/build/changelog/unreleased_13/5481.rst index 2ebac73bf7..7d7666a72f 100644 --- a/doc/build/changelog/unreleased_13/5481.rst +++ b/doc/build/changelog/unreleased_13/5481.rst @@ -4,5 +4,5 @@ The MySQL dialect will render FROM DUAL for a SELECT statement that has no FROM clause but has a WHERE clause. This allows things like "SELECT 1 WHERE - EXISTS (subuqery)" kinds of queries to be used as well as other use cases. + EXISTS (subquery)" kinds of queries to be used as well as other use cases. diff --git a/doc/build/core/connections.rst b/doc/build/core/connections.rst index 2ef3e8fd4e..942260d6a5 100644 --- a/doc/build/core/connections.rst +++ b/doc/build/core/connections.rst @@ -241,7 +241,7 @@ and have no effect. Instead, each statement invoked upon the connection will commit any changes automatically; it sometimes also means that the connection itself will use fewer server-side database resources. For this reason and others, "autocommit" -mode is often desirable for non-tranasctional applications that need to read +mode is often desirable for non-transactional applications that need to read individual tables or rows in isolation of a true ACID transaction. SQLAlchemy dialects can support these isolation levels as well as autocommit to @@ -264,7 +264,7 @@ certain backend, an error is raised. For example, to force REPEATABLE READ on a specific connection:: - with engine.connect().execution_options(isolation_level="REPEATBLE READ") as connection: + with engine.connect().execution_options(isolation_level="REPEATABLE READ") as connection: connection.execute() The :paramref:`_engine.Connection.execution_options.isolation_level` option diff --git a/doc/build/errors.rst b/doc/build/errors.rst index 2df9d12ba2..a6a36222ef 100644 --- a/doc/build/errors.rst +++ b/doc/build/errors.rst @@ -800,7 +800,7 @@ Instance is already associated with an instance of via its --------------------------------------------------------------------------------------------------------------------------------------------- -This error is emited when the :paramref:`_orm.relationship.single_parent` flag +This error is emitted when the :paramref:`_orm.relationship.single_parent` flag is used, and more than one object is assigned as the "parent" of an object at once. diff --git a/doc/build/orm/cascades.rst b/doc/build/orm/cascades.rst index 332ccc5fa8..60813f4e50 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/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index f1ac597bc8..a6b3fd7ca8 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -65,7 +65,7 @@ Valid values for ``isolation_level`` include: .. versionadded:: 1.3.16 added support for AUTOCOMMIT to the cx_oracle dialect - as well as the notion of a default isolation level, currently harcoded + as well as the notion of a default isolation level, currently hardcoded to "READ COMMITTED". .. seealso::