From 4dd37a3a6eb744a9901eb53454a86bf304a71426 Mon Sep 17 00:00:00 2001
From: Moayad Mardini <moayad.m@gmail.com>
Date: Mon, 19 May 2014 10:33:12 +0300
Subject: [PATCH] [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
---
docs/ref/databases.txt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 7ccba91d12..44dd8fedf1 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -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
----------------