Remove no-longer-valid references to the DATABASE_* settings, the legacy code... (d036b871) · Commits · Dom Sekotill / django

django/conf/global_settings.py

+0 −21

Original line number	Diff line number	Diff line
		@@ -142,16 +142,6 @@ SERVER_EMAIL = 'root@localhost'
		SEND_BROKEN_LINK_EMAILS = False

		# Database connection info.
		# Legacy format
		DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
		DATABASE_NAME = '' # Or path to database file if using sqlite3.
		DATABASE_USER = '' # Not used with sqlite3.
		DATABASE_PASSWORD = '' # Not used with sqlite3.
		DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
		DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
		DATABASE_OPTIONS = {} # Set to empty dictionary for default.

		# New format
		DATABASES = {
		}

		@@ -558,17 +548,6 @@ DEFAULT_EXCEPTION_REPORTER_FILTER = 'django.views.debug.SafeExceptionReporterFil
		# The name of the class to use to run the test suite
		TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'

		# The name of the database to use for testing purposes.
		# If None, a name of 'test_' + DATABASE_NAME will be assumed
		TEST_DATABASE_NAME = None

		# Strings used to set the character set and collation order for the test
		# database. These values are passed literally to the server, so they are
		# backend-dependent. If None, no special settings are sent (system defaults are
		# used).
		TEST_DATABASE_CHARSET = None
		TEST_DATABASE_COLLATION = None

		############
		# FIXTURES #
		############

docs/ref/contrib/gis/db-api.txt

+0 −24

Original line number	Diff line number	Diff line
		@@ -23,30 +23,6 @@ its functionality into full-fledged spatial database backends:
		* :mod:`django.contrib.gis.db.backends.oracle`
		* :mod:`django.contrib.gis.db.backends.spatialite`

		Database Settings Backwards-Compatibility
		-----------------------------------------

		In :doc:`Django 1.2 </releases/1.2>`, the way
		to :ref:`specify databases <specifying-databases>` in your settings was changed.
		The old database settings format (e.g., the ``DATABASE_*`` settings)
		is backwards compatible with GeoDjango, and will automatically use the
		appropriate spatial backend as long as :mod:`django.contrib.gis` is in
		your :setting:`INSTALLED_APPS`. For example, if you have the following in
		your settings::

		DATABASE_ENGINE='postgresql_psycopg2'

		...

		INSTALLED_APPS = (
		...
		'django.contrib.gis',
		...
		)

		Then, :mod:`django.contrib.gis.db.backends.postgis` is automatically used as your
		spatial backend.

		.. _mysql-spatial-limitations:

		MySQL Spatial Limitations

docs/ref/contrib/gis/install.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -573,7 +573,7 @@ Now, the ``spatialite`` command can be used to initialize a spatial database::
		.. note::

		The parameter ``geodjango.db`` is the filename of the SQLite database
		you want to use. Use the same in the :setting:`DATABASE_NAME`
		you want to use. Use the same in the :setting:`DATABASES` ``"name"`` key
		inside your ``settings.py``.

docs/ref/settings.txt

+1 −91

Original line number	Diff line number	Diff line
		@@ -2121,69 +2121,6 @@ CACHE_BACKEND
		This setting has been replaced by :setting:`BACKEND <CACHES-BACKEND>` in
		:setting:`CACHES`.

		.. setting:: DATABASE_ENGINE

		DATABASE_ENGINE
		---------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`ENGINE` in
		:setting:`DATABASES`.

		.. setting:: DATABASE_HOST

		DATABASE_HOST
		-------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`HOST` in
		:setting:`DATABASES`.

		.. setting:: DATABASE_NAME

		DATABASE_NAME
		-------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`NAME` in
		:setting:`DATABASES`.

		.. setting:: DATABASE_OPTIONS

		DATABASE_OPTIONS
		----------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`OPTIONS` in
		:setting:`DATABASES`.

		.. setting:: DATABASE_PASSWORD

		DATABASE_PASSWORD
		-----------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`PASSWORD` in
		:setting:`DATABASES`.

		.. setting:: DATABASE_PORT

		DATABASE_PORT
		-------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`PORT` in
		:setting:`DATABASES`.

		.. setting:: DATABASE_USER

		DATABASE_USER
		-------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`USER` in
		:setting:`DATABASES`.

		.. setting:: IGNORABLE_404_ENDS

		IGNORABLE_404_ENDS
		@@ -2199,30 +2136,3 @@ IGNORABLE_404_STARTS

		.. deprecated:: 1.4
		This setting has been superseded by :setting:`IGNORABLE_404_URLS`.
		No newline at end of file

		.. setting:: TEST_DATABASE_CHARSET

		TEST_DATABASE_CHARSET
		---------------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`TEST_CHARSET` in
		:setting:`DATABASES`.

		.. setting:: TEST_DATABASE_COLLATION

		TEST_DATABASE_COLLATION
		-----------------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`TEST_COLLATION` in
		:setting:`DATABASES`.

		.. setting:: TEST_DATABASE_NAME

		TEST_DATABASE_NAME
		------------------

		.. deprecated:: 1.2
		This setting has been replaced by :setting:`TEST_NAME` in
		:setting:`DATABASES`.