Commit 5489fc47 authored by Tim Graham's avatar Tim Graham
Browse files

[1.5.X] Fixed links to DATABASE ENGINE setting. refs #19516

Backport of f56f6cfa from master
parent cd914175
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ each app, Django looks for a file called
``<appname>/sql/<modelname>.<backend>.sql``, where ``<appname>`` is
your app directory, ``<modelname>`` is the model's name in lowercase
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
database with an :setting:`ENGINE` value of
:setting:`ENGINE <DATABASE-ENGINE>` in your settings file (e.g., if you have
defined a database with an :setting:`ENGINE <DATABASE-ENGINE>` value of
``django.db.backends.sqlite3``, Django will look for
``<appname>/sql/<modelname>.sqlite3.sql``).

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ setting and assigning values to the following keys for the ``'default'``
connection:

* :setting:`NAME`
* :setting:`ENGINE`
* :setting:`ENGINE <DATABASE-ENGINE>`
* :setting:`USER`
* :setting:`PASSWORD`
* :setting:`HOST`
+4 −3
Original line number Diff line number Diff line
@@ -207,9 +207,10 @@ your database connection settings.
  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
:setting:`ENGINE` to ``'django.db.backends.sqlite3'`` and :setting:`NAME` to
the place where you'd like to store the database. SQLite is included in Python,
so you won't need to install anything else to support your database.
:setting:`ENGINE <DATABASE-ENGINE>` to ``'django.db.backends.sqlite3'`` and
:setting:`NAME` to the place where you'd like to store the database. SQLite is
included in Python, so you won't need to install anything else to support your
database.

.. note::

+2 −3
Original line number Diff line number Diff line
@@ -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
this requirement, a separate, backwards-compatible backend, called
"mysql_old", has been added to Django. To use this backend, change
the :setting:`DATABASE_ENGINE` setting in your Django settings file from
this::
the ``DATABASE_ENGINE`` setting in your Django settings file from this::

    DATABASE_ENGINE = "mysql"

@@ -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
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),
are only available on the "mysql" backend, and will not be made available for
"mysql_old".
+1 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ need to reload your data. Do this after you have made the change to using
  **Back up your database first!**

  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).

To upgrade each application to use a ``DecimalField``, you can do the
@@ -769,4 +769,3 @@ Old (0.96) New (1.0)
``backend.uses_case_insensitive_names``  ``connection.features.uses_case_insensitive_names``
``backend.uses_custom_queryset``         ``connection.features.uses_custom_queryset``
=======================================  ===================================================
Loading