oracledb 2.1.0 → 2.3.0

package/odpi/README.md

@@ -1,4 +1,4 @@
-# ODPI-C version 2.2.0
+# 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
@@ -6,110 +6,51 @@ C or C++.  It is a wrapper over [Oracle Call Interface
 (OCI)](http://www.oracle.com/technetwork/database/features/oci/index.html) that
 makes applications and language interfaces easier to develop.
 
-## Features
-
-- 11.2, 12.1 and 12.2 Oracle Client support
-- 9.2 and higher Oracle Database support (depending on Oracle Client version)
-- SQL and PL/SQL execution
-- Character datatypes (CHAR, VARCHAR2, NCHAR, NVARCHAR2, CLOB, NCLOB, LONG)
-- Numeric datatypes (NUMBER, BINARY_FLOAT, BINARY_DOUBLE)
-- Dates, Timestamps, Intervals
-- Binary types (BLOB, BFILE, RAW, LONG RAW)
-- PL/SQL datatypes (PLS_INTEGER, BOOLEAN, Collections, Records)
-- JSON
-- User Defined Types
-- REF CURSOR, Nested cursors, Implicit Result Sets
-- Array fetch
-- Array bind/execute
-- Batch errors
-- Array DML Row Counts
-- Scrollable cursors
-- DML RETURNING
-- Query Result Caching
-- Statement caching (with tagging)
-- Query metadata
-- Standalone connections
-- Pooled connections via OCI session pools (Homogeneous and non-homogeneous with proxy authentication)
-- Database Resident Connection Pooling (DRCP)
-- External authentication
-- Proxy authentication
-- Privileged connection support (SYSDBA, SYSOPER, SYSASM, PRELIM_AUTH)
-- Session tagging
-- Connection validation (when acquired from session pool or DRCP)
-- Password change
-- End-to-end tracing, mid-tier authentication and auditing (action, module,
-  client identifier, client info, database operation)
-- Edition Based Redefinition
-- Database startup/shutdown
-- Application Continuity
-- Two Phase Commit
-- Continuous Query Notification
-- Advanced Queuing
-- Sharded Databases
-- Easily extensible via direct OCI calls
-
-## Install
-
-See
-[ODPI-C Installation](https://oracle.github.io/odpi/doc/installation.html)
-for detailed instructions.
-
-A sample Makefile (Makefile.win32 for use with nmake on Windows) is provided if
-you wish to build ODPI-C as a shared library. Otherwise, include the ODPI-C
-source code in your project (see embed/dpi.c).
-
-Oracle Client libraries are required.  They are available in the free [Oracle
-Instant
-Client](http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html)
-"Basic" and "Basic Light" packages, or available in any Oracle Database
-installation or full Oracle Client installation.
-
-ODPI-C uses the shared library loading mechanism available on each supported
-platform to load the Oracle Client libraries at runtime. This allows code using
-ODPI-C to be built only once, and then run using Oracle Client 11.2, 12.1 or
-12.2 libraries. Oracle's standard client-server version interoperability allows
-connection to both older and newer databases, for example Oracle 12.2 client
-libraries can connect to Oracle Database 11.2 or later.
-
-
-ODPI-C has been tested on Linux, Windows and macOS.  Other platforms should
-also work but have not been tested.  On Windows, Visual Studio 2008 or higher
-is required.  On macOS, Xcode 6 or higher is required.  On Linux, GCC 4.4 or
-higher is required.
+ODPI-C supports basic and advanced features of Oracle Database and
+Oracle Client.  See the [homepage](https://oracle.github.io/odpi/) for
+a list.
+
+## Installation
+
+See [ODPI-C Installation](https://oracle.github.io/odpi/doc/installation.html).
 
 ## Documentation
 
-See [ODPI-C Documentation](https://oracle.github.io/odpi/doc/index.html) and
+See the [ODPI-C Documentation](https://oracle.github.io/odpi/doc/index.html) and
 [Release Notes](https://oracle.github.io/odpi/doc/releasenotes.html).
 
-## Help
+## Samples
 
-Please report bugs and ask questions using [GitHub issues](https://github.com/oracle/odpi/issues).
+See [/samples](https://github.com/oracle/odpi/tree/master/samples).
 
-## Samples
+## Help
 
-See [/samples](https://github.com/oracle/odpi/tree/master/samples)
+Please report bugs and ask questions using [GitHub issues](https://github.com/oracle/odpi/issues).
 
 ## Tests
 
-See [/test](https://github.com/oracle/odpi/tree/master/test)
+See [/test](https://github.com/oracle/odpi/tree/master/test).
 
 ## Contributing
 
-See [CONTRIBUTING](https://github.com/oracle/odpi/blob/master/CONTRIBUTING.md)
+See [CONTRIBUTING](https://github.com/oracle/odpi/blob/master/CONTRIBUTING.md).
 
 ## Drivers Using ODPI-C
 
-Drivers based on ODPI-C that are maintained by Oracle:
-* [cx_Oracle](https://oracle.github.io/python-cx_Oracle) driver for Python.
-* [node-oracledb](https://github.com/oracle/node-oracledb/tree/dev-2.0) for
-  Node.js.
+Oracle Drivers:
+* [cx_Oracle](https://oracle.github.io/python-cx_Oracle) Python interface.
+* [node-oracledb](https://oracle.github.io/node-oracledb) Node.js module.
 
-Other communities are also using ODPI-C for Rust and Go drivers.
+Third-party Drivers:
+* [go-goracle](https://gopkg.in/goracle.v2) Go Driver.
+* [mirmir](https://github.com/rustyhorde/mimir)  Rust Bindings.
+* [odpic-raw](https://github.com/leptonyu/odpic-raw)  Haskell Raw Bindings.
+* [ruby-ODPI ](https://github.com/kubo/ruby-odpi) Ruby Interface.
+* [rust-oracle ](https://github.com/kubo/rust-oracle) Driver for Rust.
 
 ## License
 
-Copyright (c) 2016, 2017 Oracle and/or its affiliates.  All rights reserved.
+Copyright (c) 2016, 2018 Oracle and/or its affiliates.  All rights reserved.
 
 This program is free software: you can modify it and/or redistribute it under
 the terms of:

package/odpi/embed/README.md

@@ -1,4 +1,4 @@
 This directory contains the file dpi.c which can be used to embed ODPI-C
 within your project without having to manage the individual files that make up
-the library. The files can also be compiled independently is that is preferred.
+the library. The files can also be compiled independently if that is preferred.
 

package/odpi/include/dpi.h

@@ -44,7 +44,7 @@
 
 // define ODPI-C version information
 #define DPI_MAJOR_VERSION   2
-#define DPI_MINOR_VERSION   2
+#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
@@ -297,6 +299,7 @@ typedef enum {
 
 // statement types
 typedef enum {
+    DPI_STMT_TYPE_UNKNOWN = 0,
     DPI_STMT_TYPE_SELECT = 1,                   // OCI_STMT_SELECT
     DPI_STMT_TYPE_UPDATE = 2,                   // OCI_STMT_UPDATE
     DPI_STMT_TYPE_DELETE = 3,                   // OCI_STMT_DELETE
@@ -307,12 +310,23 @@ typedef enum {
     DPI_STMT_TYPE_BEGIN = 8,                    // OCI_STMT_BEGIN
     DPI_STMT_TYPE_DECLARE = 9,                  // OCI_STMT_DECLARE
     DPI_STMT_TYPE_CALL = 10,                    // OCI_STMT_CALL
-    DPI_STMT_TYPE_MERGE = 16                    // OCI_STMT_MERGE
+    DPI_STMT_TYPE_EXPLAIN_PLAN = 15,
+    DPI_STMT_TYPE_MERGE = 16,                   // OCI_STMT_MERGE
+    DPI_STMT_TYPE_ROLLBACK = 17,
+    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
@@ -558,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
@@ -602,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
@@ -616,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
@@ -849,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)
@@ -1312,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);
 
@@ -1327,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)
@@ -1485,13 +1525,17 @@ int dpiVar_addRef(dpiVar *var);
 int dpiVar_copyData(dpiVar *var, uint32_t pos, dpiVar *sourceVar,
         uint32_t sourcePos);
 
-// return pointer to array of dpiData structures for transferring data
-// this is needed for DML returning where the number of elements is modified
+// deprecated: use dpiVar_getReturnedData() instead
 int dpiVar_getData(dpiVar *var, uint32_t *numElements, dpiData **data);
 
 // return the number of elements in a PL/SQL index-by table
 int dpiVar_getNumElementsInArray(dpiVar *var, uint32_t *numElements);
 
+// return pointer to array of dpiData structures for transferring data
+// this is needed for DML returning where the number of elements is modified
+int dpiVar_getReturnedData(dpiVar *var, uint32_t pos, uint32_t *numElements,
+        dpiData **data);
+
 // return the size in bytes of the buffer used for fetching/binding
 int dpiVar_getSizeInBytes(dpiVar *var, uint32_t *sizeInBytes);
 

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;
     }
 
@@ -1213,6 +1216,14 @@ int dpiConn_create(const dpiContext *context, const char *userName,
         return dpiGen__endPublicFn(context, DPI_FAILURE, &error);
     }
 
+    // newPassword and edition cannot be specified at the same time
+    if (createParams->newPassword && createParams->newPasswordLength > 0 &&
+            commonParams->edition && commonParams->editionLength > 0) {
+        dpiError__set(&error, "check edition/new password",
+                DPI_ERR_NO_EDITION_WITH_NEW_PASSWORD);
+        return dpiGen__endPublicFn(context, DPI_FAILURE, &error);
+    }
+
     // handle case where pool is specified
     if (createParams->pool) {
         if (dpiGen__checkHandle(createParams->pool, DPI_HTYPE_POOL,
@@ -1285,8 +1296,9 @@ int dpiConn_deqObject(dpiConn *conn, const char *queueName,
         }
         return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
     }
-    dpiOci__rawPtr(conn->env->handle, ociMsgId, (void**) msgId);
-    dpiOci__rawSize(conn->env->handle, ociMsgId, msgIdLength);
+    if (dpiMsgProps__extractMsgId(props, ociMsgId, msgId, msgIdLength,
+            &error) < 0)
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
     return dpiGen__endPublicFn(conn, DPI_SUCCESS, &error);
 }
 
@@ -1323,8 +1335,9 @@ int dpiConn_enqObject(dpiConn *conn, const char *queueName,
             payload->type->tdo, &payload->instance, &payload->indicator,
             &ociMsgId, &error) < 0)
         return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
-    dpiOci__rawPtr(conn->env->handle, ociMsgId, (void**) msgId);
-    dpiOci__rawSize(conn->env->handle, ociMsgId, msgIdLength);
+    if (dpiMsgProps__extractMsgId(props, ociMsgId, msgId, msgIdLength,
+            &error) < 0)
+        return dpiGen__endPublicFn(conn, DPI_FAILURE, &error);
     return dpiGen__endPublicFn(conn, DPI_SUCCESS, &error);
 }
 
@@ -1932,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/dpiError.c

@@ -38,6 +38,10 @@ int dpiError__check(dpiError *error, int status, dpiConn *conn,
         return DPI_FAILURE;
     else if (!error->handle)
         return dpiError__set(error, action, DPI_ERR_ERR_NOT_INITIALIZED);
+    else if (status != DPI_OCI_ERROR && status != DPI_OCI_NO_DATA)
+        return dpiError__set(error, action,
+                DPI_ERR_UNEXPECTED_OCI_RETURN_VALUE, status,
+                error->buffer->fnName);
 
     // fetch OCI error
     error->buffer->action = action;

package/odpi/src/dpiErrorMessages.h

@@ -55,7 +55,6 @@ static const char* const dpiErrorMessages[DPI_ERR_MAX - DPI_ERR_NO_ERR] = {
     "DPI-1035: size of the transaction ID is %u and cannot exceed %u", // DPI_ERR_TRANS_ID_TOO_LARGE
     "DPI-1036: size of the branch ID is %u and cannot exceed %u", // DPI_ERR_BRANCH_ID_TOO_LARGE
     "DPI-1037: column at array position %u fetched with error %u", // DPI_ERR_COLUMN_FETCH
-    "DPI-1038: Oracle client %u.%u cannot be used because ODPI-C was compiled with Oracle client %u.%u", // DPI_ERR_OCI_VERSION_NOT_SUPPORTED
     "DPI-1039: statement was already closed", // DPI_ERR_STMT_CLOSED
     "DPI-1040: LOB was already closed", // DPI_ERR_LOB_CLOSED
     "DPI-1041: invalid character set id %d", // DPI_ERR_INVALID_CHARSET_ID
@@ -65,17 +64,20 @@ static const char* const dpiErrorMessages[DPI_ERR_MAX - DPI_ERR_NO_ERR] = {
     "DPI-1045: strings converted to numbers can only be up to 172 characters long", // DPI_ERR_NUMBER_STRING_TOO_LONG
     "DPI-1046: parameter %s cannot be a NULL pointer", // DPI_ERR_NULL_POINTER_PARAMETER
     "DPI-1047: %s-bit Oracle Client library cannot be loaded: \"%s\". See https://oracle.github.io/odpi/doc/installation.html#%s for help", // DPI_ERR_LOAD_LIBRARY
-    "DPI-1048: unused 1", // DPI_ERR_UNUSED_1
     "DPI-1049: symbol %s not found in OCI library", // DPI_ERR_LOAD_SYMBOL
     "DPI-1050: Oracle Client library must be at version 11.2 or higher", // DPI_ERR_LIBRARY_TOO_OLD
-    "DPI-1051: conversion to %s results in overflow", // DPI_ERR_OVERFLOW
     "DPI-1052: unable to get NLS environment variable", // DPI_ERR_NLS_ENV_VAR_GET,
     "DPI-1053: parameter %s cannot be a NULL pointer while corresponding length parameter is non-zero", // DPI_ERR_PTR_LENGTH_MISMATCH
-    "DPI-1054: unused 2", // DPI_ERR_UNUSED_2
     "DPI-1055: value is not a number (NaN) and cannot be used in Oracle numbers", // DPI_ERR_NAN
     "DPI-1056: found object of type %.*s.%.*s when expecting object of type %.*s.%.*s", // DPI_ERR_WRONG_TYPE
     "DPI-1057: buffer size of %u is too large (max %u)", // DPI_ERR_BUFFER_SIZE_TOO_LARGE
     "DPI-1058: edition not supported with connection class", // DPI_ERR_NO_EDITION_WITH_CONN_CLASS
     "DPI-1059: bind variables are not supported in DDL statements", // DPI_ERR_NO_BIND_VARS_IN_DDL
+    "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
 };