p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.6.x] Fixed #21070 -- Added a more complex database configuration example. 

Thanks joejasinski for the suggestion.

Backport of e15f7f31d0 from master
This commit is contained in:
Louis Fill 2013-09-23 14:50:50 +01:00 committed by Tim Graham
parent 5e549e7efe
commit a6a5c8b06d
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/ref/settings.txt
View File

@ -419,12 +419,28 @@ SQLite. This can be configured using the following::
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': 'mydatabase'
'NAME': 'mydatabase',
}
}
For other database backends, or more complex SQLite configurations, other options
will be required. The following inner options are available.
When connecting to other database backends, such as MySQL, Oracle, or
PostgreSQL, additional connection parameters will be required. See
the :setting:`ENGINE <DATABASE-ENGINE>` setting below on how to specify
other database types. This example is for PostgreSQL::
DATABASES = {
'default': {
'ENGINE':'django.db.backends.postgresql_psycopg2',
'NAME': 'mydatabase',
'USER': 'mydatabaseuser',
'PASSWORD': 'mypassword',
'HOST': '127.0.0.1',
'PORT': '5432',
}
}
The following inner options that may be required for more complex
configurations are available:
.. setting:: DATABASE-ATOMIC_REQUESTS