Improve PL/SQL Index-by array bind messages, based on PR #470 (Hariprasad Kulkarni)

cjbj · cjbj · commit 3c36bad8c9de · 2017-03-16T15:47:14.000+11:00
diff --git a/src/njs/src/njsConnection.cpp b/src/njs/src/njsConnection.cpp
@@ -1367,6 +1367,7 @@ void Connection::GetInBindParamsScalar(Local<Value> v8val, Bind* bind,
   ;
 }
 
+
 /*****************************************************************************/
 /*
    DESCRIPTION
@@ -1431,8 +1432,20 @@ void Connection::GetInBindParamsArray(Local<Array> va8vals, Bind *bind,
       case NJS_DATATYPE_STR:
         if (vtype != NJS_VALUETYPE_NULL && vtype != NJS_VALUETYPE_STRING)
         {
-          executeBaton->error = NJSMessages::getErrorMsg(
-                                     errIncompatibleTypeArrayBind);
+          if ( !bind->key.empty () )
+          {
+            executeBaton->error = NJSMessages::getErrorMsg ( 
+                                               errIncompatibleTypeArrayBind,
+                                               index,
+                                               bind->key.c_str () );
+          }
+          else
+          {
+            executeBaton->error = NJSMessages::getErrorMsg (
+                                  errIncompatibleTypeArrayIndexBind,
+                                  index,
+                                  executeBaton->binds.size() );
+          }
           goto exitGetInBindParamsArray;
         }
         else
@@ -1450,8 +1463,21 @@ void Connection::GetInBindParamsArray(Local<Array> va8vals, Bind *bind,
         if (vtype != NJS_VALUETYPE_NULL && vtype != NJS_VALUETYPE_INTEGER &&
             vtype != NJS_VALUETYPE_UINTEGER && vtype != NJS_VALUETYPE_NUMBER)
         {
-          executeBaton->error = NJSMessages::getErrorMsg(
-                                          errIncompatibleTypeArrayBind);
+          if ( !bind->key.empty () )
+          {
+            executeBaton->error = NJSMessages::getErrorMsg (
+                                              errIncompatibleTypeArrayBind,
+                                              index,
+                                              bind->key.c_str () );
+          }
+          else
+          {
+            executeBaton->error = NJSMessages::getErrorMsg (
+                                 errIncompatibleTypeArrayIndexBind,
+                                 index,
+                                 executeBaton->binds.size ());
+
+          }
           goto exitGetInBindParamsArray;
         }
         break;
diff --git a/src/njs/src/njsMessages.cpp b/src/njs/src/njsMessages.cpp
@@ -73,7 +73,7 @@ static const char *errMsg[] =
   "NJS-034: data type is unsupported for array bind", // errInvalidTypeForArrayBind
   "NJS-035: maxArraySize is required for IN OUT array bind", // errReqdMaxArraySize
   "NJS-036: given array is of size greater than maxArraySize", // errInvalidArraySize
-  "NJS-037: incompatible type of value provided", // errIncompatibleTypeArrayBind
+  "NJS-037: invalid data type at array index %d for bind \"%s\"", // errIncompatibleTypeArrayBind
   "NJS-038: maxArraySize value should be greater than zero", // errInvalidValueArrayBind
   "NJS-039: empty array is not allowed for IN bind", // errEmptyArray
   "NJS-040: connection request timeout",  // errConnRequestTimeout
@@ -88,6 +88,7 @@ static const char *errMsg[] =
   "NJS-049: Temporary LOBs were open when the connection was closed", // errBusyConnTEMPLOB
   "NJS-050: data must be shorter than %d", // errBindValueTooLarge
   "NJS-051: \"%s\" must be less than %d", // errMaxValueTooLarge
+  "NJS-052: invalid data type at array index %d for bind position %d", // errIncompatibleTypeArrayIndexBind
 };
 
 string NJSMessages::getErrorMsg ( NJSErrorType err, ... )
diff --git a/src/njs/src/njsMessages.h b/src/njs/src/njsMessages.h
@@ -87,6 +87,7 @@ typedef enum
   errBusyConnTEMPLOB,
   errBindValueTooLarge,
   errMaxValueTooLarge,
+  errIncompatibleTypeArrayIndexBind,
 
   // New ones should be added here
 
diff --git a/test/list.txt b/test/list.txt
@@ -617,19 +617,22 @@ Overview of node-oracledb functional tests
     42.4 in PL/SQL, the maximum size is 32767
       - 42.4.1 when data length is 200
 
-43. plsqlBindIndexedTable1.js.js
+43. plsqlBindIndexedTable1.js
     43.1 binding PL/SQL indexed table
-        43.1.1 binding PL/SQL indexed table IN
-        43.1.2 binding PL/SQL indexed table IN OUT
-        43.1.3 binding PL/SQL indexed table OUT
+        43.1.1 binding PL/SQL indexed table IN by name
+        43.1.2 binding PL/SQL indexed table IN by position
+        43.1.3 binding PL/SQL indexed table IN OUT
+        43.1.4 binding PL/SQL indexed table OUT
     43.2 test exceptions when using PL/SQL indexed table bindings
         43.2.1 maxArraySize is ignored when specifying BIND_IN
         43.2.2 maxArraySize is mandatory for BIND_INOUT
-        42.2.3 maxArraySize cannot smaller than the number of array elements
-        43.2.4 DATE type has not been supported yet
-        43.2.5 negative case (string): incorrect type of array element
+        43.2.3 maxArraySize cannot smaller than the number of array elements
+        43.2.4 DATE type indexed table has not been supported yet
+        43.2.5 negative case (string): incorrect type of array elements
         43.2.6 negative case (number): incorrect type of array element
         43.2.7 supports binding by position
+        43.2.8 negative case: incorrect type of array elements - bind by pos1
+        43.2.9 negative case: incorrect type of array elements - bind by pos2
     43.3 binding PL/SQL scalar
         43.3.1 binding PL/SQL scalar IN
         43.3.2 binding PL/SQL scalar IN/OUT
@@ -643,7 +646,7 @@ Overview of node-oracledb functional tests
       - 43.4.5 negative case: large value
         43.4.6 negative case: < 0
         43.4.7 negative case: = 0
-        43.4.8 negative case: assigning a string to it
+        43.4.8 negative case: assign a string to it
         43.4.9 negative case: NaN
 
 44. plsqlBindIndexedTable2.js.js
diff --git a/test/plsqlBindIndexedTable1.js b/test/plsqlBindIndexedTable1.js
@@ -508,7 +508,7 @@ describe('43. plsqlBindIndexedTable1.js', function() {
         function(err, result) {
           should.exist(err);
           (err.message).should.startWith('NJS-037:');
-          // NJS-037: incompatible type of value provided.
+          // NJS-037: invalid data type at array index %d for bind \"%s\"
           should.not.exist(result);
           done();
         }
@@ -525,7 +525,7 @@ describe('43. plsqlBindIndexedTable1.js', function() {
         function(err, result) {
           should.exist(err);
           (err.message).should.startWith('NJS-037:');
-          // NJS-037: incompatible type of value provided.
+          // NJS-037: NJS-037: invalid data type at array index %d for bind \"%s\"
           should.not.exist(result);
           done();
         }
@@ -547,6 +547,40 @@ describe('43. plsqlBindIndexedTable1.js', function() {
       );
     });
 
+    it('43.2.8 negative case: incorrect type of array elements - bind by pos1',
+       function (done ){
+         var bindvars = [ { type : oracledb.STRING, dir: oracledb.BIND_IN, val : ['hello', 1] } ];
+         connection.execute (
+           "BEGIN nodb_plsqlbindpack21.test4 ( :1 ); END;",
+           bindvars,
+           function ( err, result ) {
+             should.exist ( err ) ;
+             (err.message).should.startWith ( 'NJS-052:');
+             // NJS-052: invalid data type at array index %d for bind position %d
+             should.not.exist ( result );
+             done ();
+           }
+         );
+       }
+     );
+
+    it('43.2.9 negative case: incorrect type of array elements - bind by pos2',
+      function ( done ) {
+        var bindvars = [ { type : oracledb.NUMBER, dir : oracledb.BIND_IN, val : [ 1, 'hello' ] }];
+        connection.execute (
+          "BEGIN nodb_plsqlbindpack21.test1 ( :p ) ; END;",
+          bindvars,
+          function ( err, result ) {
+            should.exist ( err ) ;
+            (err.message).should.startWith ( 'NJS-052:');
+            // NJS-052:  NJS-037: invalid data type at array index %d for bind \"%s\"
+            should.not.exist ( result ) ;
+            done();
+          }
+       );
+      }
+    );
+
   }); // 43.2
 
   describe('43.3 binding PL/SQL scalar', function() {
@@ -718,7 +752,7 @@ describe('43. plsqlBindIndexedTable1.js', function() {
       ], done);
     });
 
-    it('43.3.4 binding PL/SQL scalar OUT by postion', function(done) {
+    it('43.3.4 binding PL/SQL scalar OUT by position', function(done) {
       async.series([
         function(callback) {
           var proc = "CREATE OR REPLACE\n" +
