Kaydet (Commit) f56f6cfa authored tarafından Tim Graham's avatar Tim Graham

Fixed links to DATABASE ENGINE setting. refs #19516

üst 1c8be95a
...@@ -153,8 +153,8 @@ each app, Django looks for a file called ...@@ -153,8 +153,8 @@ each app, Django looks for a file called
``<appname>/sql/<modelname>.<backend>.sql``, where ``<appname>`` is ``<appname>/sql/<modelname>.<backend>.sql``, where ``<appname>`` is
your app directory, ``<modelname>`` is the model's name in lowercase your app directory, ``<modelname>`` is the model's name in lowercase
and ``<backend>`` is the last part of the module name provided for the and ``<backend>`` is the last part of the module name provided for the
:setting:`ENGINE` in your settings file (e.g., if you have defined a :setting:`ENGINE <DATABASE-ENGINE>` in your settings file (e.g., if you have
database with an :setting:`ENGINE` value of defined a database with an :setting:`ENGINE <DATABASE-ENGINE>` value of
``django.db.backends.sqlite3``, Django will look for ``django.db.backends.sqlite3``, Django will look for
``<appname>/sql/<modelname>.sqlite3.sql``). ``<appname>/sql/<modelname>.sqlite3.sql``).
......
...@@ -21,7 +21,7 @@ setting and assigning values to the following keys for the ``'default'`` ...@@ -21,7 +21,7 @@ setting and assigning values to the following keys for the ``'default'``
connection: connection:
* :setting:`NAME` * :setting:`NAME`
* :setting:`ENGINE` * :setting:`ENGINE <DATABASE-ENGINE>`
* :setting:`USER` * :setting:`USER`
* :setting:`PASSWORD` * :setting:`PASSWORD`
* :setting:`HOST` * :setting:`HOST`
......
...@@ -207,9 +207,10 @@ your database connection settings. ...@@ -207,9 +207,10 @@ your database connection settings.
same physical machine (not used for SQLite). See :setting:`HOST` for details. same physical machine (not used for SQLite). See :setting:`HOST` for details.
If you're new to databases, we recommend simply using SQLite by setting If you're new to databases, we recommend simply using SQLite by setting
:setting:`ENGINE` to ``'django.db.backends.sqlite3'`` and :setting:`NAME` to :setting:`ENGINE <DATABASE-ENGINE>` to ``'django.db.backends.sqlite3'`` and
the place where you'd like to store the database. SQLite is included in Python, :setting:`NAME` to the place where you'd like to store the database. SQLite is
so you won't need to install anything else to support your database. included in Python, so you won't need to install anything else to support your
database.
.. note:: .. note::
......
...@@ -34,8 +34,7 @@ exceptions if you attempt to use an older version. ...@@ -34,8 +34,7 @@ exceptions if you attempt to use an older version.
If you're currently unable to upgrade your copy of ``MySQLdb`` to meet If you're currently unable to upgrade your copy of ``MySQLdb`` to meet
this requirement, a separate, backwards-compatible backend, called this requirement, a separate, backwards-compatible backend, called
"mysql_old", has been added to Django. To use this backend, change "mysql_old", has been added to Django. To use this backend, change
the :setting:`DATABASE_ENGINE` setting in your Django settings file from the ``DATABASE_ENGINE`` setting in your Django settings file from this::
this::
DATABASE_ENGINE = "mysql" DATABASE_ENGINE = "mysql"
...@@ -49,7 +48,7 @@ provided only to ease this transition, and is considered deprecated; ...@@ -49,7 +48,7 @@ provided only to ease this transition, and is considered deprecated;
aside from any necessary security fixes, it will not be actively aside from any necessary security fixes, it will not be actively
maintained, and it will be removed in a future release of Django. maintained, and it will be removed in a future release of Django.
Also, note that some features, like the new :setting:`DATABASE_OPTIONS` Also, note that some features, like the new ``DATABASE_OPTIONS``
setting (see the :doc:`databases documentation </ref/databases>` for details), setting (see the :doc:`databases documentation </ref/databases>` for details),
are only available on the "mysql" backend, and will not be made available for are only available on the "mysql" backend, and will not be made available for
"mysql_old". "mysql_old".
......
...@@ -548,7 +548,7 @@ need to reload your data. Do this after you have made the change to using ...@@ -548,7 +548,7 @@ need to reload your data. Do this after you have made the change to using
**Back up your database first!** **Back up your database first!**
For SQLite, this means making a copy of the single file that stores the For SQLite, this means making a copy of the single file that stores the
database (the name of that file is the :setting:`DATABASE_NAME` in your database (the name of that file is the ``DATABASE_NAME`` in your
settings.py file). settings.py file).
To upgrade each application to use a ``DecimalField``, you can do the To upgrade each application to use a ``DecimalField``, you can do the
...@@ -769,4 +769,3 @@ Old (0.96) New (1.0) ...@@ -769,4 +769,3 @@ Old (0.96) New (1.0)
``backend.uses_case_insensitive_names`` ``connection.features.uses_case_insensitive_names`` ``backend.uses_case_insensitive_names`` ``connection.features.uses_case_insensitive_names``
``backend.uses_custom_queryset`` ``connection.features.uses_custom_queryset`` ``backend.uses_custom_queryset`` ``connection.features.uses_custom_queryset``
======================================= =================================================== ======================================= ===================================================
...@@ -285,16 +285,16 @@ This affects the following settings: ...@@ -285,16 +285,16 @@ This affects the following settings:
========================================= ========================== ========================================= ==========================
Old setting New Setting Old setting New Setting
========================================= ========================== ========================================= ==========================
:setting:`DATABASE_ENGINE` :setting:`ENGINE` `DATABASE_ENGINE` :setting:`ENGINE <DATABASE-ENGINE>`
:setting:`DATABASE_HOST` :setting:`HOST` `DATABASE_HOST` :setting:`HOST`
:setting:`DATABASE_NAME` :setting:`NAME` `DATABASE_NAME` :setting:`NAME`
:setting:`DATABASE_OPTIONS` :setting:`OPTIONS` `DATABASE_OPTIONS` :setting:`OPTIONS`
:setting:`DATABASE_PASSWORD` :setting:`PASSWORD` `DATABASE_PASSWORD` :setting:`PASSWORD`
:setting:`DATABASE_PORT` :setting:`PORT` `DATABASE_PORT` :setting:`PORT`
:setting:`DATABASE_USER` :setting:`USER` `DATABASE_USER` :setting:`USER`
:setting:`TEST_DATABASE_CHARSET` :setting:`TEST_CHARSET` `TEST_DATABASE_CHARSET` :setting:`TEST_CHARSET`
:setting:`TEST_DATABASE_COLLATION` :setting:`TEST_COLLATION` `TEST_DATABASE_COLLATION` :setting:`TEST_COLLATION`
:setting:`TEST_DATABASE_NAME` :setting:`TEST_NAME` `TEST_DATABASE_NAME` :setting:`TEST_NAME`
========================================= ========================== ========================================= ==========================
These changes are also required if you have manually created a database These changes are also required if you have manually created a database
......
...@@ -819,16 +819,16 @@ This affects the following settings: ...@@ -819,16 +819,16 @@ This affects the following settings:
========================================= ========================== ========================================= ==========================
Old setting New Setting Old setting New Setting
========================================= ========================== ========================================= ==========================
:setting:`DATABASE_ENGINE` :setting:`ENGINE` `DATABASE_ENGINE` :setting:`ENGINE <DATABASE-ENGINE>`
:setting:`DATABASE_HOST` :setting:`HOST` `DATABASE_HOST` :setting:`HOST`
:setting:`DATABASE_NAME` :setting:`NAME` `DATABASE_NAME` :setting:`NAME`
:setting:`DATABASE_OPTIONS` :setting:`OPTIONS` `DATABASE_OPTIONS` :setting:`OPTIONS`
:setting:`DATABASE_PASSWORD` :setting:`PASSWORD` `DATABASE_PASSWORD` :setting:`PASSWORD`
:setting:`DATABASE_PORT` :setting:`PORT` `DATABASE_PORT` :setting:`PORT`
:setting:`DATABASE_USER` :setting:`USER` `DATABASE_USER` :setting:`USER`
:setting:`TEST_DATABASE_CHARSET` :setting:`TEST_CHARSET` `TEST_DATABASE_CHARSET` :setting:`TEST_CHARSET`
:setting:`TEST_DATABASE_COLLATION` :setting:`TEST_COLLATION` `TEST_DATABASE_COLLATION` :setting:`TEST_COLLATION`
:setting:`TEST_DATABASE_NAME` :setting:`TEST_NAME` `TEST_DATABASE_NAME` :setting:`TEST_NAME`
========================================= ========================== ========================================= ==========================
These changes are also required if you have manually created a database These changes are also required if you have manually created a database
...@@ -850,7 +850,7 @@ has been deprecated. ...@@ -850,7 +850,7 @@ has been deprecated.
If you are currently using the ``postgresql`` backend, you should If you are currently using the ``postgresql`` backend, you should
migrate to using the ``postgresql_psycopg2`` backend. To update your migrate to using the ``postgresql_psycopg2`` backend. To update your
code, install the ``psycopg2`` library and change the code, install the ``psycopg2`` library and change the
:setting:`DATABASE_ENGINE` setting to use :setting:`ENGINE <DATABASE-ENGINE>` setting to use
``django.db.backends.postgresql_psycopg2``. ``django.db.backends.postgresql_psycopg2``.
CSRF response-rewriting middleware CSRF response-rewriting middleware
......
...@@ -195,9 +195,9 @@ entirely!). If you want to use a different database name, specify ...@@ -195,9 +195,9 @@ entirely!). If you want to use a different database name, specify
Aside from using a separate database, the test runner will otherwise Aside from using a separate database, the test runner will otherwise
use all of the same database settings you have in your settings file: use all of the same database settings you have in your settings file:
:setting:`ENGINE`, :setting:`USER`, :setting:`HOST`, etc. The test :setting:`ENGINE <DATABASE-ENGINE>`, :setting:`USER`, :setting:`HOST`, etc. The
database is created by the user specified by :setting:`USER`, so you'll need test database is created by the user specified by :setting:`USER`, so you'll
to make sure that the given user account has sufficient privileges to need to make sure that the given user account has sufficient privileges to
create a new database on the system. create a new database on the system.
For fine-grained control over the character encoding of your test For fine-grained control over the character encoding of your test
......
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