Replace bootstrap "Error: Cannot find module ../build/Debug/oracledb" with new message NJS-045.

Author: cjbj

lib/oracledb.js

@@ -31,10 +31,18 @@ var getConnectionPromisified;
 try {
   oracledbCLib =  require('../build/Release/oracledb');
 } catch (err) {
-  if (err.code === 'MODULE_NOT_FOUND') {
-    oracledbCLib = require('../build/Debug/oracledb');
-  } else {
+  if (err.code !== 'MODULE_NOT_FOUND') {
     throw err;
+  } else {
+    try {
+      oracledbCLib = require('../build/Debug/oracledb');
+    } catch (err) {
+      if (err.code !== 'MODULE_NOT_FOUND') {
+        throw err;
+      } else {
+        throw new Error(nodbUtil.getErrorMessage('NJS-045'));
+      }
+    }
   }
 }
 

lib/util.js

@@ -31,7 +31,8 @@ var errorMessages = {
   'NJS-040': 'NJS-040: connection request timeout',
   'NJS-041': 'NJS-041: cannot convert ResultSet to QueryStream after invoking methods',
   'NJS-042': 'NJS-042: cannot invoke ResultSet methods after converting to QueryStream',
-  'NJS-043': "NJS-043: ResultSet already converted to QueryStream"
+  'NJS-043': "NJS-043: ResultSet already converted to QueryStream",
+  'NJS-045': "NJS-045: cannot load the oracledb add-on binary"
 };
 
 // getErrorMessage is used to get and format error messages to make throwing errors

src/njs/src/njsMessages.cpp

@@ -32,7 +32,7 @@ using namespace std;
 #include "njsMessages.h"
 
 // Maximum buffer size to compose error message
-#define MAX_ERROR_MSG_LEN 1024
+#define NJS_MAX_ERROR_MSG_LEN 1024
 
 static const char *errMsg[] =
 {
@@ -77,25 +77,24 @@ static const char *errMsg[] =
   "NJS-038: maxArraySize value should be greater than 0", // errInvalidValueArrayBind
   "NJS-039: empty array is not allowed for IN bind", // errEmptyArray
   "NJS-040: connection request timeout",  // errConnRequestTimeout
-
   "NJS-041: cannot convert ResultSet to QueryStream after invoking methods", // errCannotConvertRsToStream
   "NJS-042: cannot invoke ResultSet methods after converting to QueryStream", // errCannotInvokeRsMethods
   "NJS-043: ResultSet already converted to QueryStream", // errResultSetAlreadyConverted
   "NJS-044: named JSON object is not expected in this context", // errNamedJSON
-
+  "NJS-045: cannot load the oracledb add-on binary", // errCannotLoadBinary
 };
 
 string NJSMessages::getErrorMsg ( NJSErrorType err, ... )
 {
-  char msg[MAX_ERROR_MSG_LEN + 1]; // buffer to get formatted/substituted error msg
+  char msg[NJS_MAX_ERROR_MSG_LEN + 1]; // buffer to get formatted/substituted error msg
   va_list vlist;                   // variable argument list
   std::string str;
 
   if ( err > 0 && err < errMaxErrors )
   {
     // print all specified arguments
     va_start (vlist, err);
-    if ( vsnprintf (msg, MAX_ERROR_MSG_LEN, errMsg[err], vlist) <= 0)
+    if ( vsnprintf (msg, NJS_MAX_ERROR_MSG_LEN, errMsg[err], vlist) <= 0)
     {
       msg[0] = 0;
     }

src/njs/src/njsMessages.h

@@ -80,6 +80,7 @@ typedef enum
   errCannotInvokeRsMethods,
   errResultSetAlreadyConverted,
   errNamedJSON,
+  errCannotLoadBinary,
 
   // New ones should be added here