oracledb 2.1.0 → 2.3.0

package/src/njsCommon.h

@@ -72,17 +72,17 @@ using namespace node;
 class njsBaton;
 class njsOracledb;
 class njsProtoILob;
+class njsSubscription;
 
 //-----------------------------------------------------------------------------
-// njsBindType
-//   User defined bind types.
+// njsBindDir
+//   User defined bind directions.
 //-----------------------------------------------------------------------------
 typedef enum {
-    NJS_BIND_UNKNOWN  = -1,
     NJS_BIND_IN       = 3001,
     NJS_BIND_INOUT    = 3002,
     NJS_BIND_OUT      = 3003
-} njsBindType;
+} njsBindDir;
 
 
 //-----------------------------------------------------------------------------
@@ -90,7 +90,6 @@ typedef enum {
 //   Values used for "outFormat".
 //-----------------------------------------------------------------------------
 typedef enum {
-    NJS_ROWS_UNKNOWN  = -1,
     NJS_ROWS_ARRAY    = 4001,
     NJS_ROWS_OBJECT   = 4002
 } njsRowsType;
@@ -144,9 +143,24 @@ typedef enum {
 } njsDBType;
 
 
+//-----------------------------------------------------------------------------
+// njsVariableBuffer
+//   Class used for keeping track of ODPI-C buffers and proto ILob objects.
+//-----------------------------------------------------------------------------
+class njsVariableBuffer {
+public:
+    uint32_t numElements;
+    dpiData *dpiVarData;
+    njsProtoILob *lobs;
+
+    njsVariableBuffer() : numElements(0), dpiVarData(NULL), lobs(NULL) {}
+    ~njsVariableBuffer();
+};
+
+
 //-----------------------------------------------------------------------------
 // njsVariable
-//   Class used for keeping track of variables used for fetching data.
+//   Class used for keeping track of variables used for binding/fetching data.
 //-----------------------------------------------------------------------------
 class njsVariable {
 public:
@@ -156,8 +170,8 @@ public:
     dpiOracleTypeNum varTypeNum;
     dpiNativeTypeNum nativeTypeNum;
     dpiVar *dpiVarHandle;
-    dpiData *dpiVarData;
-    uint32_t bindDir;
+    njsBindDir bindDir;
+    njsDataType bindDataType;
     uint32_t maxArraySize;
     uint32_t maxSize;
     uint32_t dbSizeInBytes;
@@ -165,16 +179,18 @@ public:
     int8_t scale;
     bool isArray;
     bool isNullable;
-    njsProtoILob *lobs;
+    njsVariableBuffer buffer;
+    njsVariableBuffer* dmlReturningBuffers;
     uint32_t numQueryVars;
     njsVariable *queryVars;
 
     njsVariable() : pos(0), dbTypeNum(DPI_ORACLE_TYPE_VARCHAR),
             varTypeNum(DPI_ORACLE_TYPE_VARCHAR),
             nativeTypeNum(DPI_NATIVE_TYPE_BYTES), dpiVarHandle(NULL),
-            dpiVarData(NULL), bindDir(0), maxArraySize(0), maxSize(0),
-            dbSizeInBytes(0), precision(0), scale(0), isArray(false),
-            isNullable(false), lobs(NULL), numQueryVars(0), queryVars(NULL) {}
+            bindDir(NJS_BIND_IN), bindDataType(NJS_DATATYPE_DEFAULT),
+            maxArraySize(0), maxSize(0), dbSizeInBytes(0), precision(0),
+            scale(0), isArray(false), isNullable(false),
+            dmlReturningBuffers(NULL), numQueryVars(0), queryVars(NULL) {}
     ~njsVariable();
     njsDataType DataType();
     njsDBType DBType();
@@ -248,8 +264,12 @@ public:
     std::string sql;
     std::string user;
     std::string password;
+    std::string newPassword;
     std::string connectString;
     std::string connClass;
+    std::string edition;
+    std::string ipAddress;
+    std::string name;
     uint32_t poolMin;
     uint32_t poolMax;
     uint32_t poolIncrement;
@@ -259,9 +279,12 @@ public:
     dpiConn *dpiConnHandle;
     dpiStmt *dpiStmtHandle;
     dpiLob *dpiLobHandle;
+    dpiSubscr *dpiSubscrHandle;
+    dpiStmtInfo stmtInfo;
     uint32_t stmtCacheSize;
     uint32_t lobPrefetchSize;
     uint32_t maxRows;
+    uint32_t bindArraySize;
     uint32_t fetchArraySize;
     uint32_t privilege;
     uint32_t rowsFetched;
@@ -280,36 +303,59 @@ public:
     njsDataType *fetchAsBufferTypes;
     njsProtoILob *protoILob;
     bool externalAuth;
+    bool homogeneous;                 // True: one user, false: multiple user
     bool getRS;
     bool autoCommit;
     bool extendedMetaData;
     bool isReturning;
     bool isPLSQL;
+    bool events;
+    bool batchErrors;
+    bool dmlRowCounts;
     uint64_t bufferSize;
     char *bufferPtr;
     uint64_t lobOffset;
     uint64_t lobAmount;
+    uint32_t numRowCounts;
+    uint64_t *rowCounts;
+    uint32_t timeout;
+    uint32_t qos;
+    uint32_t operations;
+    uint32_t numBatchErrorInfos;
+    dpiErrorInfo *batchErrorInfos;
     dpiErrorInfo errorInfo;
     bool dpiError;
+    uint32_t portNumber;
+    uint32_t subscrGroupingClass;
+    uint32_t subscrGroupingValue;
+    uint32_t subscrGroupingType;
+    njsSubscription *subscription;
     njsCommon *callingObj;
     Nan::Persistent<Object> jsCallingObj;
     Nan::Persistent<Object> jsOracledb;
     Nan::Persistent<Object> jsBuffer;
+    Nan::Persistent<Object> jsSubscription;
     Nan::Persistent<Function> jsCallback;
 
     njsBaton(Local<Function> callback, Local<Object> callingObj) :
             poolMin(0), poolMax(0), poolIncrement(0), poolTimeout(0),
             poolPingInterval(0), dpiPoolHandle(NULL), dpiConnHandle(NULL),
-            dpiStmtHandle(NULL), dpiLobHandle(NULL), stmtCacheSize(0),
-            lobPrefetchSize(0), maxRows(0), fetchArraySize(0), privilege(0),
-            rowsFetched(0), bufferRowIndex(0), rowsAffected(0), outFormat(0),
-            numQueryVars(0), queryVars(NULL), numBindVars(0), bindVars(NULL),
-            numFetchInfo(0), fetchInfo(NULL), numFetchAsStringTypes(0),
-            fetchAsStringTypes(NULL), numFetchAsBufferTypes(0),
-            fetchAsBufferTypes(NULL), protoILob(NULL), externalAuth(false),
+            dpiStmtHandle(NULL), dpiLobHandle(NULL), dpiSubscrHandle(NULL),
+            stmtCacheSize(0), lobPrefetchSize(0), maxRows(0), bindArraySize(1),
+            fetchArraySize(0), privilege(0), rowsFetched(0), bufferRowIndex(0),
+            rowsAffected(0), outFormat(0), numQueryVars(0), queryVars(NULL),
+            numBindVars(0), bindVars(NULL), numFetchInfo(0), fetchInfo(NULL),
+            numFetchAsStringTypes(0), fetchAsStringTypes(NULL),
+            numFetchAsBufferTypes(0), fetchAsBufferTypes(NULL),
+            protoILob(NULL), externalAuth(false), homogeneous(true),
             getRS(false), autoCommit(false), extendedMetaData(false),
-            isReturning(false), isPLSQL(false), bufferSize(0), bufferPtr(NULL),
-            lobOffset(0), lobAmount(0), dpiError(false) {
+            isReturning(false), isPLSQL(false), events(false),
+            batchErrors(false), dmlRowCounts(false), bufferSize(0),
+            bufferPtr(NULL), lobOffset(0), lobAmount(0), numRowCounts(0),
+            rowCounts(NULL), timeout(0), qos(0), operations(0),
+            numBatchErrorInfos(0), batchErrorInfos(NULL), dpiError(false),
+            portNumber(0), subscrGroupingClass(0), subscrGroupingValue(0),
+            subscrGroupingType(0), subscription(NULL) {
         this->jsCallback.Reset(callback);
         this->jsCallingObj.Reset(callingObj);
         this->callingObj = Nan::ObjectWrap::Unwrap<njsCommon>(callingObj);
@@ -334,10 +380,13 @@ public:
     void SetDPIPoolHandle(dpiPool *handle);
     void SetDPIStmtHandle(dpiStmt *handle);
     void SetDPILobHandle(dpiLob *handle);
+    void SetDPISubscrHandle(dpiSubscr *handle);
 
     // methods for getting values from JSON
     bool GetBoolFromJSON(Local<Object> obj, const char *key, int index,
             bool *value);
+    bool GetFunctionFromJSON(Local<Object> obj, const char *key, int index,
+            Local<Function> *value);
     bool GetStringFromJSON(Local<Object> obj, const char *key, int index,
             string &value);
     bool GetPositiveIntFromJSON(Local<Object> obj, const char *key, int index,
@@ -347,6 +396,9 @@ public:
     bool GetUnsignedIntFromJSON(Local<Object> obj, const char *key, int index,
             uint32_t *value);
 
+    // convenience methods
+    uint32_t GetNumOutBinds();
+
     // methods for queuing work on the thread queue
     void QueueWork(const char *methodName, void (*workCallback)(njsBaton*),
             void (*afterWorkCallback)(njsBaton*, Local<Value>[]),