Use the non-deprecated function for subscribing to events in the database and

anthony-tuininga · anthony-tuininga · commit cf1265cb2d0e · 2018-06-19T11:07:30.000-06:00
note that the subscription ID will always be zero and will be removed in
cx_Oracle 7.
diff --git a/doc/src/subscription.rst b/doc/src/subscription.rst
@@ -23,11 +23,11 @@ Subscription Object
 
 .. attribute:: Subscription.id
 
-    This read-only attribute returns the registration ID returned by the
-    database when the subscription was created.
+    This read-only attribute returns the value 0.
 
     .. deprecated:: 6.0
-        This attribute was never intended to be exposed.
+        This attribute was never intended to be exposed and will be removed
+        in cx_Oracle 7.
 
 
 .. attribute:: Subscription.ipAddress
diff --git a/src/cxoConnection.c b/src/cxoConnection.c
@@ -1530,8 +1530,7 @@ static PyObject *cxoConnection_subscribe(cxoConnection *conn, PyObject* args,
     }
 
     // create ODPI-C subscription
-    if (dpiConn_newSubscription(conn->handle, &params, &subscr->handle,
-            &subscr->id) < 0) {
+    if (dpiConn_subscribe(conn->handle, &params, &subscr->handle) < 0) {
         cxoError_raiseAndReturnNull();
         cxoBuffer_clear(&ipAddressBuffer);
         cxoBuffer_clear(&nameBuffer);

Original file line number	Diff line number	Diff line change
`@@ -1530,8 +1530,7 @@ static PyObject cxoConnection_subscribe(cxoConnection conn, PyObject* args,`
`1530`	`1530`	`}`
`1531`	`1531`
`1532`	`1532`	`// create ODPI-C subscription`
`1533`		`- if (dpiConn_newSubscription(conn->handle, &params, &subscr->handle,`
`1534`		`- &subscr->id) < 0) {`
	`1533`	`+ if (dpiConn_subscribe(conn->handle, &params, &subscr->handle) < 0) {`
`1535`	`1534`	`cxoError_raiseAndReturnNull();`
`1536`	`1535`	`cxoBuffer_clear(&ipAddressBuffer);`
`1537`	`1536`	`cxoBuffer_clear(&nameBuffer);`