HackBase/python-cx_Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary section of TNS naming string (ADDRESS_LIST).

Browse Source
This commit is contained in:
Anthony Tuininga 2017-01-13 11:37:52 -07:00
parent 4185d96682
commit 678476f5f0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cx_Oracle.c
View File

@ -196,12 +196,12 @@ static PyObject* MakeDSN(
return NULL; return NULL;
if (sidObj) { if (sidObj) {
connectDataObj = sidObj; connectDataObj = sidObj;
format = cxString_FromAscii("(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=" format = cxString_FromAscii("(DESCRIPTION=(ADDRESS="
"(PROTOCOL=TCP)(HOST=%s)(PORT=%s)))(CONNECT_DATA=(SID=%s)))"); "(PROTOCOL=TCP)(HOST=%s)(PORT=%s))(CONNECT_DATA=(SID=%s)))");
} else { } else {
connectDataObj = serviceNameObj; connectDataObj = serviceNameObj;
format = cxString_FromAscii("(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=" format = cxString_FromAscii("(DESCRIPTION=(ADDRESS="
"(PROTOCOL=TCP)(HOST=%s)(PORT=%s)))(CONNECT_DATA=" "(PROTOCOL=TCP)(HOST=%s)(PORT=%s))(CONNECT_DATA="
"(SERVICE_NAME=%s)))"); "(SERVICE_NAME=%s)))");
} }
if (!format) if (!format)

4
test/Connection.py
View File

@ -53,8 +53,8 @@ class TestConnection(TestCase):
def testMakeDSN(self): def testMakeDSN(self):
"test making a data source name from host, port and sid" "test making a data source name from host, port and sid"
formatString = "(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)" + \ formatString = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)" + \
"(HOST=%s)(PORT=%d)))(CONNECT_DATA=(SID=%s)))" "(HOST=%s)(PORT=%d))(CONNECT_DATA=(SID=%s)))"
args = ("hostname", 1521, "TEST") args = ("hostname", 1521, "TEST")
result = cx_Oracle.makedsn(*args) result = cx_Oracle.makedsn(*args)
self.assertEqual(result, formatString % args) self.assertEqual(result, formatString % args)