Fix build error with Oracle client 11.2.0.1 and 11.2.0.2

Author: cjbj

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Change Log
 
+## node-oracledb v1.9.3 (24 May 2016)
+
+- Fix error with `OCI_ERROR_MAXMSG_SIZE2` when building with Oracle client 11.2.0.1 and 11.2.0.2.
+
 ## node-oracledb v1.9.2 (23 May 2016)
 
-- Fix `results.metaData` for queries with `{resultSet: true}`
+- Fix `results.metaData` for queries with `{resultSet: true}`.
 
 ## node-oracledb v1.9.1 (18 May 2016)
 

src/dpi/src/dpiUtils.cpp

@@ -38,6 +38,12 @@
   #define  snprintf  _snprintf
 #endif
 
+#ifdef OCI_ERROR_MAXMSG_SIZE2
+/* A bigger message size is defined from 11.2.0.3 onwards */
+#define DPIUTILS_OCI_ERR_MAX_SIZE OCI_ERROR_MAXMSG_SIZE2
+#else
+#define DPIUTILS_OCI_ERR_MAX_SIZE OCI_ERROR_MAXMSG_SIZE
+#endif
 
 /*****************************************************************************/
 /*
@@ -67,12 +73,12 @@ static void ociCallCommon(sword rc, void *handle, ub4 errType)
   if (rc == OCI_INVALID_HANDLE)
     throw ExceptionImpl(DpiOciInvalidHandle);
 
-  OraText ociErrorMsg[OCI_ERROR_MAXMSG_SIZE2];
+  OraText ociErrorMsg[DPIUTILS_OCI_ERR_MAX_SIZE];
   sb4     ociErrorNo = 0;
-  memset(ociErrorMsg, 0, OCI_ERROR_MAXMSG_SIZE2);
+  memset(ociErrorMsg, 0, DPIUTILS_OCI_ERR_MAX_SIZE);
 
   rc = OCIErrorGet(handle, 1, NULL, &ociErrorNo, ociErrorMsg,
-                   OCI_ERROR_MAXMSG_SIZE2-1, errType);
+                   DPIUTILS_OCI_ERR_MAX_SIZE-1, errType);
   if (rc)
     throw ExceptionImpl(DpiErrUnkOciError);
   else