oracledb 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # Change Log
 
+## node-oracledb v2.3.0 (7 Jun 2018)
+
+- The stated compatibility is now for Node.js 6, 8, and 10 due to EOL
+  of Node.js 4, and the release of Node 10.
+
+- Added support for heterogeneous connection pooling and for proxy
+  support in connection pools.  This allows each connection in the
+  pool to use different database credentials.
+
+- Added support for Oracle Database Continuous Query Notifications,
+  allowing JavaScript methods to be called when database changes are
+  committed.
+
+- Added support to `fetchAsString` and `fetchInfo` for fetching RAW
+  columns as STRING (hex-encoded).
+
+- Added Windows support for building binary packages for self-hosting
+  on internal networks. PR #891 (Danilo Silva).
+
+- Eliminated a memory leak when binding LOBs as `oracledb.BIND_INOUT`.
+
+- Added an error message indicating that `batchErrors` and
+  `dmlRowCounts` can only be used with INSERT, UPDATE, DELETE and
+  MERGE statements.
+
+- Fixed a bug that caused `queryStream()` to emit multiple close
+  events in Node.js 10.
+
+- Fixed a crash when getting the list of names for an undefined object
+  with Node.js 6.
+
+- Remove deprecated `Buffer()` function in tests in order to eliminate
+  a deprecation warning with Node.js 10.
+
+- Upgraded NAN dependency from 2.8 to 2.10.
+
+- Made some internal changes to fix NAN 2.10 deprecations: Replaced
+  `v8::String::Utf8Value` with `Nan::Uft8String`.  Replaced
+  `MakeCallback()` with `runInAsyncScope()`.
+
+- Mention that `queueRequests` is deprecated and will be removed in a
+  future version; connection pool queuing will always be enabled in
+  that future version.
+
 ## node-oracledb v2.2.0 (3 Apr 2018)
 
 - Added

package/README.md

@@ -1,9 +1,9 @@
-# node-oracledb version 2.2
+# node-oracledb version 2.3
 
 The node-oracledb add-on for Node.js powers high performance Oracle
 Database applications.
 
-Use node-oracledb to connect Node.js 4, 6, 8 and 9 to Oracle Database.
+Use node-oracledb to connect Node.js 6, 8 and 10 to Oracle Database.
 
 Node-oracledb supports basic and advanced features of Oracle Database
 and Oracle Client.  See the

package/binding.gyp

@@ -8,6 +8,7 @@
              "src/njsPool.cpp",
              "src/njsConnection.cpp",
              "src/njsResultSet.cpp",
+             "src/njsSubscription.cpp",
              "src/njsMessages.cpp",
              "src/njsIntLob.cpp",
              "odpi/src/dpiConn.c",

package/lib/connection.js

@@ -32,6 +32,8 @@ var closePromisified;
 var breakPromisified;
 var changePasswordPromisified;
 var pingPromisified;
+var subscribePromisified;
+var unsubscribePromisified;
 
 // The queryStream function is similar to execute except that it immediately
 // returns a QueryStream.
@@ -321,6 +323,34 @@ function ping(pingCb) {
 
 pingPromisified = nodbUtil.promisify(ping);
 
+// create a subscription which can be used to get notifications of database
+// changes
+function subscribe(name, options, subscribeCb) {
+  var self = this;
+
+  nodbUtil.assert(arguments.length == 3, 'NJS-009');
+  nodbUtil.assert(typeof name === 'string', 'NJS-006', 1);
+  nodbUtil.assert(nodbUtil.isObject(options), 'NJS-006', 2);
+  nodbUtil.assert(typeof subscribeCb === 'function', 'NJS-006', 3);
+  self._subscribe.call(self, name, options, subscribeCb);
+}
+
+subscribePromisified = nodbUtil.promisify(subscribe);
+
+// destroy a subscription which was earlier created using subscribe()
+function unsubscribe(name, cb) {
+  var self = this;
+
+  nodbUtil.assert(arguments.length == 2, 'NJS-009');
+  nodbUtil.assert(typeof name === 'string', 'NJS-006', 1);
+  nodbUtil.assert(typeof cb === 'function', 'NJS-006', 2);
+
+  self._unsubscribe.call(self, name, cb);
+}
+
+unsubscribePromisified = nodbUtil.promisify(unsubscribe);
+
+
 // The extend method is used to extend the Connection instance from the C layer with
 // custom properties and method overrides. References to the original methods are
 // maintained so they can be invoked by the overriding method at the right time.
@@ -427,6 +457,22 @@ function extend(conn, oracledb, pool) {
         value: pingPromisified,
         enumerable: true,
         writable: true
+      },
+      _subscribe: {
+        value: conn.subscribe
+      },
+      subscribe: {
+        value: subscribePromisified,
+        enumerable: true,
+        writable: true
+      },
+      _unsubscribe: {
+        value: conn.unsubscribe
+      },
+      unsubscribe: {
+        value: unsubscribePromisified,
+        enumerable: true,
+        writable: true
       }
     }
   );

package/lib/oracledb.js

@@ -324,6 +324,34 @@ function extend(oracledb) {
         value: 0,
         enumerable: true
       },
+      CQN_OPCODE_ALL_OPS: {
+        value: 0,
+        enumerable: true
+      },
+      CQN_OPCODE_ALL_ROWS: {
+        value: 1,
+        enumerable: true
+      },
+      CQN_OPCODE_ALTER: {
+        value: 16,
+        enumerable: true
+      },
+      CQN_OPCODE_DELETE: {
+        value: 8,
+        enumerable: true
+      },
+      CQN_OPCODE_DROP: {
+        value: 32,
+        enumerable: true
+      },
+      CQN_OPCODE_INSERT: {
+        value: 2,
+        enumerable: true
+      },
+      CQN_OPCODE_UPDATE: {
+        value: 4,
+        enumerable: true
+      },
       DB_TYPE_VARCHAR: {
         value: 1,
         enumerable: true
@@ -460,6 +488,62 @@ function extend(oracledb) {
         value: 2001,
         enumerable: true
       },
+      SUBSCR_EVENT_TYPE_DEREG: {
+        value: 5,
+        enumerable: true
+      },
+      SUBSCR_EVENT_TYPE_OBJ_CHANGE: {
+        value: 6,
+        enumerable: true
+      },
+      SUBSCR_EVENT_TYPE_QUERY_CHANGE: {
+        value: 7,
+        enumerable: true
+      },
+      SUBSCR_EVENT_TYPE_AQ: {
+        value: 100,
+        enumerable: true
+      },
+      SUBSCR_GROUPING_CLASS_TIME: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_GROUPING_TYPE_SUMMARY: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_GROUPING_TYPE_LAST: {
+        value: 2,
+        enumerable: true
+      },
+      SUBSCR_NAMESPACE_AQ: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_NAMESPACE_DBCHANGE: {
+        value: 2,
+        enumerable: true
+      },
+      SUBSCR_QOS_BEST_EFFORT: {
+        value: 16,
+        enumerable: true
+      },
+      SUBSCR_QOS_DEREG_NFY: {
+        value: 2,
+        enumerable: true
+      },
+      SUBSCR_QOS_QUERY: {
+        value: 8,
+        enumerable: true
+      },
+      SUBSCR_QOS_RELIABLE: {
+        value: 1,
+        enumerable: true
+      },
+      SUBSCR_QOS_ROWIDS: {
+        value: 4,
+        enumerable: true
+      },
       NUMBER: {
         value: 2002,
         enumerable: true

package/lib/pool.js

@@ -27,14 +27,14 @@ var closePromisified;
 // completeConnectionRequest does the actual work of getting a connection from a
 // pool when queuing is enabled. It's abstracted out so it can be called from
 // getConnection and checkRequestQueue constently.
-function completeConnectionRequest(getConnectionCb) {
+function completeConnectionRequest(config, getConnectionCb) {
   var self = this;
 
   // Incrementing _connectionsOut prior to making the async call to get a connection
   // to prevent other connection requests from exceeding the poolMax.
   self._connectionsOut += 1;
 
-  self._getConnection(function(err, connInst) {
+  self._getConnection(config, function(err, connInst) {
     if (err) {
       // Decrementing _connectionsOut if we didn't actually get a connection
       // and then rechecking the queue.
@@ -98,7 +98,8 @@ function checkRequestQueue() {
     payload.timerIdx = null;
   }
 
-  completeConnectionRequest.call(self, payload.getConnectionCb);
+  completeConnectionRequest.call(self, payload.config,
+    payload.getConnectionCb);
 }
 
 // onRequestTimeout is used to prevent requests for connections from sitting in the
@@ -129,14 +130,23 @@ function onRequestTimeout(timerIdx) {
 // directly to the C layer if queueing is disabled. If queueing is enabled and the
 // connections out is under the poolMax then the request will be completed immediately.
 // Otherwise the request will be queued and completed when a connection is avaialble.
-function getConnection(getConnectionCb) {
+function getConnection(a1, a2) {
   var self = this;
   var payload;
   var timeoutHandle;
   var timerIdx;
+  var getConnectionCb = arguments[arguments.length - 1];
+  var options = {};
 
-  nodbUtil.assert(arguments.length === 1, 'NJS-009');
-  nodbUtil.assert(typeof getConnectionCb === 'function', 'NJS-006', 1);
+  nodbUtil.assert(arguments.length >= 1 && arguments.length <= 2, 'NJS-009');
+  nodbUtil.assert(typeof getConnectionCb === 'function', 'NJS-006',
+    arguments.length);
+
+  // Optional JSON parameter
+  if (arguments.length > 1 ) {
+    options = arguments[0];
+    nodbUtil.assert(nodbUtil.isObject(options), 'NJS-006', 1 );
+  }
 
   // Added this check because if the pool isn't valid and we reference self.poolMax
   // (which is a C layer getter) an error will be thrown.
@@ -154,7 +164,7 @@ function getConnection(getConnectionCb) {
   }
 
   if (self.queueRequests === false) { // queueing is disabled for pool
-    self._getConnection(function(err, connInst) {
+    self._getConnection(options, function(err, connInst) {
       if (err) {
         if (self._enableStats) {
           self._totalFailedRequests += 1;
@@ -170,7 +180,7 @@ function getConnection(getConnectionCb) {
       getConnectionCb(null, connInst);
     });
   } else if (self._connectionsOut < self.poolMax) { // queueing enabled, but not needed
-    completeConnectionRequest.call(self, getConnectionCb);
+    completeConnectionRequest.call(self, options, getConnectionCb);
   } else { // need to queue the request
     if (self._usingQueueTimeout) {
       self._connRequestTimersIdx += 1;
@@ -187,7 +197,8 @@ function getConnection(getConnectionCb) {
     payload = {
       timerIdx: timerIdx,
       timeoutHandle: timeoutHandle,
-      getConnectionCb: getConnectionCb
+      getConnectionCb: getConnectionCb,
+      config : options
     };
 
     if (self._usingQueueTimeout) {

package/lib/querystream.js

@@ -48,7 +48,8 @@ function QueryStream(resultSet, oracledb) {
   );
 
   Readable.call(self, {
-    objectMode: true
+    objectMode: true,
+    emitClose: false // Prevents duplicate close events
   });
 
   // Check if QueryStream was created via ResultSet.toQueryStream() then the

package/lib/rel.txt

@@ -1 +1 @@
-57c1f83a4343c4db029b9df327b50deae3c9cf2c Thu 29 Mar 2018 08:05:42 UTC
+88e5d8dd1201e3d0244e8264cf1d0652b2be378e Tue  5 Jun 2018 07:13:28 UTC

package/odpi/README.md

@@ -1,4 +1,4 @@
-# ODPI-C version 2.3
+# ODPI-C version 2.4
 
 Oracle Database Programming Interface for C (ODPI-C) is an open source library
 of C code that simplifies access to Oracle Database for applications written in
@@ -39,7 +39,7 @@ See [CONTRIBUTING](https://github.com/oracle/odpi/blob/master/CONTRIBUTING.md).
 
 Oracle Drivers:
 * [cx_Oracle](https://oracle.github.io/python-cx_Oracle) Python interface.
-* [node-oracledb](https://github.com/oracle/node-oracledb/tree/dev-2.0) Node.js module.
+* [node-oracledb](https://oracle.github.io/node-oracledb) Node.js module.
 
 Third-party Drivers:
 * [go-goracle](https://gopkg.in/goracle.v2) Go Driver.

package/odpi/include/dpi.h

@@ -44,7 +44,7 @@
 
 // define ODPI-C version information
 #define DPI_MAJOR_VERSION   2
-#define DPI_MINOR_VERSION   3
+#define DPI_MINOR_VERSION   4
 #define DPI_PATCH_LEVEL     0
 #define DPI_VERSION_SUFFIX
 
@@ -159,7 +159,8 @@ typedef enum {
     DPI_EVENT_DROP_DB = 4,                      // OCI_EVENT_DROP_DB
     DPI_EVENT_DEREG = 5,                        // OCI_EVENT_DEREG
     DPI_EVENT_OBJCHANGE = 6,                    // OCI_EVENT_OBJCHANGE
-    DPI_EVENT_QUERYCHANGE = 7                   // OCI_EVENT_QUERYCHANGE
+    DPI_EVENT_QUERYCHANGE = 7,                  // OCI_EVENT_QUERYCHANGE
+    DPI_EVENT_AQ = 100
 } dpiEventType;
 
 // statement execution modes
@@ -268,7 +269,8 @@ typedef enum {
 typedef enum {
     DPI_MODE_POOL_GET_WAIT = 0,                 // OCI_SPOOL_ATTRVAL_WAIT
     DPI_MODE_POOL_GET_NOWAIT = 1,               // OCI_SPOOL_ATTRVAL_NOWAIT
-    DPI_MODE_POOL_GET_FORCEGET = 2              // OCI_SPOOL_ATTRVAL_FORCEGET
+    DPI_MODE_POOL_GET_FORCEGET = 2,             // OCI_SPOOL_ATTRVAL_FORCEGET
+    DPI_MODE_POOL_GET_TIMEDWAIT = 3             // OCI_SPOOL_ATTRVAL_TIMEDWAIT
 } dpiPoolGetMode;
 
 // purity values when acquiring a connection from a pool
@@ -314,9 +316,17 @@ typedef enum {
     DPI_STMT_TYPE_COMMIT = 21
 } dpiStatementType;
 
+// subscription grouping classes
+#define DPI_SUBSCR_GROUPING_CLASS_TIME          1
+
+// subscription grouping types
+#define DPI_SUBSCR_GROUPING_TYPE_SUMMARY        1
+#define DPI_SUBSCR_GROUPING_TYPE_LAST           2
+
 // subscription namespaces
 typedef enum {
-    DPI_SUBSCR_NAMESPACE_DBCHANGE = 2           // OCI_SUBSCR_NAMESPACE_DBCHANGE
+    DPI_SUBSCR_NAMESPACE_AQ = 1,              // OCI_SUBSCR_NAMESPACE_AQ
+    DPI_SUBSCR_NAMESPACE_DBCHANGE = 2         // OCI_SUBSCR_NAMESPACE_DBCHANGE
 } dpiSubscrNamespace;
 
 // subscription protocols
@@ -562,6 +572,9 @@ struct dpiPoolCreateParams {
     dpiPoolGetMode getMode;
     const char *outPoolName;
     uint32_t outPoolNameLength;
+    uint32_t timeout;
+    uint32_t waitTimeout;
+    uint32_t maxLifetimeSession;
 };
 
 // structure used for transferring query metadata from ODPI-C
@@ -606,6 +619,11 @@ struct dpiSubscrCreateParams {
     void *callbackContext;
     const char *recipientName;
     uint32_t recipientNameLength;
+    const char *ipAddress;
+    uint32_t ipAddressLength;
+    uint8_t groupingClass;
+    uint32_t groupingValue;
+    uint8_t groupingType;
 };
 
 // structure used for transferring messages in subscription callbacks
@@ -620,6 +638,11 @@ struct dpiSubscrMessage {
     dpiErrorInfo *errorInfo;
     const void *txId;
     uint32_t txIdLength;
+    int registered;
+    const char *queueName;
+    uint32_t queueNameLength;
+    const char *consumerName;
+    uint32_t consumerNameLength;
 };
 
 // structure used for transferring query information in messages in
@@ -853,6 +876,13 @@ int dpiConn_shutdownDatabase(dpiConn *conn, dpiShutdownMode mode);
 // startup the database
 int dpiConn_startupDatabase(dpiConn *conn, dpiStartupMode mode);
 
+// subscribe to events in the database
+int dpiConn_subscribe(dpiConn *conn, dpiSubscrCreateParams *params,
+        dpiSubscr **subscr);
+
+// unsubscribe from events in the database
+int dpiConn_unsubscribe(dpiConn *conn, dpiSubscr *subscr);
+
 
 //-----------------------------------------------------------------------------
 // Data Methods (dpiData)
@@ -1316,6 +1346,9 @@ int dpiPool_getStmtCacheSize(dpiPool *pool, uint32_t *cacheSize);
 // get the pool's timeout value
 int dpiPool_getTimeout(dpiPool *pool, uint32_t *value);
 
+// get the pool's wait timeout value
+int dpiPool_getWaitTimeout(dpiPool *pool, uint32_t *value);
+
 // release a reference to the pool
 int dpiPool_release(dpiPool *pool);
 
@@ -1331,6 +1364,9 @@ int dpiPool_setStmtCacheSize(dpiPool *pool, uint32_t cacheSize);
 // set the pool's timeout value
 int dpiPool_setTimeout(dpiPool *pool, uint32_t value);
 
+// set the pool's wait timeout value
+int dpiPool_setWaitTimeout(dpiPool *pool, uint32_t value);
+
 
 //-----------------------------------------------------------------------------
 // Statement Methods (dpiStmt)

package/odpi/src/dpiConn.c

@@ -416,7 +416,11 @@ static int dpiConn__get(dpiConn *conn, const char *userName,
         externalAuth = pool->externalAuth;
         if (userName && pool->homogeneous)
             return dpiError__set(error, "check proxy", DPI_ERR_INVALID_PROXY);
-        if (userName)
+
+        // if the userName is provided but no password is provided and external
+        // authentication is not being used, proxy authentication is taking
+        // place
+        if (userName && !password && !externalAuth)
             mode |= DPI_OCI_SESSGET_CREDPROXY;
         if (createParams->matchAnyTag)
             mode |= DPI_OCI_SESSGET_SPOOL_MATCHANY;
@@ -1168,7 +1172,6 @@ int dpiConn_create(const dpiContext *context, const char *userName,
     dpiCommonCreateParams localCommonParams;
     dpiConnCreateParams localCreateParams;
     dpiConn *tempConn;
-    size_t structSize;
     dpiError error;
     int status;
 
@@ -1187,10 +1190,10 @@ int dpiConn_create(const dpiContext *context, const char *userName,
         commonParams = &localCommonParams;
     }
     if (!createParams || context->dpiMinorVersion == 0) {
-        dpiContext__initConnCreateParams(context, &localCreateParams,
-                &structSize);
+        dpiContext__initConnCreateParams(&localCreateParams);
         if (createParams)
-            memcpy(&localCreateParams, createParams, structSize);
+            memcpy(&localCreateParams, createParams,
+                    sizeof(dpiConnCreateParams__v20));
         createParams = &localCreateParams;
     }
 
@@ -1942,3 +1945,59 @@ int dpiConn_startupDatabase(dpiConn *conn, dpiStartupMode mode)
     return dpiGen__endPublicFn(conn, status, &error);
 }
 
+//-----------------------------------------------------------------------------
+// dpiConn_subscribe() [PUBLIC]
+//   Subscribe to events in the database. A subscription is created and
+// returned. This replaces dpiConn_newSubscription().
+//-----------------------------------------------------------------------------
+int dpiConn_subscribe(dpiConn *conn, dpiSubscrCreateParams *params,
+        dpiSubscr **subscr)
+{
+    dpiSubscr *tempSubscr;
+    dpiError error;
+
+    if (dpiConn__checkConnected(conn, __func__, &error) < 0)
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
+    DPI_CHECK_PTR_NOT_NULL(conn, params)
+    DPI_CHECK_PTR_NOT_NULL(conn, subscr)
+    if (!conn->env->events) {
+        dpiError__set(&error, "subscribe", DPI_ERR_EVENTS_MODE_REQUIRED);
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
+    }
+    if (dpiGen__allocate(DPI_HTYPE_SUBSCR, conn->env, (void**) &tempSubscr,
+            &error) < 0)
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
+    if (dpiSubscr__create(tempSubscr, conn, params, NULL, &error) < 0) {
+        dpiSubscr__free(tempSubscr, &error);
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
+    }
+
+    *subscr = tempSubscr;
+    return dpiGen__endPublicFn(conn, DPI_SUCCESS, &error);
+}
+
+
+//-----------------------------------------------------------------------------
+// dpiConn_unsubscribe() [PUBLIC]
+//   Unsubscribe from events in the database. Once this call completes
+// successfully no further notifications will be sent.
+//-----------------------------------------------------------------------------
+int dpiConn_unsubscribe(dpiConn *conn, dpiSubscr *subscr)
+{
+    dpiError error;
+
+    if (dpiConn__checkConnected(conn, __func__, &error) < 0)
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
+    if (dpiGen__checkHandle(subscr, DPI_HTYPE_SUBSCR, "check subscription",
+            &error) < 0)
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
+    if (subscr->registered) {
+        if (dpiOci__subscriptionUnRegister(conn, subscr, &error) < 0)
+            return dpiGen__endPublicFn(subscr, DPI_FAILURE, &error);
+        subscr->registered = 0;
+    }
+
+    dpiGen__setRefCount(subscr, &error, -1);
+    return dpiGen__endPublicFn(subscr, DPI_SUCCESS, &error);
+}
+

package/odpi/src/dpiContext.c

@@ -77,13 +77,9 @@ void dpiContext__initCommonCreateParams(dpiCommonCreateParams *params)
 // the structure size as a convenience for calling functions which may have to
 // differentiate between different ODPI-C application versions.
 //-----------------------------------------------------------------------------
-void dpiContext__initConnCreateParams(const dpiContext *context,
-        dpiConnCreateParams *params, size_t *structSize)
+void dpiContext__initConnCreateParams(dpiConnCreateParams *params)
 {
-    *structSize = sizeof(dpiConnCreateParams);
-    if (context->dpiMinorVersion == 0)
-        *structSize = sizeof(dpiConnCreateParams__v20);
-    memset(params, 0, *structSize);
+    memset(params, 0, sizeof(dpiConnCreateParams));
 }
 
 
@@ -112,6 +108,7 @@ void dpiContext__initSubscrCreateParams(dpiSubscrCreateParams *params)
 {
     memset(params, 0, sizeof(dpiSubscrCreateParams));
     params->subscrNamespace = DPI_SUBSCR_NAMESPACE_DBCHANGE;
+    params->groupingType = DPI_SUBSCR_GROUPING_TYPE_SUMMARY;
 }
 
 
@@ -223,14 +220,19 @@ int dpiContext_initCommonCreateParams(const dpiContext *context,
 int dpiContext_initConnCreateParams(const dpiContext *context,
         dpiConnCreateParams *params)
 {
-    size_t structSize;
+    dpiConnCreateParams localParams;
     dpiError error;
 
     if (dpiGen__startPublicFn(context, DPI_HTYPE_CONTEXT, __func__, 0,
             &error) < 0)
         return dpiGen__endPublicFn(context, DPI_FAILURE, &error);
     DPI_CHECK_PTR_NOT_NULL(context, params)
-    dpiContext__initConnCreateParams(context, params, &structSize);
+    if (context->dpiMinorVersion > 0)
+        dpiContext__initConnCreateParams(params);
+    else {
+        dpiContext__initConnCreateParams(&localParams);
+        memcpy(params, &localParams, sizeof(dpiConnCreateParams__v20));
+    }
     return dpiGen__endPublicFn(context, DPI_SUCCESS, &error);
 }
 
@@ -242,13 +244,19 @@ int dpiContext_initConnCreateParams(const dpiContext *context,
 int dpiContext_initPoolCreateParams(const dpiContext *context,
         dpiPoolCreateParams *params)
 {
+    dpiPoolCreateParams localParams;
     dpiError error;
 
     if (dpiGen__startPublicFn(context, DPI_HTYPE_CONTEXT, __func__, 0,
             &error) < 0)
         return dpiGen__endPublicFn(context, DPI_FAILURE, &error);
     DPI_CHECK_PTR_NOT_NULL(context, params)
-    dpiContext__initPoolCreateParams(params);
+    if (context->dpiMinorVersion > 3)
+        dpiContext__initPoolCreateParams(params);
+    else {
+        dpiContext__initPoolCreateParams(&localParams);
+        memcpy(params, &localParams, sizeof(dpiPoolCreateParams__v23));
+    }
     return dpiGen__endPublicFn(context, DPI_SUCCESS, &error);
 }
 
@@ -260,13 +268,19 @@ int dpiContext_initPoolCreateParams(const dpiContext *context,
 int dpiContext_initSubscrCreateParams(const dpiContext *context,
         dpiSubscrCreateParams *params)
 {
+    dpiSubscrCreateParams localParams;
     dpiError error;
 
     if (dpiGen__startPublicFn(context, DPI_HTYPE_CONTEXT, __func__, 0,
             &error) < 0)
         return dpiGen__endPublicFn(context, DPI_FAILURE, &error);
     DPI_CHECK_PTR_NOT_NULL(context, params)
-    dpiContext__initSubscrCreateParams(params);
+    if (context->dpiMinorVersion > 3)
+        dpiContext__initSubscrCreateParams(params);
+    else {
+        dpiContext__initSubscrCreateParams(&localParams);
+        memcpy(params, &localParams, sizeof(dpiSubscrCreateParams__v23));
+    }
     return dpiGen__endPublicFn(context, DPI_SUCCESS, &error);
 }
 

package/odpi/src/dpiEnv.c

@@ -153,9 +153,13 @@ int dpiEnv__init(dpiEnv *env, const dpiContext *context,
         return DPI_FAILURE;
 
     // set whether or not we are threaded
-    if (params->createMode & DPI_OCI_THREADED)
+    if (params->createMode & DPI_MODE_CREATE_THREADED)
         env->threaded = 1;
 
+    // set whether or not events mode has been set
+    if (params->createMode & DPI_MODE_CREATE_EVENTS)
+        env->events = 1;
+
     return DPI_SUCCESS;
 }
 

package/odpi/src/dpiErrorMessages.h

@@ -76,5 +76,8 @@ static const char* const dpiErrorMessages[DPI_ERR_MAX - DPI_ERR_NO_ERR] = {
     "DPI-1060: subscription was already closed", // DPI_ERR_SUBSCR_CLOSED
     "DPI-1061: edition is not supported when a new password is specified", // DPI_ERR_NO_EDITION_WITH_NEW_PASSWORD
     "DPI-1062: unexpected OCI return value %d in function %s", // DPI_ERR_UNEXPECTED_OCI_RETURN_VALUE
+    "DPI-1063: modes DPI_MODE_EXEC_BATCH_ERRORS and DPI_MODE_EXEC_ARRAY_DML_ROWCOUNTS can only be used with insert, update, delete and merge statements", // DPI_ERR_EXEC_MODE_ONLY_FOR_DML
+    "DPI-1064: array variables are not supported with dpiStmt_executeMany()", // DPI_ERR_ARRAY_VAR_NOT_SUPPORTED
+    "DPI-1065: events mode is required to subscribe to events in the database", // DPI_ERR_EVENTS_MODE_REQUIRED
 };