diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2016-05-04 02:30:48 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-05-03 19:30:48 -0400 |
| commit | 575a9a791e62de7550761970dc6797271d956c57 (patch) | |
| tree | b9efc4ac2c223fc0a10aeb7c33f6c548dba48830 /docs | |
| parent | e00d77c4834b40f06f9bf271da5fdfb526ad8f56 (diff) | |
Normalized "an SQL" spelling.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/custom-lookups.txt | 4 | ||||
| -rw-r--r-- | docs/ref/models/expressions.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.8.txt | 2 | ||||
| -rw-r--r-- | docs/topics/testing/overview.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/howto/custom-lookups.txt b/docs/howto/custom-lookups.txt index 7d7667dc98..51a65d8ec6 100644 --- a/docs/howto/custom-lookups.txt +++ b/docs/howto/custom-lookups.txt @@ -67,7 +67,7 @@ We then need to define the ``as_sql`` method. This takes a ``SQLCompiler`` object, called ``compiler``, and the active database connection. ``SQLCompiler`` objects are not documented, but the only thing we need to know about them is that they have a ``compile()`` method which returns a tuple -containing a SQL string, and the parameters to be interpolated into that +containing an SQL string, and the parameters to be interpolated into that string. In most cases, you don't need to use it directly and can pass it on to ``process_lhs()`` and ``process_rhs()``. @@ -88,7 +88,7 @@ example, ``process_lhs`` returns ``('"author"."name"', [])`` and parameters for the left hand side, but this would depend on the object we have, so we still need to include them in the parameters we return. -Finally we combine the parts into a SQL expression with ``<>``, and supply all +Finally we combine the parts into an SQL expression with ``<>``, and supply all the parameters for the query. We then return a tuple containing the generated SQL string and the parameters. diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt index aada3b448d..d29d8d05b4 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -88,7 +88,7 @@ makes it possible to refer to model field values and perform database operations using them without actually having to pull them out of the database into Python memory. -Instead, Django uses the ``F()`` object to generate a SQL expression that +Instead, Django uses the ``F()`` object to generate an SQL expression that describes the required operation at the database level. This is easiest to understand through an example. Normally, one might do diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index 0ae2cba410..a6d425e8d8 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -651,7 +651,7 @@ Tests * Added test client support for file uploads with file-like objects. -* A shared cache is now used when testing with a SQLite in-memory database when +* A shared cache is now used when testing with an SQLite in-memory database when using Python 3.4+ and SQLite 3.7.13+. This allows sharing the database between threads. diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt index 1674a40a39..eca477bdd9 100644 --- a/docs/topics/testing/overview.txt +++ b/docs/topics/testing/overview.txt @@ -177,7 +177,7 @@ control the particular collation used by the test database. See the :doc:`settings documentation </ref/settings>` for details of these and other advanced settings. -If using a SQLite in-memory database with Python 3.4+ and SQLite 3.7.13+, +If using an SQLite in-memory database with Python 3.4+ and SQLite 3.7.13+, `shared cache <https://www.sqlite.org/sharedcache.html>`_ will be enabled, so you can write tests with ability to share the database between threads. |
