Kaydet (Commit) e626a3f9 authored tarafından Nick Pope's avatar Nick Pope Kaydeden (comit) Tim Graham

Renamed Sqlite and Sqlite3 references to SQLite.

üst 7534e434
...@@ -289,7 +289,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): ...@@ -289,7 +289,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
# Get the index info # Get the index info
cursor.execute("PRAGMA index_list(%s)" % self.connection.ops.quote_name(table_name)) cursor.execute("PRAGMA index_list(%s)" % self.connection.ops.quote_name(table_name))
for row in cursor.fetchall(): 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. # columns. Discard last 2 columns if there.
number, index, unique = row[:3] number, index, unique = row[:3]
# Get the index info for that index # Get the index info for that index
......
...@@ -30,12 +30,12 @@ popular alternatives. ...@@ -30,12 +30,12 @@ popular alternatives.
If you want to use Django with a database, which is probably the case, you'll 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 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/ .. _Python: https://www.python.org/
.. _PostgreSQL: https://www.postgresql.org/ .. _PostgreSQL: https://www.postgresql.org/
.. _MySQL: https://www.mysql.com/ .. _MySQL: https://www.mysql.com/
.. _`SQLite 3`: https://www.sqlite.org/ .. _`SQLite`: https://www.sqlite.org/
.. _Oracle: https://www.oracle.com/ .. _Oracle: https://www.oracle.com/
.. _faq-python-version-support: .. _faq-python-version-support:
......
...@@ -116,7 +116,7 @@ Homebrew ...@@ -116,7 +116,7 @@ Homebrew
-------- --------
`Homebrew`_ handles all the SpatiaLite related packages on your behalf, `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 update
$ brew install spatialite-tools $ brew install spatialite-tools
......
...@@ -3403,7 +3403,7 @@ by the aggregate. ...@@ -3403,7 +3403,7 @@ by the aggregate.
.. admonition:: SQLite .. admonition:: SQLite
SQLite doesn't provide ``StdDev`` out of the box. An implementation 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 documentation`_ for instructions on obtaining and installing this
extension. extension.
...@@ -3437,7 +3437,7 @@ by the aggregate. ...@@ -3437,7 +3437,7 @@ by the aggregate.
.. admonition:: SQLite .. admonition:: SQLite
SQLite doesn't provide ``Variance`` out of the box. An implementation 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 documentation`_ for instructions on obtaining and installing this
extension. extension.
......
...@@ -113,7 +113,7 @@ class BulkCreateTests(TestCase): ...@@ -113,7 +113,7 @@ class BulkCreateTests(TestCase):
Country.objects.bulk_create([valid_country, invalid_country]) Country.objects.bulk_create([valid_country, invalid_country])
def test_batch_same_vals(self): 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. # collapsed to one insert.
Restaurant.objects.bulk_create([ Restaurant.objects.bulk_create([
Restaurant(name='foo') for i in range(0, 2) Restaurant(name='foo') for i in range(0, 2)
......
...@@ -240,14 +240,13 @@ class Ticket17477RegressionTests(AdminScriptTestCase): ...@@ -240,14 +240,13 @@ class Ticket17477RegressionTests(AdminScriptTestCase):
self.assertNoOutput(err) self.assertNoOutput(err)
class Sqlite3InMemoryTestDbs(TransactionTestCase): class SQLiteInMemoryTestDbs(TransactionTestCase):
multi_db = True multi_db = True
available_apps = ['test_runner'] available_apps = ['test_runner']
@unittest.skipUnless(all(db.connections[conn].vendor == 'sqlite' for conn in db.connections), @unittest.skipUnless(all(db.connections[conn].vendor == 'sqlite' for conn in db.connections),
"This is an sqlite-specific issue") "This is an sqlite-specific issue")
def test_transaction_support(self): def test_transaction_support(self):
"""Ticket #16329: sqlite3 in-memory test databases"""
for option_key, option_value in ( for option_key, option_value in (
('NAME', ':memory:'), ('TEST', {'NAME': ':memory:'})): ('NAME', ':memory:'), ('TEST', {'NAME': ':memory:'})):
tested_connections = db.ConnectionHandler({ tested_connections = db.ConnectionHandler({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment