test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed #22368 -- clarified connecting to Oracle DB using service name 

Used the official terminology listed in
http://docs.oracle.com/cd/B19306_01/network.102/b14212/glossary.htm#i997309

Thanks michael.cherkasov for the report.

Backport of bfac6bef83 from master
This commit is contained in:
Moayad Mardini 2014-05-19 10:33:12 +03:00 committed by Tim Graham
parent db2aacff99
commit 4dd37a3a6e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/ref/databases.txt
View File

@ -757,7 +757,8 @@ by default, but in case it is not, you'll need to grant permissions like so:
Connecting to the database
--------------------------
Your Django settings.py file should look something like this for Oracle::
To connect using the service name of your Oracle database, your ``settings.py``
file should look something like this::
DATABASES = {
'default': {
@ -771,8 +772,9 @@ Your Django settings.py file should look something like this for Oracle::
}
If you don't use a ``tnsnames.ora`` file or a similar naming method that
recognizes the SID ("xe" in this example), then fill in both
In this case, you should leave both :setting:`HOST` and :setting:`PORT` empty.
However, if you don't use a ``tnsnames.ora`` file or a similar naming method
and want to connect using the SID ("xe" in this example), then fill in both
:setting:`HOST` and :setting:`PORT` like so::
DATABASES = {
@ -786,8 +788,9 @@ recognizes the SID ("xe" in this example), then fill in both
}
}
You should supply both :setting:`HOST` and :setting:`PORT`, or leave both
as empty strings.
You should either supply both :setting:`HOST` and :setting:`PORT`, or leave
both as empty strings. Django will use a different connect descriptor depending
on that choice.
Threaded option
----------------