From 1e61c1fff81131bf37d14d6e38920cfaa68439c0 Mon Sep 17 00:00:00 2001 From: Lele Gaifax Date: Sun, 30 Dec 2018 21:16:11 -0500 Subject: [PATCH] commit 1b774808c926665047bf353222ecd191679a95d1 Author: Lele Gaifax Date: Tue Dec 25 12:35:41 2018 +0100 Consistently use "PostgreSQL", fixing also a few doc glitches commit 0e382aaee4427193926f0dc10ad29056bc12c85e Author: Lele Gaifax Date: Tue Dec 25 12:08:49 2018 +0100 Remove duplicated words Change-Id: Iaa586b9412f46a50fe6ff3bbb92e07d6cb1905c8 (cherry picked from commit c0f9708fde39175c8695fdd87873464f516fdf98) (cherry picked from commit 7ec092063a7defe2b60d8f01b2eb3cda9dd28c90) (cherry picked from commit 74838dda2f7e7bd66fc597fd3f7cee1d245beecb) --- doc/build/changelog/changelog_10.rst | 4 ++-- doc/build/orm/cascades.rst | 2 +- doc/build/orm/persistence_techniques.rst | 2 +- doc/build/orm/session_transaction.rst | 2 +- lib/sqlalchemy/dialects/sqlite/base.py | 2 +- lib/sqlalchemy/testing/plugin/plugin_base.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index 1603960101..51e9c36927 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -220,7 +220,7 @@ ``_reset_exported()`` would corrupt the state of the object. This method is intended for selectable objects and is called by the ORM in some cases; an erroneous mapper configuration would could lead the - ORM to call this on on a :class:`.Table` object. + ORM to call this on a :class:`.Table` object. .. change:: :tags: bug, ext @@ -706,7 +706,7 @@ construct, when the target :class:`.Table` has Python-side defaults. The :class:`.Select` construct would compile standalone with the erroneous column present subsequent to compilation of the - :class:`.Insert`, and the the :class:`.Insert` statement itself would + :class:`.Insert`, and the :class:`.Insert` statement itself would fail on a second compile attempt due to duplicate bound parameters. .. change:: diff --git a/doc/build/orm/cascades.rst b/doc/build/orm/cascades.rst index 0a0f23a707..8886621ae9 100644 --- a/doc/build/orm/cascades.rst +++ b/doc/build/orm/cascades.rst @@ -131,7 +131,7 @@ delete The ``delete`` cascade indicates that when a "parent" object is marked for deletion, its related "child" objects should also be marked -for deletion. If for example we we have a relationship ``User.addresses`` +for deletion. If for example we have a relationship ``User.addresses`` with ``delete`` cascade configured:: class User(Base): diff --git a/doc/build/orm/persistence_techniques.rst b/doc/build/orm/persistence_techniques.rst index b1746e0cc6..36863553d8 100644 --- a/doc/build/orm/persistence_techniques.rst +++ b/doc/build/orm/persistence_techniques.rst @@ -240,7 +240,7 @@ outside of the database's usual autoincrement routine. In this case, we have to make sure SQLAlchemy can "pre-execute" the default, which means it has to be an explicit SQL expression. -.. note:: This section will will illustrate multiple recipes involving +.. note:: This section will illustrate multiple recipes involving datetime values for MySQL and SQLite, since the datetime datatypes on these two backends have additional idiosyncratic requirements that are useful to illustrate. Keep in mind however that SQLite and MySQL require an explicit diff --git a/doc/build/orm/session_transaction.rst b/doc/build/orm/session_transaction.rst index 328aabfbf3..1b74908891 100644 --- a/doc/build/orm/session_transaction.rst +++ b/doc/build/orm/session_transaction.rst @@ -150,7 +150,7 @@ methods are called. The :class:`.Session` also features an older legacy mode of use called **autocommit mode**, where a transaction is not started implicitly, and unless -the the :meth:`.Session.begin` method is invoked, the :class:`.Session` will +the :meth:`.Session.begin` method is invoked, the :class:`.Session` will perform each database operation on a new connection checked out from the connection pool, which is then released back to the pool immediately after the operation completes. This refers to diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index 77f45f2f15..a4bd284be9 100644 --- a/lib/sqlalchemy/dialects/sqlite/base.py +++ b/lib/sqlalchemy/dialects/sqlite/base.py @@ -189,7 +189,7 @@ The other axis along which SQLite's transactional locking is impacted is via the nature of the ``BEGIN`` statement used. The three varieties are "deferred", "immediate", and "exclusive", as described at `BEGIN TRANSACTION `_. A straight -``BEGIN`` statement uses the "deferred" mode, where the the database file is +``BEGIN`` statement uses the "deferred" mode, where the database file is not locked until the first read or write operation, and read access remains open to other transactions until the first write operation. But again, it is critical to note that the pysqlite driver interferes with this behavior diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index aeae944fe0..24b9670d1b 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -66,7 +66,7 @@ def setup_options(make_option): make_option("--nomemory", action="store_true", dest="nomemory", help="Don't run memory profiling tests") make_option("--postgresql-templatedb", type="string", - help="name of template database to use for Postgresql " + help="name of template database to use for PostgreSQL " "CREATE DATABASE (defaults to current database)") make_option("--low-connections", action="store_true", dest="low_connections", -- 2.47.2