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:31:07 -0400 |
| commit | fef3f50e319bd691c8fd3313d982b6c07d66445c (patch) | |
| tree | 3a8ac7f06b192f4df52628d1fca371e92a1f7e87 /docs | |
| parent | 3c6b9f0bbd5e37099c4751cdd2a08db508d66e54 (diff) | |
[1.9.x] Normalized "an SQL" spelling.
Backport of 575a9a791e62de7550761970dc6797271d956c57 from master
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 87a388283a..0f34534182 100644 --- a/docs/howto/custom-lookups.txt +++ b/docs/howto/custom-lookups.txt @@ -71,7 +71,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()``. @@ -92,7 +92,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 223c0f6460..0a1e74d9e8 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -92,7 +92,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 c4b6752c97..7f1a86c4e9 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 5be9a88787..f8c8f2486e 100644 --- a/docs/topics/testing/overview.txt +++ b/docs/topics/testing/overview.txt @@ -179,7 +179,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. |
