oracledb 2.1.0 → 2.3.0

package/src/njsConnection.h

@@ -72,12 +72,13 @@ public:
     static Local<Value> GetMetaData(njsVariable *vars, uint32_t numVars,
             bool extendedMetaData);
     static bool GetScalarValueFromVar(njsBaton *baton, njsVariable *var,
-            uint32_t pos, Local<Value> &value);
+            njsVariableBuffer *buffer, uint32_t pos, Local<Value> &value);
+    static bool ProcessExecuteBinds(Local<Object> binds, njsBaton *baton);
     static bool ProcessQueryVars(njsBaton* baton, dpiStmt *dpiStmtHandle,
             njsVariable *vars, uint32_t numVars);
     static bool ProcessVars(njsBaton *baton, njsVariable *vars,
             uint32_t numVars, uint32_t numElements);
-    static void Init(Handle<Object> target);
+    static void Init(Local<Object> target);
     bool IsValid() const { return (dpiConnHandle) ? true : false; }
     njsErrorType GetInvalidErrorType() const { return errInvalidConnection; }
 
@@ -98,10 +99,21 @@ private:
     static void Async_Execute(njsBaton *baton);
     static void Async_AfterExecute(njsBaton *baton, Local<Value> argv[]);
 
-    // Release Method on Connection class
-    static NAN_METHOD(Release);
-    static void Async_Release(njsBaton *baton);
-    static void Async_AfterRelease(njsBaton *baton, Local<Value> argv[]);
+    // ExecuteMany Method on Connection class
+    static NAN_METHOD(ExecuteMany);
+    static void Async_ExecuteMany(njsBaton *baton);
+    static void Async_AfterExecuteMany(njsBaton *baton, Local<Value> argv[]);
+
+    // GetStatementInfo Method on Connection class
+    static NAN_METHOD(GetStatementInfo);
+    static void Async_GetStatementInfo(njsBaton *baton);
+    static void Async_AfterGetStatementInfo(njsBaton *baton,
+            Local<Value> argv[]);
+
+    // Close Method on Connection class
+    static NAN_METHOD(Close);
+    static void Async_Close(njsBaton *baton);
+    static void Async_AfterClose(njsBaton *baton, Local<Value> argv[]);
 
     // Commit Method on Connection class
     static NAN_METHOD(Commit);
@@ -120,12 +132,30 @@ private:
     static void Async_CreateLob(njsBaton *baton);
     static void Async_AfterCreateLob(njsBaton *baton, Local<Value> argv[]);
 
+    // ChangePassword Method on Connection class
+    static NAN_METHOD(ChangePassword);
+    static void Async_ChangePassword(njsBaton *baton);
+
+    // Ping Method on Connection class
+    static NAN_METHOD(Ping);
+    static void Async_Ping(njsBaton *baton);
+
+    // Subscribe Method on Connection class
+    static NAN_METHOD(Subscribe);
+    static void Async_Subscribe(njsBaton *baton);
+    static void Async_AfterSubscribe(njsBaton *baton, Local<Value> argv[]);
+
+    // Unsubscribe Method on Connection class
+    static NAN_METHOD(Unsubscribe);
+    static void Async_Unsubscribe(njsBaton *baton);
+
     // Define Getter Accessors to properties
     static NAN_GETTER(GetStmtCacheSize);
     static NAN_GETTER(GetClientId);
     static NAN_GETTER(GetModule);
     static NAN_GETTER(GetAction);
     static NAN_GETTER(GetOracleServerVersion);
+    static NAN_GETTER(GetOracleServerVersionString);
 
     // Define Setter Accessors to properties
     static NAN_SETTER(SetStmtCacheSize);
@@ -133,34 +163,53 @@ private:
     static NAN_SETTER(SetModule);
     static NAN_SETTER(SetAction);
     static NAN_SETTER(SetOracleServerVersion);
+    static NAN_SETTER(SetOracleServerVersionString);
 
     // internal methods
+    static bool CreateVarBuffer(njsVariable *var, njsBaton *baton);
     static bool GetBindTypeAndSizeFromValue(njsVariable *var,
-            Local<Value> value, uint32_t *bindType, uint32_t *maxSize,
+            Local<Value> value, njsDataType *bindType, uint32_t *maxSize,
             njsBaton *baton, bool scalarOnly = false);
-    static Local<Value> GetOutBinds(njsBaton *baton);
-    static bool GetValueFromVar(njsBaton *baton, njsVariable *var,
-            Local<Value> &value);
+    static bool GetExecuteOutBinds(Local<Value> &outBinds, njsBaton *baton);
+    static bool GetExecuteManyOutBinds(Local<Value> &outBinds,
+            uint32_t numOutBinds, njsBaton *baton);
+    static bool GetOutBinds(Local<Value> &outBinds, uint32_t numOutBinds,
+            uint32_t pos, njsBaton *baton);
+    static bool GetArrayValueFromVar(njsBaton *baton, njsVariable *var,
+            uint32_t pos, Local<Value> &value);
+    static bool InitBindVars(Local<Object> bindObj, Local<Array> bindNames,
+            njsBaton *baton);
     static bool MapByName(njsBaton *baton, dpiQueryInfo *queryInfo,
             dpiOracleTypeNum &targetType);
     static bool MapByType(njsBaton *baton, dpiQueryInfo *queryInfo,
             dpiOracleTypeNum &targetType);
     static bool PrepareAndBind(njsBaton* baton);
-    static bool ProcessBinds(Nan::NAN_METHOD_ARGS_TYPE args,
-            unsigned int index, njsBaton *baton);
-    static bool ProcessBindsByName(Handle<Object> bindObj, njsBaton *baton);
-    static bool ProcessBindsByPos(Handle<Array> bindarray, njsBaton *baton);
-    static bool ProcessBind(Local<Value> bindTypes, njsVariable *var,
-            bool byPosition, njsBaton *baton);
     static bool ProcessBindValue(Local<Value> bindValue, njsVariable *var,
             njsBaton *baton);
+    static bool ProcessExecuteManyBinds(Local<Array> binds,
+            Local<Object> options, njsBaton *baton);
+    static bool ProcessExecuteOptions(Local<Object> options, njsBaton *baton);
+    static bool ProcessExecuteManyOptions(Local<Object> options,
+            njsBaton *baton);
     static bool ProcessScalarBindValue(Local<Value> bindValue,
-            njsVariable *var, uint32_t pos, njsBaton *baton);
-    static bool ProcessOptions(Nan::NAN_METHOD_ARGS_TYPE args,
-            unsigned int index, njsBaton *baton);
+            njsVariable *var, uint32_t pos, bool inExecuteMany,
+            njsBaton *baton);
+    static bool ProcessSubscriptionOptions(Local<Object> options,
+            njsBaton *baton);
+    static bool ProcessVarBuffer(njsBaton *baton, njsVariable *var,
+            njsVariableBuffer *buffer);
+    static bool ScanExecuteBinds(Local<Object> binds, Local<Array> bindNames,
+            njsBaton *baton);
+    static bool ScanExecuteBindUnit(Local<Object> bindUnit, njsVariable *var,
+            bool inExecuteMany, njsBaton *baton);
+    static bool ScanExecuteManyBinds(Local<Array> binds,
+            Local<Array> bindNames, njsBaton *baton);
     static void SetTextAttribute(Nan::NAN_SETTER_ARGS_TYPE args,
             const char *attributeName, Local<Value> value,
             int (*setter)(dpiConn*, const char*, uint32_t));
+    static bool TransferExecuteManyBinds(Local<Array> binds,
+            Local<Array> bindNames, njsBaton *baton);
+
     static Nan::Persistent<FunctionTemplate> connectionTemplate_s;
 
     dpiConn *dpiConnHandle;

package/src/njsIntLob.cpp

@@ -70,7 +70,7 @@ Nan::Persistent<FunctionTemplate> njsILob::iLobTemplate_s;
 //   Initialization function of ILob class. Maps functions and properties from
 // JS to C++.
 //-----------------------------------------------------------------------------
-void njsILob::Init(Handle<Object> target)
+void njsILob::Init(Local<Object> target)
 {
     Nan::HandleScope scope;
 
@@ -189,6 +189,10 @@ bool njsILob::ClearDPILobHandle(njsBaton *baton)
         baton->GetDPIError();
         return false;
     }
+    if (dpiLob_release(dpiLobHandle) < 0) {
+        baton->GetDPIError();
+        return false;
+    }
     dpiLobHandle = NULL;
     return true;
 }

package/src/njsIntLob.h

@@ -102,7 +102,7 @@ protected:
 //-----------------------------------------------------------------------------
 class njsILob : public njsCommon {
 public:
-    static void Init(Handle<Object> target);
+    static void Init(Local<Object> target);
     static Local<Object> CreateFromProtoLob(njsProtoILob *protoLob);
     bool IsValid() const { return (dpiLobHandle) ? true : false; }
     njsErrorType GetInvalidErrorType() const { return errInvalidLob; }

package/src/njsMessages.cpp

@@ -55,7 +55,6 @@ static const char *errMsg[] = {
     "NJS-017: concurrent operations on ResultSet are not allowed", // errBusyResultSet
     "NJS-018: invalid ResultSet",                   // errInvalidResultSet
     "NJS-019: ResultSet cannot be returned for non-query statements", // errInvalidNonQueryExecution
-    "NJS-020: empty array was specified to fetch values as string", // errEmptyArrayForFetchAs
     "NJS-021: invalid type for conversion specified", // errInvalidTypeForConversion
     "NJS-022: invalid Lob",                           // errInvalidLob
     "NJS-023: concurrent operations on LOB are not allowed",  // errBusyLob
@@ -63,7 +62,6 @@ static const char *errMsg[] = {
     "NJS-025: overflow when calculating results area size", // errResultsTooLarge
     "NJS-026: maxRows must be greater than zero",   // errInvalidmaxRows
     "NJS-027: unexpected SQL parsing error",        // errSQLSyntaxError
-    "NJS-028: raw database type is not supported with DML Returning statements", // errBufferReturningInvalid
     "NJS-029: invalid object from JavaScript",      // errInvalidJSObject
     "NJS-030: connection cannot be released because Lob operations are in progress",  // errBusyConnLOB
     "NJS-031: connection cannot be released because ResultSet operations are in progress", // errBusyConnRS
@@ -85,6 +83,15 @@ static const char *errMsg[] = {
     "NJS-052: invalid data type at array index %d for bind position %d", // errIncompatibleTypeArrayIndexBind
     "NJS-053: array value expected, a non-array value provided", //errNonArrayProvided
     "NJS-054: Binary build/Release/oracledb.node was not installed from %s", // errNoBinaryInstalled
+    "NJS-055: Binding by position and name cannot be mixed", // errMixedBind
+    "NJS-056: maxSize must be specified and not zero for bind position %u", // errMissingMaxSizeByPos
+    "NJS-057: maxSize must be specified and not zero for bind \"%s\"", // errMissingMaxSizeByName
+    "NJS-058: maxSize of %u is too small for value of length %u in row %u", // errMaxSizeTooSmall
+    "NJS-059: type must be specified for bind position %u", // errMissingTypeByPos
+    "NJS-060: type must be specified for bind \"%s\"", // errMissingTypeByName
+    "NJS-061: invalid subscription", // errInvalidSubscription
+    "NJS-062: subscription notification callback missing", // errMissingSubscrCallback
+    "NJS-063: subscription notification SQL missing", // errMissingSubscrSql
 };
 
 

package/src/njsMessages.h

@@ -58,7 +58,6 @@ typedef enum {
     errBusyResultSet,
     errInvalidResultSet,
     errInvalidNonQueryExecution,
-    errEmptyArrayForFetchAs,
     errInvalidTypeForConversion,
     errInvalidLob,
     errBusyLob,
@@ -66,7 +65,6 @@ typedef enum {
     errResultsTooLarge,
     errInvalidmaxRows,
     errSQLSyntaxError,
-    errBufferReturningInvalid,
     errInvalidJSObject,
     errBusyConnLOB,
     errBusyConnRS,
@@ -88,6 +86,15 @@ typedef enum {
     errIncompatibleTypeArrayIndexBind,
     errNonArrayProvided,
     errNoBinaryInstalled,
+    errMixedBind,
+    errMissingMaxSizeByPos,
+    errMissingMaxSizeByName,
+    errMaxSizeTooSmall,
+    errMissingTypeByPos,
+    errMissingTypeByName,
+    errInvalidSubscription,
+    errMissingSubscrCallback,
+    errMissingSubscrSql,
 
     // New ones should be added here
 

package/src/njsOracle.cpp

@@ -56,17 +56,18 @@
 #include "njsResultSet.h"
 #include "njsMessages.h"
 #include "njsIntLob.h"
+#include "njsSubscription.h"
 #include <sstream>
 
 // peristent Oracledb class handle
 Nan::Persistent<FunctionTemplate> njsOracledb::oracledbTemplate_s;
 
+// persistent handle for subscriptions
+Nan::Persistent<Object> njsOracledb::subscriptions;
+
 // DPI context
 dpiContext *njsOracledb::globalDPIContext = NULL;
 
-// common pool/standalone connection creation parameters (fixed)
-dpiCommonCreateParams njsCommonCreateParams;
-
 
 //-----------------------------------------------------------------------------
 // njsOracledb::njsOracledb()
@@ -85,10 +86,12 @@ njsOracledb::njsOracledb()
     poolTimeout             = NJS_POOL_TIMEOUT;
     fetchArraySize          = DPI_DEFAULT_FETCH_ARRAY_SIZE;
     connClass               = "";
+    edition                 = "";
     externalAuth            = false;
     lobPrefetchSize         = NJS_LOB_PREFETCH_SIZE;
     poolPingInterval        = NJS_POOL_DEFAULT_PING_INTERVAL;
     oraClientVer            = 0;
+    events                  = false;
 }
 
 
@@ -96,7 +99,7 @@ njsOracledb::njsOracledb()
 // njsOracledb::Init()
 //   Initialization function. Maps functions and properties from JS to C++.
 //-----------------------------------------------------------------------------
-void njsOracledb::Init(Handle<Object> target)
+void njsOracledb::Init(Local<Object> target)
 {
     Nan::HandleScope scope;
     dpiErrorInfo errorInfo;
@@ -108,20 +111,6 @@ void njsOracledb::Init(Handle<Object> target)
         return;
     }
 
-    // initialize common creation parameters for pools/standalone connections
-    if (dpiContext_initCommonCreateParams(globalDPIContext,
-            &njsCommonCreateParams) < 0) {
-        dpiContext_getError(globalDPIContext, &errorInfo);
-        Nan::ThrowError(errorInfo.message);
-        return;
-    }
-    njsCommonCreateParams.createMode = DPI_MODE_CREATE_THREADED;
-    njsCommonCreateParams.encoding = "UTF-8";
-    njsCommonCreateParams.nencoding = "UTF-8";
-    njsCommonCreateParams.driverName = NJS_DRIVER_NAME;
-    njsCommonCreateParams.driverNameLength =
-            (uint32_t) strlen(njsCommonCreateParams.driverName);
-
     Local<FunctionTemplate> temp = Nan::New<FunctionTemplate>(New);
     temp->InstanceTemplate()->SetInternalFieldCount(1);
     temp->SetClassName(Nan::New<v8::String>("Oracledb").ToLocalChecked());
@@ -172,6 +161,9 @@ void njsOracledb::Init(Handle<Object> target)
     Nan::SetAccessor(temp->InstanceTemplate(),
             Nan::New<v8::String>("connectionClass").ToLocalChecked(),
             njsOracledb::GetConnectionClass, njsOracledb::SetConnectionClass);
+    Nan::SetAccessor(temp->InstanceTemplate(),
+            Nan::New<v8::String>("edition").ToLocalChecked(),
+            njsOracledb::GetEdition, njsOracledb::SetEdition);
     Nan::SetAccessor(temp->InstanceTemplate(),
             Nan::New<v8::String>("externalAuth").ToLocalChecked(),
             njsOracledb::GetExternalAuth, njsOracledb::SetExternalAuth);
@@ -188,14 +180,24 @@ void njsOracledb::Init(Handle<Object> target)
             Nan::New<v8::String>("oracleClientVersion").ToLocalChecked(),
             njsOracledb::GetOracleClientVersion,
             njsOracledb::SetOracleClientVersion);
+    Nan::SetAccessor(temp->InstanceTemplate (),
+            Nan::New<v8::String>("oracleClientVersionString").ToLocalChecked(),
+            njsOracledb::GetOracleClientVersionString,
+            njsOracledb::SetOracleClientVersionString);
     Nan::SetAccessor(temp->InstanceTemplate (),
             Nan::New<v8::String>("poolPingInterval").ToLocalChecked(),
             njsOracledb::GetPoolPingInterval,
             njsOracledb::SetPoolPingInterval);
+    Nan::SetAccessor(temp->InstanceTemplate (),
+            Nan::New<v8::String>("events").ToLocalChecked(),
+            njsOracledb::GetEvents, njsOracledb::SetEvents);
 
     oracledbTemplate_s.Reset(temp);
     Nan::Set(target, Nan::New<v8::String>("Oracledb").ToLocalChecked(),
             temp->GetFunction());
+
+    Local<Object> obj = Nan::New<v8::Object>();
+    subscriptions.Reset(obj);
 }
 
 
@@ -223,6 +225,30 @@ NAN_METHOD(njsOracledb::New)
 }
 
 
+//-----------------------------------------------------------------------------
+// njsOracledb::InitCommonCreateParams()
+//   Initialize common creation parameters for pools and standalone
+// connection creation.
+//-----------------------------------------------------------------------------
+bool njsOracledb::InitCommonCreateParams(njsBaton *baton,
+        dpiCommonCreateParams *params)
+{
+    if (dpiContext_initCommonCreateParams(globalDPIContext, params) < 0) {
+        baton->GetDPIError();
+        return false;
+    }
+    params->createMode = DPI_MODE_CREATE_THREADED;
+    if (baton->events)
+        params->createMode = (dpiCreateMode)
+                ((int) params->createMode | DPI_MODE_CREATE_EVENTS);
+    params->encoding = "UTF-8";
+    params->nencoding = "UTF-8";
+    params->driverName = NJS_DRIVER_NAME;
+    params->driverNameLength = (uint32_t) strlen(params->driverName);
+    return true;
+}
+
+
 //-----------------------------------------------------------------------------
 // njsOracledb::GetPoolMin()
 //   Get accessor of "poolMin" property.
@@ -589,6 +615,32 @@ NAN_SETTER(njsOracledb::SetConnectionClass)
                 "connectionClass");
 }
 
+//-----------------------------------------------------------------------------
+// njsOracledb::GetEdition()
+//   Get accessor of "edition" property.
+//-----------------------------------------------------------------------------
+NAN_GETTER(njsOracledb::GetEdition)
+{
+    njsOracledb *oracledb = (njsOracledb*) ValidateGetter(info);
+    if (!oracledb)
+        return;
+    Local<String> value =
+            Nan::New<v8::String>(oracledb->edition).ToLocalChecked();
+    info.GetReturnValue().Set(value);
+}
+
+//-----------------------------------------------------------------------------
+// njsOracledb::SetEdition()
+//   Set accessor of "edition" property.
+//-----------------------------------------------------------------------------
+NAN_SETTER(njsOracledb::SetEdition)
+{
+    njsOracledb *oracledb = (njsOracledb*) ValidateSetter(info);
+    if (oracledb)
+        oracledb->SetPropString(value, &oracledb->edition,
+                "edition");
+}
+
 
 //-----------------------------------------------------------------------------
 // njsOracledb::GetExternalAuth()
@@ -684,6 +736,7 @@ NAN_SETTER(njsOracledb::SetFetchAsString)
         switch (type) {
             case NJS_DATATYPE_NUM:
             case NJS_DATATYPE_DATE:
+            case NJS_DATATYPE_BUFFER:
             case NJS_DATATYPE_CLOB:
                 break;
             default:
@@ -792,6 +845,66 @@ NAN_SETTER(njsOracledb::SetOracleClientVersion)
 }
 
 
+//-----------------------------------------------------------------------------
+// njsOracledb::GetOracleClientVersionString()
+//   Get accessor of "oracleClientVersionString" property.
+//-----------------------------------------------------------------------------
+NAN_GETTER(njsOracledb::GetOracleClientVersionString)
+{
+    dpiVersionInfo versionInfo;
+    char versionString[40];
+    Local<String> value;
+
+    njsOracledb *oracledb = (njsOracledb*) ValidateGetter(info);
+    if (!oracledb)
+        return;
+
+    if (dpiContext_getClientVersion(globalDPIContext, &versionInfo) < 0) {
+        ThrowDPIError();
+        return;
+    }
+
+    (void) sprintf(versionString, "%d.%d.%d.%d.%d", versionInfo.versionNum,
+            versionInfo.releaseNum, versionInfo.updateNum,
+            versionInfo.portReleaseNum, versionInfo.portUpdateNum);
+    value = Nan::New<v8::String>(versionString).ToLocalChecked();
+    info.GetReturnValue().Set(value);
+}
+
+
+//-----------------------------------------------------------------------------
+// njsOracledb::SetOracleClientVersionString()
+//   Set accessor of "oracleClientVersionString" property.
+//-----------------------------------------------------------------------------
+NAN_SETTER(njsOracledb::SetOracleClientVersionString)
+{
+    PropertyIsReadOnly("oracleClientVersionString");
+}
+
+
+// njsOracledb::GetEvents()
+//   Get accessor of "events" property.
+//-----------------------------------------------------------------------------
+NAN_GETTER(njsOracledb::GetEvents)
+{
+    njsOracledb *oracledb = (njsOracledb*) ValidateGetter(info);
+    if (oracledb)
+        info.GetReturnValue().Set(oracledb->events);
+}
+
+
+//-----------------------------------------------------------------------------
+// njsOracledb::SetEvents()
+//   Set accessor of "events" property.
+//-----------------------------------------------------------------------------
+NAN_SETTER(njsOracledb::SetEvents)
+{
+    njsOracledb *oracledb = (njsOracledb*) ValidateSetter(info);
+    if (oracledb)
+        oracledb->SetPropBool(value, &oracledb->events, "events");
+}
+
+
 //-----------------------------------------------------------------------------
 // njsOracledb::GetConnection()
 //   Establishes a standalone connection to the database using the parameters
@@ -821,14 +934,19 @@ NAN_METHOD(njsOracledb::GetConnection)
     baton->GetStringFromJSON(connProps, "password", 0, baton->password);
     baton->GetStringFromJSON(connProps, "connectString", 0,
             baton->connectString);
+    baton->GetStringFromJSON(connProps, "newPassword", 0, baton->newPassword);
     baton->connClass = oracledb->connClass;
+    baton->edition = oracledb->edition;
     baton->stmtCacheSize  = oracledb->stmtCacheSize;
     baton->externalAuth = oracledb->externalAuth;
+    baton->events = oracledb->events;
+    baton->GetStringFromJSON(connProps, "edition", 0, baton->edition);
     baton->GetUnsignedIntFromJSON(connProps, "stmtCacheSize", 0,
             &baton->stmtCacheSize);
     baton->GetUnsignedIntFromJSON(connProps, "privilege", 0,
             &baton->privilege);
     baton->GetBoolFromJSON(connProps, "externalAuth", 0, &baton->externalAuth);
+    baton->GetBoolFromJSON(connProps, "events", 0, &baton->events);
     baton->lobPrefetchSize = oracledb->lobPrefetchSize;
 
     baton->QueueWork("GetConnection", Async_GetConnection,
@@ -843,6 +961,7 @@ NAN_METHOD(njsOracledb::GetConnection)
 //-----------------------------------------------------------------------------
 void njsOracledb::Async_GetConnection(njsBaton *baton)
 {
+    dpiCommonCreateParams commonParams;
     dpiConnCreateParams params;
 
     if (dpiContext_initConnCreateParams(globalDPIContext, &params) < 0) {
@@ -856,11 +975,23 @@ void njsOracledb::Async_GetConnection(njsBaton *baton)
         params.connectionClass = baton->connClass.c_str();
         params.connectionClassLength = baton->connClass.length();
     }
+
+    if(!baton->newPassword.empty()) {
+        params.newPassword = baton->newPassword.c_str();
+        params.newPasswordLength = baton->newPassword.length();
+    }
+    if (!InitCommonCreateParams(baton, &commonParams))
+        return;
+    if (!baton->edition.empty()) {
+        commonParams.edition = baton->edition.c_str();
+        commonParams.editionLength = baton->edition.length();
+    }
+
     if (dpiConn_create(globalDPIContext, baton->user.c_str(),
             (uint32_t) baton->user.length(), baton->password.c_str(),
             (uint32_t) baton->password.length(), baton->connectString.c_str(),
-            (uint32_t) baton->connectString.length(), &njsCommonCreateParams,
-            &params, &baton->dpiConnHandle) < 0)
+            (uint32_t) baton->connectString.length(), &commonParams, &params,
+            &baton->dpiConnHandle) < 0)
         baton->GetDPIError();
     else if (dpiConn_setStmtCacheSize(baton->dpiConnHandle,
             baton->stmtCacheSize) < 0)
@@ -916,6 +1047,8 @@ NAN_METHOD(njsOracledb::CreatePool)
     baton->poolPingInterval = oracledb->poolPingInterval;
     baton->stmtCacheSize = oracledb->stmtCacheSize;
     baton->externalAuth = oracledb->externalAuth;
+    baton->edition = oracledb->edition;
+    baton->events = oracledb->events;
     baton->GetUnsignedIntFromJSON(poolProps, "poolMax", 0, &baton->poolMax);
     baton->GetUnsignedIntFromJSON(poolProps, "poolMin", 0, &baton->poolMin);
     baton->GetUnsignedIntFromJSON(poolProps, "poolIncrement", 0,
@@ -927,6 +1060,9 @@ NAN_METHOD(njsOracledb::CreatePool)
     baton->GetIntFromJSON(poolProps, "poolPingInterval", 0,
             &baton->poolPingInterval);
     baton->GetBoolFromJSON(poolProps, "externalAuth", 0, &baton->externalAuth);
+    baton->GetBoolFromJSON(poolProps, "homogeneous", 0, &baton->homogeneous);
+    baton->GetBoolFromJSON(poolProps, "events", 0, &baton->events);
+    baton->GetStringFromJSON(poolProps, "edition", 0, baton->edition);
     baton->lobPrefetchSize = oracledb->lobPrefetchSize;
     baton->jsOracledb.Reset(info.Holder());
 
@@ -941,6 +1077,7 @@ NAN_METHOD(njsOracledb::CreatePool)
 //-----------------------------------------------------------------------------
 void njsOracledb::Async_CreatePool(njsBaton *baton)
 {
+    dpiCommonCreateParams commonParams;
     dpiPoolCreateParams params;
 
     if (dpiContext_initPoolCreateParams(globalDPIContext, &params) < 0) {
@@ -951,14 +1088,22 @@ void njsOracledb::Async_CreatePool(njsBaton *baton)
     params.maxSessions = baton->poolMax;
     params.sessionIncrement = baton->poolIncrement;
     params.externalAuth = baton->externalAuth;
+    params.homogeneous = baton->homogeneous;
+
     if (params.externalAuth)
         params.homogeneous = 0;
     params.pingInterval = baton->poolPingInterval;
+    if (!InitCommonCreateParams(baton, &commonParams))
+        return;
+    if (!baton->edition.empty()) {
+        commonParams.edition = baton->edition.c_str();
+        commonParams.editionLength = baton->edition.length();
+    }
     if (dpiPool_create(globalDPIContext, baton->user.c_str(),
             (uint32_t) baton->user.length(), baton->password.c_str(),
             (uint32_t) baton->password.length(), baton->connectString.c_str(),
-            (uint32_t) baton->connectString.length(), &njsCommonCreateParams,
-            &params, &baton->dpiPoolHandle) < 0)
+            (uint32_t) baton->connectString.length(), &commonParams, &params,
+            &baton->dpiPoolHandle) < 0)
         baton->GetDPIError();
     else if (dpiPool_setTimeout(baton->dpiPoolHandle, baton->poolTimeout) < 0)
         baton->GetDPIError();
@@ -1049,19 +1194,64 @@ void njsOracledb::ThrowDPIError(void)
 }
 
 
+//-----------------------------------------------------------------------------
+// njsOracledb::GetSubscription()
+//   Gets the subscription with the give name if it exists, or returns NULL if
+// it does not exist in the subscriptions object.
+//-----------------------------------------------------------------------------
+njsSubscription *njsOracledb::GetSubscription(std::string &name)
+{
+    Nan::HandleScope scope;
+    Local<String> nameObj = Nan::New<String>(name).ToLocalChecked();
+    Local<Object> allSubscriptions = Nan::New(subscriptions);
+    Local<Value> value = Nan::Get(allSubscriptions, nameObj).ToLocalChecked();
+    if (value->IsUndefined())
+        return NULL;
+    return Nan::ObjectWrap::Unwrap<njsSubscription>(value.As<Object>());
+}
+
+
+//-----------------------------------------------------------------------------
+// njsOracledb::SetSubscription()
+//   Sets the subscription in the subscriptions object for later recovery,
+// either to subscribe another query or to unsubscribe.
+//-----------------------------------------------------------------------------
+void njsOracledb::SetSubscription(std::string &name, Local<Value> subscription)
+{
+    Nan::HandleScope scope;
+    Local<String> nameObj = Nan::New<String>(name).ToLocalChecked();
+    Local<Object> allSubscriptions = Nan::New(subscriptions);
+    Nan::Set(allSubscriptions, nameObj, subscription);
+}
+
+
+//-----------------------------------------------------------------------------
+// njsOracledb::ClearSubscription()
+//   Clears the subscription from the subscriptions object.
+//-----------------------------------------------------------------------------
+void njsOracledb::ClearSubscription(std::string &name)
+{
+    Nan::HandleScope scope;
+    Local<String> nameObj = Nan::New<String>(name).ToLocalChecked();
+    Local<Object> allSubscriptions = Nan::New(subscriptions);
+    Nan::Delete(allSubscriptions, nameObj);
+}
+
+
 //-----------------------------------------------------------------------------
 // init()
 //   Invoked when require on oracledb is called.
 //-----------------------------------------------------------------------------
 extern "C"
 {
-    static void init(Handle<Object> target)
+    static void init(Local<Object> target)
     {
         njsOracledb::Init(target);
         njsConnection::Init(target);
         njsPool::Init(target);
         njsResultSet::Init(target);
         njsILob::Init(target);
+        njsSubscription::Init(target);
     }
 
     NODE_MODULE(oracledb, init)