oracledb 2.1.0 → 2.3.0

package/odpi/src/dpiImpl.h

@@ -92,6 +92,9 @@ extern unsigned long dpiDebugLevel;
 // define maximum buffer size permitted in variables
 #define DPI_MAX_VAR_BUFFER_SIZE                     (1024 * 1024 * 1024 - 2)
 
+// define subscription grouping repeat count
+#define DPI_SUBSCR_GROUPING_FOREVER                 -1
+
 // define number of rows to prefetch
 #define DPI_PREFETCH_ROWS_DEFAULT                   2
 
@@ -129,6 +132,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_DTYPE_AQMSG_PROPERTIES              59
 #define DPI_OCI_DTYPE_INTERVAL_YM                   62
 #define DPI_OCI_DTYPE_INTERVAL_DS                   63
+#define DPI_OCI_DTYPE_AQNFY_DESCRIPTOR              64
 #define DPI_OCI_DTYPE_TIMESTAMP                     68
 #define DPI_OCI_DTYPE_TIMESTAMP_TZ                  69
 #define DPI_OCI_DTYPE_TIMESTAMP_LTZ                 70
@@ -178,6 +182,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_ENQ_TIME                       62
 #define DPI_OCI_ATTR_MSG_STATE                      63
 #define DPI_OCI_ATTR_ORIGINAL_MSGID                 69
+#define DPI_OCI_ATTR_QUEUE_NAME                     70
 #define DPI_OCI_ATTR_NUM_DML_ERRORS                 73
 #define DPI_OCI_ATTR_DML_ROW_OFFSET                 74
 #define DPI_OCI_ATTR_SUBSCR_NAME                    94
@@ -207,6 +212,10 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_SUBSCR_CQ_QOSFLAGS             229
 #define DPI_OCI_ATTR_LIST_TYPE_ATTRS                229
 #define DPI_OCI_ATTR_SUBSCR_CQ_REGID                230
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_CLASS     231
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_VALUE     232
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_TYPE      233
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_REPEAT_COUNT 235
 #define DPI_OCI_ATTR_NCHARSET_ID                    262
 #define DPI_OCI_ATTR_APPCTX_SIZE                    273
 #define DPI_OCI_ATTR_APPCTX_LIST                    274
@@ -229,6 +238,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_CHNF_OPERATIONS                403
 #define DPI_OCI_ATTR_CHDES_DBNAME                   405
 #define DPI_OCI_ATTR_CHDES_NFYTYPE                  406
+#define DPI_OCI_ATTR_NFY_FLAGS                      406
 #define DPI_OCI_ATTR_CHDES_XID                      407
 #define DPI_OCI_ATTR_MSG_DELIVERY_MODE              407
 #define DPI_OCI_ATTR_CHDES_TABLE_CHANGES            408
@@ -246,6 +256,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_CONNECTION_CLASS               425
 #define DPI_OCI_ATTR_PURITY                         426
 #define DPI_OCI_ATTR_RECEIVE_TIMEOUT                436
+#define DPI_OCI_ATTR_SUBSCR_IPADDR                  452
 #define DPI_OCI_ATTR_UB8_ROW_COUNT                  457
 #define DPI_OCI_ATTR_SPOOL_AUTH                     460
 #define DPI_OCI_ATTR_LTXID                          462
@@ -257,6 +268,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_BREAK_ON_NET_TIMEOUT           495
 #define DPI_OCI_ATTR_SHARDING_KEY                   496
 #define DPI_OCI_ATTR_SUPER_SHARDING_KEY             497
+#define DPI_OCI_ATTR_SPOOL_WAIT_TIMEOUT             506
 
 // define OCI object type constants
 #define DPI_OCI_OTYPE_NAME                          1
@@ -444,7 +456,6 @@ typedef enum {
     DPI_ERR_TRANS_ID_TOO_LARGE,
     DPI_ERR_BRANCH_ID_TOO_LARGE,
     DPI_ERR_COLUMN_FETCH,
-    DPI_ERR_OCI_VERSION_NOT_SUPPORTED,
     DPI_ERR_STMT_CLOSED,
     DPI_ERR_LOB_CLOSED,
     DPI_ERR_INVALID_CHARSET_ID,
@@ -454,18 +465,21 @@ typedef enum {
     DPI_ERR_NUMBER_STRING_TOO_LONG,
     DPI_ERR_NULL_POINTER_PARAMETER,
     DPI_ERR_LOAD_LIBRARY,
-    DPI_ERR_UNUSED_1,
     DPI_ERR_LOAD_SYMBOL,
     DPI_ERR_LIBRARY_TOO_OLD,
-    DPI_ERR_OVERFLOW,
     DPI_ERR_NLS_ENV_VAR_GET,
     DPI_ERR_PTR_LENGTH_MISMATCH,
-    DPI_ERR_UNUSED_2,
     DPI_ERR_NAN,
     DPI_ERR_WRONG_TYPE,
     DPI_ERR_BUFFER_SIZE_TOO_LARGE,
     DPI_ERR_NO_EDITION_WITH_CONN_CLASS,
     DPI_ERR_NO_BIND_VARS_IN_DDL,
+    DPI_ERR_SUBSCR_CLOSED,
+    DPI_ERR_NO_EDITION_WITH_NEW_PASSWORD,
+    DPI_ERR_UNEXPECTED_OCI_RETURN_VALUE,
+    DPI_ERR_EXEC_MODE_ONLY_FOR_DML,
+    DPI_ERR_ARRAY_VAR_NOT_SUPPORTED,
+    DPI_ERR_EVENTS_MODE_REQUIRED,
     DPI_ERR_MAX
 } dpiErrorNum;
 
@@ -512,7 +526,6 @@ typedef enum {
 // old type definitions (to be dropped)
 //-----------------------------------------------------------------------------
 
-// structure used for creating connections (2.0)
 typedef struct {
     dpiAuthMode authMode;
     const char *connectionClass;
@@ -533,6 +546,34 @@ typedef struct {
     int outTagFound;
 } dpiConnCreateParams__v20;
 
+typedef struct {
+    dpiSubscrNamespace subscrNamespace;
+    dpiSubscrProtocol protocol;
+    dpiSubscrQOS qos;
+    dpiOpCode operations;
+    uint32_t portNumber;
+    uint32_t timeout;
+    const char *name;
+    uint32_t nameLength;
+    dpiSubscrCallback callback;
+    void *callbackContext;
+    const char *recipientName;
+    uint32_t recipientNameLength;
+} dpiSubscrCreateParams__v23;
+
+typedef struct {
+    uint32_t minSessions;
+    uint32_t maxSessions;
+    uint32_t sessionIncrement;
+    int pingInterval;
+    int pingTimeout;
+    int homogeneous;
+    int externalAuth;
+    dpiPoolGetMode getMode;
+    const char *outPoolName;
+    uint32_t outPoolNameLength;
+} dpiPoolCreateParams__v23;
+
 
 //-----------------------------------------------------------------------------
 // OCI type definitions
@@ -604,6 +645,7 @@ typedef struct {
     dpiVersionInfo *versionInfo;
     void *baseDate;
     int threaded;
+    int events;
 } dpiEnv;
 
 typedef struct {
@@ -661,6 +703,63 @@ typedef struct {
     uint32_t nameLength;
 } dpiBindVar;
 
+typedef union {
+    void *asHandle;
+    dpiObject *asObject;
+    dpiStmt *asStmt;
+    dpiLob *asLOB;
+    dpiRowid *asRowid;
+} dpiReferenceBuffer;
+
+typedef union {
+    void *asRaw;
+    char *asBytes;
+    float *asFloat;
+    double *asDouble;
+    int64_t *asInt64;
+    uint64_t *asUint64;
+    dpiOciNumber *asNumber;
+    dpiOciDate *asDate;
+    void **asTimestamp;
+    void **asInterval;
+    void **asLobLocator;
+    void **asString;
+    void **asStmt;
+    void **asRowid;
+    int *asBoolean;
+    void **asObject;
+    void **asCollection;
+} dpiOracleData;
+
+typedef union {
+    int64_t asInt64;
+    uint64_t asUint64;
+    float asFloat;
+    double asDouble;
+    dpiOciNumber asNumber;
+    dpiOciDate asDate;
+    int asBoolean;
+    void *asString;
+    void *asTimestamp;
+    void *asLobLocator;
+    void *asRaw;
+} dpiOracleDataBuffer;
+
+typedef struct {
+    uint32_t maxArraySize;
+    uint32_t actualArraySize;
+    int16_t *indicator;
+    uint16_t *returnCode;
+    uint16_t *actualLength16;
+    uint32_t *actualLength32;
+    void **objectIndicator;
+    dpiReferenceBuffer *references;
+    dpiDynamicBytes *dynamicBytes;
+    char *tempBuffer;
+    dpiData *externalData;
+    dpiOracleData data;
+} dpiVarBuffer;
+
 
 //-----------------------------------------------------------------------------
 // External implementation type definitions
@@ -728,70 +827,18 @@ struct dpiStmt {
     int closing;
 };
 
-typedef union {
-    void *asRaw;
-    char *asBytes;
-    float *asFloat;
-    double *asDouble;
-    int64_t *asInt64;
-    uint64_t *asUint64;
-    dpiOciNumber *asNumber;
-    dpiOciDate *asDate;
-    void **asTimestamp;
-    void **asInterval;
-    void **asLobLocator;
-    void **asString;
-    void **asStmt;
-    void **asRowid;
-    int *asBoolean;
-    void **asObject;
-    void **asCollection;
-} dpiOracleData;
-
-typedef union {
-    int64_t asInt64;
-    uint64_t asUint64;
-    float asFloat;
-    double asDouble;
-    dpiOciNumber asNumber;
-    dpiOciDate asDate;
-    int asBoolean;
-    void *asString;
-    void *asTimestamp;
-    void *asLobLocator;
-    void *asRaw;
-} dpiOracleDataBuffer;
-
-typedef union {
-    void *asHandle;
-    dpiObject *asObject;
-    dpiStmt *asStmt;
-    dpiLob *asLOB;
-    dpiRowid *asRowid;
-} dpiReferenceBuffer;
-
 struct dpiVar {
     dpiType_HEAD
     dpiConn *conn;
     const dpiOracleType *type;
     dpiNativeTypeNum nativeTypeNum;
-    uint32_t maxArraySize;
-    uint32_t actualArraySize;
     int requiresPreFetch;
     int isArray;
-    int16_t *indicator;
-    uint16_t *returnCode;
-    uint16_t *actualLength16;
-    uint32_t *actualLength32;
     uint32_t sizeInBytes;
     int isDynamic;
     dpiObjectType *objectType;
-    void **objectIndicator;
-    dpiReferenceBuffer *references;
-    dpiDynamicBytes *dynamicBytes;
-    char *tempBuffer;
-    dpiData *externalData;
-    dpiOracleData data;
+    dpiVarBuffer buffer;
+    dpiVarBuffer *dynBindBuffers;
     dpiError *error;
 };
 
@@ -832,6 +879,8 @@ struct dpiObject {
     dpiObjectType *type;
     void *instance;
     void *indicator;
+    dpiObject *dependsOnObj;
+    int freeIndicator;
 };
 
 struct dpiRowid {
@@ -845,9 +894,11 @@ struct dpiSubscr {
     dpiType_HEAD
     dpiConn *conn;
     void *handle;
+    dpiSubscrNamespace subscrNamespace;
     dpiSubscrQOS qos;
     dpiSubscrCallback callback;
     void *callbackContext;
+    int registered;
 };
 
 struct dpiDeqOptions {
@@ -866,6 +917,8 @@ struct dpiMsgProps {
     dpiType_HEAD
     dpiConn *conn;
     void *handle;
+    char *buffer;
+    uint32_t bufferLength;
 };
 
 
@@ -873,8 +926,7 @@ struct dpiMsgProps {
 // definition of internal dpiContext methods
 //-----------------------------------------------------------------------------
 void dpiContext__initCommonCreateParams(dpiCommonCreateParams *params);
-void dpiContext__initConnCreateParams(const dpiContext *context,
-        dpiConnCreateParams *params, size_t *structSize);
+void dpiContext__initConnCreateParams(dpiConnCreateParams *params);
 void dpiContext__initPoolCreateParams(dpiPoolCreateParams *params);
 void dpiContext__initSubscrCreateParams(dpiSubscrCreateParams *params);
 
@@ -1020,15 +1072,16 @@ int dpiVar__copyData(dpiVar *var, uint32_t pos, dpiData *sourceData,
 int32_t dpiVar__defineCallback(dpiVar *var, void *defnp, uint32_t iter,
         void **bufpp, uint32_t **alenpp, uint8_t *piecep, void **indpp,
         uint16_t **rcodepp);
-int dpiVar__extendedPreFetch(dpiVar *var, dpiError *error);
+int dpiVar__extendedPreFetch(dpiVar *var, dpiVarBuffer *buffer,
+        dpiError *error);
 void dpiVar__free(dpiVar *var, dpiError *error);
 int32_t dpiVar__inBindCallback(dpiVar *var, void *bindp, uint32_t iter,
         uint32_t index, void **bufpp, uint32_t *alenp, uint8_t *piecep,
         void **indpp);
-int dpiVar__getValue(dpiVar *var, uint32_t pos, dpiData *data,
-        dpiError *error);
-int dpiVar__setValue(dpiVar *var, uint32_t pos, dpiData *data,
-        dpiError *error);
+int dpiVar__getValue(dpiVar *var, dpiVarBuffer *buffer, uint32_t pos,
+        int inFetch, dpiError *error);
+int dpiVar__setValue(dpiVar *var, dpiVarBuffer *buffer, uint32_t pos,
+        dpiData *data, dpiError *error);
 int32_t dpiVar__outBindCallback(dpiVar *var, void *bindp, uint32_t iter,
         uint32_t index, void **bufpp, uint32_t **alenpp, uint8_t *piecep,
         void **indpp, uint16_t **rcodepp);
@@ -1051,7 +1104,8 @@ int dpiLob__setFromBytes(dpiLob *lob, const char *value, uint64_t valueLength,
 // definition of internal dpiObject methods
 //-----------------------------------------------------------------------------
 int dpiObject__allocate(dpiObjectType *objType, void *instance,
-        void *indicator, dpiObject **obj, dpiError *error);
+        void *indicator, dpiObject *dependsOnObj, dpiObject **obj,
+        dpiError *error);
 void dpiObject__free(dpiObject *obj, dpiError *error);
 
 
@@ -1310,7 +1364,8 @@ int dpiOci__stringResize(void *envHandle, void **handle, uint32_t newSize,
 int dpiOci__stringSize(void *envHandle, void *handle, uint32_t *size);
 int dpiOci__subscriptionRegister(dpiConn *conn, void **handle,
         dpiError *error);
-int dpiOci__subscriptionUnRegister(dpiSubscr *subscr, dpiError *error);
+int dpiOci__subscriptionUnRegister(dpiConn *conn, dpiSubscr *subscr,
+        dpiError *error);
 int dpiOci__tableDelete(dpiObject *obj, int32_t index, dpiError *error);
 int dpiOci__tableExists(dpiObject *obj, int32_t index, int *exists,
         dpiError *error);
@@ -1341,6 +1396,8 @@ int dpiOci__typeByFullName(dpiConn *conn, const char *name,
 // definition of internal dpiMsgProps methods
 //-----------------------------------------------------------------------------
 int dpiMsgProps__create(dpiMsgProps *props, dpiConn *conn, dpiError *error);
+int dpiMsgProps__extractMsgId(dpiMsgProps *props, void *ociRaw,
+        const char **msgId, uint32_t *msgIdLength, dpiError *error);
 void dpiMsgProps__free(dpiMsgProps *props, dpiError *error);
 
 

package/odpi/src/dpiMsgProps.c

@@ -30,6 +30,35 @@ int dpiMsgProps__create(dpiMsgProps *options, dpiConn *conn, dpiError *error)
 }
 
 
+//-----------------------------------------------------------------------------
+// dpiMsgProps__extractMsgId() [INTERNAL]
+//   Extract bytes from the OCIRaw value containing the message id and store
+// them in allocated memory on the message properties instance. Then resize the
+// OCIRaw value so the memory can be reclaimed.
+//-----------------------------------------------------------------------------
+int dpiMsgProps__extractMsgId(dpiMsgProps *props, void *ociRaw,
+        const char **msgId, uint32_t *msgIdLength, dpiError *error)
+{
+    const char *rawPtr;
+
+    dpiOci__rawPtr(props->env->handle, ociRaw, (void**) &rawPtr);
+    dpiOci__rawSize(props->env->handle, ociRaw, msgIdLength);
+    if (*msgIdLength > props->bufferLength) {
+        if (props->buffer) {
+            dpiUtils__freeMemory(props->buffer);
+            props->buffer = NULL;
+        }
+        if (dpiUtils__allocateMemory(1, *msgIdLength, 0,
+                "allocate msgid buffer", (void**) &props->buffer, error) < 0)
+            return DPI_FAILURE;
+    }
+    memcpy(props->buffer, rawPtr, *msgIdLength);
+    *msgId = props->buffer;
+    dpiOci__rawResize(props->env->handle, &ociRaw, 0, error);
+    return DPI_SUCCESS;
+}
+
+
 //-----------------------------------------------------------------------------
 // dpiMsgProps__free() [INTERNAL]
 //   Free the memory for a message properties structure.
@@ -44,6 +73,10 @@ void dpiMsgProps__free(dpiMsgProps *props, dpiError *error)
         dpiGen__setRefCount(props->conn, error, -1);
         props->conn = NULL;
     }
+    if (props->buffer) {
+        dpiUtils__freeMemory(props->buffer);
+        props->buffer = NULL;
+    }
     dpiUtils__freeMemory(props);
 }
 

package/odpi/src/dpiObject.c

@@ -21,7 +21,8 @@
 //   Allocate and initialize an object structure.
 //-----------------------------------------------------------------------------
 int dpiObject__allocate(dpiObjectType *objType, void *instance,
-        void *indicator, dpiObject **obj, dpiError *error)
+        void *indicator, dpiObject *dependsOnObj, dpiObject **obj,
+        dpiError *error)
 {
     dpiObject *tempObj;
 
@@ -32,6 +33,10 @@ int dpiObject__allocate(dpiObjectType *objType, void *instance,
     tempObj->type = objType;
     tempObj->instance = instance;
     tempObj->indicator = indicator;
+    if (dependsOnObj) {
+        dpiGen__setRefCount(dependsOnObj, error, 1);
+        tempObj->dependsOnObj = dependsOnObj;
+    }
     if (!instance) {
         if (dpiOci__objectNew(tempObj, error) < 0) {
             dpiObject__free(tempObj, error);
@@ -73,7 +78,9 @@ static void dpiObject__clearOracleValue(dpiEnv *env, dpiError *error,
 {
     switch (oracleTypeNum) {
         case DPI_ORACLE_TYPE_CHAR:
+        case DPI_ORACLE_TYPE_NCHAR:
         case DPI_ORACLE_TYPE_VARCHAR:
+        case DPI_ORACLE_TYPE_NVARCHAR:
             if (buffer->asString)
                 dpiOci__stringResize(env->handle, &buffer->asString, 0, error);
             break;
@@ -105,7 +112,8 @@ static void dpiObject__clearOracleValue(dpiEnv *env, dpiError *error,
 void dpiObject__free(dpiObject *obj, dpiError *error)
 {
     if (obj->instance) {
-        dpiOci__objectFree(obj, error);
+        if (!obj->dependsOnObj)
+            dpiOci__objectFree(obj, error);
         obj->instance = NULL;
         obj->indicator = NULL;
     }
@@ -113,6 +121,10 @@ void dpiObject__free(dpiObject *obj, dpiError *error)
         dpiGen__setRefCount(obj->type, error, -1);
         obj->type = NULL;
     }
+    if (obj->dependsOnObj) {
+        dpiGen__setRefCount(obj->dependsOnObj, error, -1);
+        obj->dependsOnObj = NULL;
+    }
     dpiUtils__freeMemory(obj);
 }
 
@@ -209,14 +221,9 @@ static int dpiObject__fromOracleValue(dpiObject *obj, dpiError *error,
                 void *instance = (typeInfo->objectType->isCollection) ?
                         *value->asCollection : value->asRaw;
                 dpiObject *tempObj;
-                if (dpiObject__allocate(typeInfo->objectType, NULL, NULL,
-                        &tempObj, error) < 0)
-                    return DPI_FAILURE;
-                if (dpiOci__objectCopy(tempObj, instance, indicator,
-                        error) < 0) {
-                    dpiObject__free(tempObj, error);
+                if (dpiObject__allocate(typeInfo->objectType, instance,
+                        indicator, obj, &tempObj, error) < 0)
                     return DPI_FAILURE;
-                }
                 data->value.asObject = tempObj;
                 return DPI_SUCCESS;
             }
@@ -457,7 +464,7 @@ int dpiObject_copy(dpiObject *obj, dpiObject **copiedObj)
     if (dpiGen__startPublicFn(obj, DPI_HTYPE_OBJECT, __func__, 1, &error) < 0)
         return dpiGen__endPublicFn(obj, DPI_FAILURE, &error);
     DPI_CHECK_PTR_NOT_NULL(obj, copiedObj)
-    if (dpiObject__allocate(obj->type, NULL, NULL, &tempObj, &error) < 0)
+    if (dpiObject__allocate(obj->type, NULL, NULL, NULL, &tempObj, &error) < 0)
         return dpiGen__endPublicFn(obj, DPI_FAILURE, &error);
     if (dpiOci__objectCopy(tempObj, obj->instance, obj->indicator,
             &error) < 0) {

package/odpi/src/dpiObjectType.c

@@ -202,7 +202,7 @@ int dpiObjectType_createObject(dpiObjectType *objType, dpiObject **obj)
             &error) < 0)
         return dpiGen__endPublicFn(objType, DPI_FAILURE, &error);
     DPI_CHECK_PTR_NOT_NULL(objType, obj)
-    status = dpiObject__allocate(objType, NULL, NULL, obj, &error);
+    status = dpiObject__allocate(objType, NULL, NULL, NULL, obj, &error);
     return dpiGen__endPublicFn(objType, status, &error);
 }
 

package/odpi/src/dpiOci.c

@@ -640,14 +640,15 @@ int dpiOci__bindByName(dpiStmt *stmt, void **bindHandle, const char *name,
     DPI_OCI_LOAD_SYMBOL("OCIBindByName", dpiOciSymbols.fnBindByName)
     status = (*dpiOciSymbols.fnBindByName)(stmt->handle, bindHandle,
             error->handle, name, nameLength,
-            (dynamicBind) ? NULL : var->data.asRaw,
+            (dynamicBind) ? NULL : var->buffer.data.asRaw,
             (var->isDynamic) ? INT_MAX : (int32_t) var->sizeInBytes,
-            var->type->oracleType, (dynamicBind) ? NULL : var->indicator,
+            var->type->oracleType, (dynamicBind) ? NULL :
+                    var->buffer.indicator,
             (dynamicBind || var->type->sizeInBytes) ? NULL :
-                    var->actualLength16,
-            (dynamicBind) ? NULL : var->returnCode,
-            (var->isArray) ? var->maxArraySize : 0,
-            (var->isArray) ? &var->actualArraySize : NULL,
+                    var->buffer.actualLength16,
+            (dynamicBind) ? NULL : var->buffer.returnCode,
+            (var->isArray) ? var->buffer.maxArraySize : 0,
+            (var->isArray) ? &var->buffer.actualArraySize : NULL,
             (dynamicBind) ? DPI_OCI_DATA_AT_EXEC : DPI_OCI_DEFAULT);
     return dpiError__check(error, status, stmt->conn, "bind by name");
 }
@@ -665,14 +666,15 @@ int dpiOci__bindByName2(dpiStmt *stmt, void **bindHandle, const char *name,
     DPI_OCI_LOAD_SYMBOL("OCIBindByName2", dpiOciSymbols.fnBindByName2)
     status = (*dpiOciSymbols.fnBindByName2)(stmt->handle, bindHandle,
             error->handle, name, nameLength,
-            (dynamicBind) ? NULL : var->data.asRaw,
+            (dynamicBind) ? NULL : var->buffer.data.asRaw,
             (var->isDynamic) ? INT_MAX : var->sizeInBytes,
-            var->type->oracleType, (dynamicBind) ? NULL : var->indicator,
+            var->type->oracleType, (dynamicBind) ? NULL :
+                    var->buffer.indicator,
             (dynamicBind || var->type->sizeInBytes) ? NULL :
-                    var->actualLength32,
-            (dynamicBind) ? NULL : var->returnCode,
-            (var->isArray) ? var->maxArraySize : 0,
-            (var->isArray) ? &var->actualArraySize : NULL,
+                    var->buffer.actualLength32,
+            (dynamicBind) ? NULL : var->buffer.returnCode,
+            (var->isArray) ? var->buffer.maxArraySize : 0,
+            (var->isArray) ? &var->buffer.actualArraySize : NULL,
             (dynamicBind) ? DPI_OCI_DATA_AT_EXEC : DPI_OCI_DEFAULT);
     return dpiError__check(error, status, stmt->conn, "bind by name");
 }
@@ -689,14 +691,15 @@ int dpiOci__bindByPos(dpiStmt *stmt, void **bindHandle, uint32_t pos,
 
     DPI_OCI_LOAD_SYMBOL("OCIBindByPos", dpiOciSymbols.fnBindByPos)
     status = (*dpiOciSymbols.fnBindByPos)(stmt->handle, bindHandle,
-            error->handle, pos, (dynamicBind) ? NULL : var->data.asRaw,
+            error->handle, pos, (dynamicBind) ? NULL : var->buffer.data.asRaw,
             (var->isDynamic) ? INT_MAX : (int32_t) var->sizeInBytes,
-            var->type->oracleType, (dynamicBind) ? NULL : var->indicator,
+            var->type->oracleType, (dynamicBind) ? NULL :
+                    var->buffer.indicator,
             (dynamicBind || var->type->sizeInBytes) ? NULL :
-                    var->actualLength16,
-            (dynamicBind) ? NULL : var->returnCode,
-            (var->isArray) ? var->maxArraySize : 0,
-            (var->isArray) ? &var->actualArraySize : NULL,
+                    var->buffer.actualLength16,
+            (dynamicBind) ? NULL : var->buffer.returnCode,
+            (var->isArray) ? var->buffer.maxArraySize : 0,
+            (var->isArray) ? &var->buffer.actualArraySize : NULL,
             (dynamicBind) ? DPI_OCI_DATA_AT_EXEC : DPI_OCI_DEFAULT);
     return dpiError__check(error, status, stmt->conn, "bind by position");
 }
@@ -713,14 +716,15 @@ int dpiOci__bindByPos2(dpiStmt *stmt, void **bindHandle, uint32_t pos,
 
     DPI_OCI_LOAD_SYMBOL("OCIBindByPos2", dpiOciSymbols.fnBindByPos2)
     status = (*dpiOciSymbols.fnBindByPos2)(stmt->handle, bindHandle,
-            error->handle, pos, (dynamicBind) ? NULL : var->data.asRaw,
+            error->handle, pos, (dynamicBind) ? NULL : var->buffer.data.asRaw,
             (var->isDynamic) ? INT_MAX : var->sizeInBytes,
-            var->type->oracleType, (dynamicBind) ? NULL : var->indicator,
+            var->type->oracleType, (dynamicBind) ? NULL :
+                    var->buffer.indicator,
             (dynamicBind || var->type->sizeInBytes) ? NULL :
-                    var->actualLength32,
-            (dynamicBind) ? NULL : var->returnCode,
-            (var->isArray) ? var->maxArraySize : 0,
-            (var->isArray) ? &var->actualArraySize : NULL,
+                    var->buffer.actualLength32,
+            (dynamicBind) ? NULL : var->buffer.returnCode,
+            (var->isArray) ? var->buffer.maxArraySize : 0,
+            (var->isArray) ? &var->buffer.actualArraySize : NULL,
             (dynamicBind) ? DPI_OCI_DATA_AT_EXEC : DPI_OCI_DEFAULT);
     return dpiError__check(error, status, stmt->conn, "bind by position");
 }
@@ -752,8 +756,8 @@ int dpiOci__bindObject(dpiVar *var, void *bindHandle, dpiError *error)
 
     DPI_OCI_LOAD_SYMBOL("OCIBindObject", dpiOciSymbols.fnBindObject)
     status = (*dpiOciSymbols.fnBindObject)(bindHandle, error->handle,
-            var->objectType->tdo, (void**) var->data.asRaw, 0,
-            var->objectIndicator, 0);
+            var->objectType->tdo, (void**) var->buffer.data.asRaw, 0,
+            var->buffer.objectIndicator, 0);
     return dpiError__check(error, status, var->conn, "bind object");
 }
 
@@ -1044,11 +1048,13 @@ int dpiOci__defineByPos(dpiStmt *stmt, void **defineHandle, uint32_t pos,
 
     DPI_OCI_LOAD_SYMBOL("OCIDefineByPos", dpiOciSymbols.fnDefineByPos)
     status = (*dpiOciSymbols.fnDefineByPos)(stmt->handle, defineHandle,
-            error->handle, pos, (var->isDynamic) ? NULL : var->data.asRaw,
+            error->handle, pos, (var->isDynamic) ? NULL :
+                    var->buffer.data.asRaw,
             (var->isDynamic) ? INT_MAX : (int32_t) var->sizeInBytes,
-            var->type->oracleType, (var->isDynamic) ? NULL : var->indicator,
-            (var->isDynamic) ? NULL : var->actualLength16,
-            (var->isDynamic) ? NULL : var->returnCode,
+            var->type->oracleType, (var->isDynamic) ? NULL :
+                    var->buffer.indicator,
+            (var->isDynamic) ? NULL : var->buffer.actualLength16,
+            (var->isDynamic) ? NULL : var->buffer.returnCode,
             (var->isDynamic) ? DPI_OCI_DYNAMIC_FETCH : DPI_OCI_DEFAULT);
     return dpiError__check(error, status, stmt->conn, "define");
 }
@@ -1065,11 +1071,13 @@ int dpiOci__defineByPos2(dpiStmt *stmt, void **defineHandle, uint32_t pos,
 
     DPI_OCI_LOAD_SYMBOL("OCIDefineByPos2", dpiOciSymbols.fnDefineByPos2)
     status = (*dpiOciSymbols.fnDefineByPos2)(stmt->handle, defineHandle,
-            error->handle, pos, (var->isDynamic) ? NULL : var->data.asRaw,
+            error->handle, pos, (var->isDynamic) ? NULL :
+                    var->buffer.data.asRaw,
             (var->isDynamic) ? INT_MAX : var->sizeInBytes,
-            var->type->oracleType, (var->isDynamic) ? NULL : var->indicator,
-            (var->isDynamic) ? NULL : var->actualLength32,
-            (var->isDynamic) ? NULL : var->returnCode,
+            var->type->oracleType, (var->isDynamic) ? NULL :
+                    var->buffer.indicator,
+            (var->isDynamic) ? NULL : var->buffer.actualLength32,
+            (var->isDynamic) ? NULL : var->buffer.returnCode,
             (var->isDynamic) ? DPI_OCI_DYNAMIC_FETCH : DPI_OCI_DEFAULT);
     return dpiError__check(error, status, stmt->conn, "define");
 }
@@ -1100,8 +1108,8 @@ int dpiOci__defineObject(dpiVar *var, void *defineHandle, dpiError *error)
 
     DPI_OCI_LOAD_SYMBOL("OCIDefineObject", dpiOciSymbols.fnDefineObject)
     status = (*dpiOciSymbols.fnDefineObject)(defineHandle, error->handle,
-            var->objectType->tdo, (void**) var->data.asRaw, 0,
-            var->objectIndicator, 0);
+            var->objectType->tdo, (void**) var->buffer.data.asRaw, 0,
+            var->buffer.objectIndicator, 0);
     return dpiError__check(error, status, var->conn, "define object");
 }
 
@@ -1598,7 +1606,10 @@ static int dpiOci__loadLib(dpiError *error)
 static int dpiOci__loadLibValidate(dpiError *error)
 {
     // determine the OCI client version information
-    DPI_OCI_LOAD_SYMBOL("OCIClientVersion", dpiOciSymbols.fnClientVersion)
+    if (dpiOci__loadSymbol("OCIClientVersion",
+            (void**) &dpiOciSymbols.fnClientVersion, NULL) < 0)
+        return dpiError__set(error, "get client version",
+                DPI_ERR_LIBRARY_TOO_OLD);
     (*dpiOciSymbols.fnClientVersion)(&dpiOciLibVersionInfo.versionNum,
             &dpiOciLibVersionInfo.releaseNum,
             &dpiOciLibVersionInfo.updateNum,
@@ -2150,6 +2161,9 @@ int dpiOci__objectFree(dpiObject *obj, dpiError *error)
     DPI_OCI_LOAD_SYMBOL("OCIObjectFree", dpiOciSymbols.fnObjectFree)
     (*dpiOciSymbols.fnObjectFree)(obj->env->handle, error->handle,
             obj->instance, DPI_OCI_DEFAULT);
+    if (obj->freeIndicator)
+        (*dpiOciSymbols.fnObjectFree)(obj->env->handle, error->handle,
+                obj->indicator, DPI_OCI_DEFAULT);
     return DPI_SUCCESS;
 }
 
@@ -2778,15 +2792,16 @@ int dpiOci__subscriptionRegister(dpiConn *conn, void **handle, dpiError *error)
 // dpiOci__subscriptionUnRegister() [INTERNAL]
 //   Wrapper for OCISubscriptionUnRegister().
 //-----------------------------------------------------------------------------
-int dpiOci__subscriptionUnRegister(dpiSubscr *subscr, dpiError *error)
+int dpiOci__subscriptionUnRegister(dpiConn *conn, dpiSubscr *subscr,
+        dpiError *error)
 {
     int status;
 
     DPI_OCI_LOAD_SYMBOL("OCISubscriptionUnRegister",
             dpiOciSymbols.fnSubscriptionUnRegister)
-    status = (*dpiOciSymbols.fnSubscriptionUnRegister)(subscr->conn->handle,
+    status = (*dpiOciSymbols.fnSubscriptionUnRegister)(conn->handle,
             subscr->handle, error->handle, DPI_OCI_DEFAULT);
-    return dpiError__check(error, status, subscr->conn, "unregister");
+    return dpiError__check(error, status, conn, "unregister");
 }