diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py index 4f4a54eacf..8ed043ba67 100644 --- a/django/db/backends/sqlite3/introspection.py +++ b/django/db/backends/sqlite3/introspection.py @@ -289,7 +289,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): # Get the index info cursor.execute("PRAGMA index_list(%s)" % self.connection.ops.quote_name(table_name)) for row in cursor.fetchall(): - # Sqlite3 3.8.9+ has 5 columns, however older versions only give 3 + # SQLite 3.8.9+ has 5 columns, however older versions only give 3 # columns. Discard last 2 columns if there. number, index, unique = row[:3] # Get the index info for that index diff --git a/docs/faq/install.txt b/docs/faq/install.txt index 30dae8d34f..1aaaa56b29 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -30,12 +30,12 @@ popular alternatives. If you want to use Django with a database, which is probably the case, you'll also need a database engine. PostgreSQL_ is recommended, because we're -PostgreSQL fans, and MySQL_, `SQLite 3`_, and Oracle_ are also supported. +PostgreSQL fans, and MySQL_, `SQLite`_, and Oracle_ are also supported. .. _Python: https://www.python.org/ .. _PostgreSQL: https://www.postgresql.org/ .. _MySQL: https://www.mysql.com/ -.. _`SQLite 3`: https://www.sqlite.org/ +.. _`SQLite`: https://www.sqlite.org/ .. _Oracle: https://www.oracle.com/ .. _faq-python-version-support: diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt index 6e85a86547..1565be2c38 100644 --- a/docs/ref/contrib/gis/install/spatialite.txt +++ b/docs/ref/contrib/gis/install/spatialite.txt @@ -116,7 +116,7 @@ Homebrew -------- `Homebrew`_ handles all the SpatiaLite related packages on your behalf, -including SQLite3, SpatiaLite, PROJ, and GEOS. Install them like this:: +including SQLite, SpatiaLite, PROJ, and GEOS. Install them like this:: $ brew update $ brew install spatialite-tools diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 2f32382e1f..81a82fe7b6 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -3403,7 +3403,7 @@ by the aggregate. .. admonition:: SQLite SQLite doesn't provide ``StdDev`` out of the box. An implementation - is available as an extension module for SQLite. Consult the `SQlite + is available as an extension module for SQLite. Consult the `SQLite documentation`_ for instructions on obtaining and installing this extension. @@ -3437,7 +3437,7 @@ by the aggregate. .. admonition:: SQLite SQLite doesn't provide ``Variance`` out of the box. An implementation - is available as an extension module for SQLite. Consult the `SQlite + is available as an extension module for SQLite. Consult the `SQLite documentation`_ for instructions on obtaining and installing this extension. diff --git a/tests/bulk_create/tests.py b/tests/bulk_create/tests.py index eb7d2a9e28..6f0e324111 100644 --- a/tests/bulk_create/tests.py +++ b/tests/bulk_create/tests.py @@ -113,7 +113,7 @@ class BulkCreateTests(TestCase): Country.objects.bulk_create([valid_country, invalid_country]) def test_batch_same_vals(self): - # Sqlite had a problem where all the same-valued models were + # SQLite had a problem where all the same-valued models were # collapsed to one insert. Restaurant.objects.bulk_create([ Restaurant(name='foo') for i in range(0, 2) diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index be6c8b9fa0..c95bd8f106 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -240,14 +240,13 @@ class Ticket17477RegressionTests(AdminScriptTestCase): self.assertNoOutput(err) -class Sqlite3InMemoryTestDbs(TransactionTestCase): +class SQLiteInMemoryTestDbs(TransactionTestCase): multi_db = True available_apps = ['test_runner'] @unittest.skipUnless(all(db.connections[conn].vendor == 'sqlite' for conn in db.connections), "This is an sqlite-specific issue") def test_transaction_support(self): - """Ticket #16329: sqlite3 in-memory test databases""" for option_key, option_value in ( ('NAME', ':memory:'), ('TEST', {'NAME': ':memory:'})): tested_connections = db.ConnectionHandler({