diff options
| author | Tim Graham <timograham@gmail.com> | 2014-06-11 15:26:17 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-12 13:28:16 -0400 |
| commit | e51662e7bc2a946e6656e4954c902451a04eaf0e (patch) | |
| tree | 913cd35d457b5412e65318ec343158e55fcd9a59 /docs | |
| parent | 961c9d6c6b1975fba8eb1492288e0fc49652c43d (diff) | |
[1.7.x] Fixed #22811 -- Allowed setting both the old and new TEST database settings.
An ImproperlyConfigured exception will be raised they mismatch.
Backport of 1c58cabad7 and a2cd0e12c9 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 01d052d413..ac23194141 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -614,6 +614,8 @@ TEST All :setting:`TEST <DATABASE-TEST>` sub-entries used to be independent entries in the database settings dictionary, with a ``TEST_`` prefix. + For backwards compatibility with older versions of Django, you can define + both versions of the settings as long as they match. Further, ``TEST_CREATE``, ``TEST_USER_CREATE`` and ``TEST_PASSWD`` were changed to ``CREATE_DB``, ``CREATE_USER`` and ``PASSWORD`` respectively. diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index e8f25a45e1..f970d40819 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -1546,9 +1546,12 @@ will be removed in Django 1.8. Reorganization of database test settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + All database settings with a ``TEST_`` prefix have been deprecated in favor of entries in a :setting:`TEST <DATABASE-TEST>` dictionary in the database -settings. The old settings will be supported until Django 1.9. +settings. The old settings will be supported until Django 1.9. For backwards +compatibility with older versions of Django, you can define both versions of +the settings as long as they match. FastCGI support ~~~~~~~~~~~~~~~ |