Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.7.x] Fixed #22368 -- clarified connecting to Oracle DB using servi…

…ce 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 bfac6be from master
  • Loading branch information...
commit 4dd37a3a6eb744a9901eb53454a86bf304a71426 1 parent db2aacf
Moayad Mardini mmardini authored timgraham committed
Showing with 8 additions and 5 deletions.
  1. +8 −5 docs/ref/databases.txt
13 docs/ref/databases.txt
View
@@ -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
----------------
Please sign in to comment.
Something went wrong with that request. Please try again.