Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Remove no-longer-valid references to the DATABASE_* settings, the leg…

…acy code for them was already removed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d036b87126eadb3d76a4e4c5daea1bfb767db912 1 parent 4584069
Alex Gaynor authored September 09, 2011
21  django/conf/global_settings.py
@@ -142,16 +142,6 @@
142 142
 SEND_BROKEN_LINK_EMAILS = False
143 143
 
144 144
 # Database connection info.
145  
-# Legacy format
146  
-DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
147  
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
148  
-DATABASE_USER = ''             # Not used with sqlite3.
149  
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
150  
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
151  
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
152  
-DATABASE_OPTIONS = {}          # Set to empty dictionary for default.
153  
-
154  
-# New format
155 145
 DATABASES = {
156 146
 }
157 147
 
@@ -558,17 +548,6 @@
558 548
 # The name of the class to use to run the test suite
559 549
 TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner'
560 550
 
561  
-# The name of the database to use for testing purposes.
562  
-# If None, a name of 'test_' + DATABASE_NAME will be assumed
563  
-TEST_DATABASE_NAME = None
564  
-
565  
-# Strings used to set the character set and collation order for the test
566  
-# database. These values are passed literally to the server, so they are
567  
-# backend-dependent. If None, no special settings are sent (system defaults are
568  
-# used).
569  
-TEST_DATABASE_CHARSET = None
570  
-TEST_DATABASE_COLLATION = None
571  
-
572 551
 ############
573 552
 # FIXTURES #
574 553
 ############
24  docs/ref/contrib/gis/db-api.txt
@@ -23,30 +23,6 @@ its functionality into full-fledged spatial database backends:
23 23
 * :mod:`django.contrib.gis.db.backends.oracle`
24 24
 * :mod:`django.contrib.gis.db.backends.spatialite`
25 25
 
26  
-Database Settings Backwards-Compatibility
27  
------------------------------------------
28  
-
29  
-In :doc:`Django 1.2 </releases/1.2>`, the way
30  
-to :ref:`specify databases <specifying-databases>` in your settings was changed.
31  
-The old database settings format (e.g., the ``DATABASE_*`` settings)
32  
-is backwards compatible with GeoDjango, and  will automatically use the
33  
-appropriate spatial backend as long as :mod:`django.contrib.gis` is in
34  
-your :setting:`INSTALLED_APPS`.  For example, if you have the following in
35  
-your settings::
36  
-
37  
-    DATABASE_ENGINE='postgresql_psycopg2'
38  
-
39  
-    ...
40  
-
41  
-    INSTALLED_APPS = (
42  
-      ...
43  
-      'django.contrib.gis',
44  
-      ...
45  
-    )
46  
-
47  
-Then, :mod:`django.contrib.gis.db.backends.postgis` is automatically used as your
48  
-spatial backend.
49  
-
50 26
 .. _mysql-spatial-limitations:
51 27
 
52 28
 MySQL Spatial Limitations
2  docs/ref/contrib/gis/install.txt
@@ -573,7 +573,7 @@ Now, the ``spatialite`` command can be used to initialize a spatial database::
573 573
 .. note::
574 574
 
575 575
     The parameter ``geodjango.db`` is the *filename* of the SQLite database
576  
-    you want to use.  Use the same in the :setting:`DATABASE_NAME`
  576
+    you want to use.  Use the same in the :setting:`DATABASES` ``"name"`` key
577 577
     inside your ``settings.py``.
578 578
 
579 579
 
92  docs/ref/settings.txt
@@ -2121,69 +2121,6 @@ CACHE_BACKEND
2121 2121
    This setting has been replaced by :setting:`BACKEND <CACHES-BACKEND>` in
2122 2122
    :setting:`CACHES`.
2123 2123
 
2124  
-.. setting:: DATABASE_ENGINE
2125  
-
2126  
-DATABASE_ENGINE
2127  
----------------
2128  
-
2129  
-.. deprecated:: 1.2
2130  
-   This setting has been replaced by :setting:`ENGINE` in
2131  
-   :setting:`DATABASES`.
2132  
-
2133  
-.. setting:: DATABASE_HOST
2134  
-
2135  
-DATABASE_HOST
2136  
--------------
2137  
-
2138  
-.. deprecated:: 1.2
2139  
-   This setting has been replaced by :setting:`HOST` in
2140  
-   :setting:`DATABASES`.
2141  
-
2142  
-.. setting:: DATABASE_NAME
2143  
-
2144  
-DATABASE_NAME
2145  
--------------
2146  
-
2147  
-.. deprecated:: 1.2
2148  
-   This setting has been replaced by :setting:`NAME` in
2149  
-   :setting:`DATABASES`.
2150  
-
2151  
-.. setting:: DATABASE_OPTIONS
2152  
-
2153  
-DATABASE_OPTIONS
2154  
-----------------
2155  
-
2156  
-.. deprecated:: 1.2
2157  
-   This setting has been replaced by :setting:`OPTIONS` in
2158  
-   :setting:`DATABASES`.
2159  
-
2160  
-.. setting:: DATABASE_PASSWORD
2161  
-
2162  
-DATABASE_PASSWORD
2163  
------------------
2164  
-
2165  
-.. deprecated:: 1.2
2166  
-   This setting has been replaced by :setting:`PASSWORD` in
2167  
-   :setting:`DATABASES`.
2168  
-
2169  
-.. setting:: DATABASE_PORT
2170  
-
2171  
-DATABASE_PORT
2172  
--------------
2173  
-
2174  
-.. deprecated:: 1.2
2175  
-   This setting has been replaced by :setting:`PORT` in
2176  
-   :setting:`DATABASES`.
2177  
-
2178  
-.. setting:: DATABASE_USER
2179  
-
2180  
-DATABASE_USER
2181  
--------------
2182  
-
2183  
-.. deprecated:: 1.2
2184  
-   This setting has been replaced by :setting:`USER` in
2185  
-   :setting:`DATABASES`.
2186  
-
2187 2124
 .. setting:: IGNORABLE_404_ENDS
2188 2125
 
2189 2126
 IGNORABLE_404_ENDS
@@ -2198,31 +2135,4 @@ IGNORABLE_404_STARTS
2198 2135
 --------------------
2199 2136
 
2200 2137
 .. deprecated:: 1.4
2201  
-   This setting has been superseded by :setting:`IGNORABLE_404_URLS`.
2202  
-
2203  
-.. setting:: TEST_DATABASE_CHARSET
2204  
-
2205  
-TEST_DATABASE_CHARSET
2206  
----------------------
2207  
-
2208  
-.. deprecated:: 1.2
2209  
-   This setting has been replaced by :setting:`TEST_CHARSET` in
2210  
-   :setting:`DATABASES`.
2211  
-
2212  
-.. setting:: TEST_DATABASE_COLLATION
2213  
-
2214  
-TEST_DATABASE_COLLATION
2215  
------------------------
2216  
-
2217  
-.. deprecated:: 1.2
2218  
-   This setting has been replaced by :setting:`TEST_COLLATION` in
2219  
-   :setting:`DATABASES`.
2220  
-
2221  
-.. setting:: TEST_DATABASE_NAME
2222  
-
2223  
-TEST_DATABASE_NAME
2224  
-------------------
2225  
-
2226  
-.. deprecated:: 1.2
2227  
-   This setting has been replaced by :setting:`TEST_NAME` in
2228  
-   :setting:`DATABASES`.
  2138
+   This setting has been superseded by :setting:`IGNORABLE_404_URLS`.

0 notes on commit d036b87

Please sign in to comment.
Something went wrong with that request. Please try again.