Validate objects used in bind-by-position array and display NJS-044

Author: cjbj

src/njs/src/njsConnection.cpp

@@ -662,7 +662,7 @@ void Connection::GetBinds (Handle<Object> bindobj, eBaton* executeBaton)
     bind->key = ":"+std::string(str);
     Local<Value> val__ = bindobj->Get(Nan::New<v8::String>((char*)str.c_str(),
                            (int) str.length()).ToLocalChecked());
-    Connection::GetBindUnit(val__, bind, executeBaton);
+    Connection::GetBindUnit(val__, bind, false, executeBaton);
     if(!executeBaton->error.empty())
       goto exitGetBinds;
   }
@@ -689,7 +689,7 @@ void Connection::GetBinds (Handle<Array> binds, eBaton* executeBaton)
   {
     Bind* bind = new Bind;
     Local<Value> val__ = binds->Get(index);
-    GetBindUnit(val__, bind, executeBaton);
+    GetBindUnit(val__, bind, true, executeBaton);
     if(!executeBaton->error.empty()) goto exitGetBinds;
   }
   exitGetBinds:
@@ -702,9 +702,12 @@ void Connection::GetBinds (Handle<Array> binds, eBaton* executeBaton)
      Processing each bind varible
 
    PARAMETERS:
-     Handle value, eBaton struct
+     val          - handle value
+     bind         - one bind structure to initialize
+     array        - array input or JSON input
+     executeBaton - eBaton structure
 */
-void Connection::GetBindUnit (Local<Value> val, Bind* bind,
+void Connection::GetBindUnit (Local<Value> val, Bind* bind, bool array,
                                        eBaton* executeBaton)
 {
   Nan::HandleScope scope;
@@ -713,6 +716,46 @@ void Connection::GetBindUnit (Local<Value> val, Bind* bind,
   if(val->IsObject() && !val->IsDate() && !Buffer::HasInstance(val))
   {
     Local<Object> bind_unit = val->ToObject();
+
+    if ( array )
+    {
+      // In case of array binds, JSON objects are expected to be unnamed.
+      // Named json object gets confused as we look for "dir", "type",
+      // "maxSize"  key words, but "name" will not match.
+      // Array binds syntax
+      //    [ id, name, {type : oracledb.STRING, dir : oracledb.BIND_OUT}]
+      // the 3rd parameter is unnamed JSON object.
+      // [ id, n, { a: { type : oracledb.STRING, dir : oracledb.BIND_OUT} }]
+      // will fail now.
+      Local<Array> keys = bind_unit->GetOwnPropertyNames ();
+      if ( keys->Length () > 0 )
+      {
+        bool valid = false;
+
+        for ( unsigned int index = 0; !valid && ( index < keys->Length ()) ;
+            index ++ )
+        {
+          std::string key;
+
+          Local<String> temp = keys->Get (index).As<String> ();
+          NJSString ( key, temp );
+
+          if ( ( key.compare ( "dir" ) == 0 ) ||
+               ( key.compare ( "type" ) == 0 ) ||
+               ( key.compare ( "maxSize" ) == 0 ) )
+          {
+            valid = true;
+          }
+        }
+
+        if ( !valid )
+        {
+          executeBaton->error = NJSMessages::getErrorMsg ( errNamedJSON );
+          goto exitGetBindUnit;
+        }
+      }
+    }
+
     NJS_GET_UINT_FROM_JSON   ( dir, executeBaton->error,
                                bind_unit, "dir", 1, exitGetBindUnit );
     NJS_GET_UINT_FROM_JSON   ( bind->type, executeBaton->error,

src/njs/src/njsConnection.h

@@ -357,7 +357,7 @@ class Connection: public Nan::ObjectWrap
   static void GetOptions (Handle<Object> options, eBaton* executeBaton);
   static void GetBinds (Handle<Object> bindobj, eBaton* executeBaton);
   static void GetBinds (Handle<Array> bindarray, eBaton* executeBaton);
-  static void GetBindUnit (Local<Value> bindtypes, Bind* bind,
+  static void GetBindUnit (Local<Value> bindtypes, Bind* bind, bool array,
                            eBaton* executeBaton);
   static void GetInBindParams(Local<Value> v8val, Bind *bind, eBaton *executeBaton, BindType bindType);
   static void GetInBindParamsScalar(Local<Value> v8val, Bind *bind, eBaton *executeBaton, BindType bindType);

src/njs/src/njsMessages.cpp

@@ -77,9 +77,12 @@ 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
+
 };
 
 string NJSMessages::getErrorMsg ( NJSErrorType err, ... )

src/njs/src/njsMessages.h

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

test/binding.js

@@ -400,25 +400,22 @@ describe('4. binding.js', function() {
       );
     })
 
-    it.skip('4.2.2 array binding with mixing JSON should throw an error', function(done) {
+    it('4.2.2 array binding with mixing JSON should throw an error', function(done) {
       connection.execute(
         insert,
         param2,
         options,
         function(err, result) {
-          should.exist(err);  // pending to fix
-          result.rowsAffected.should.be.exactly(1);
-          //result.outBinds[0].should.eql([1]);
-          //console.log(result);
+          should.exist(err);
+          (err.message).should.startWith('NJS-044');
+          // NJS-044: named JSON object is not expected in this context
           connection.execute(
             "SELECT * FROM nodb_binding",
             [],
             options,
             function(err, result) {
               should.not.exist(err);
-              //console.log(result);
-              result.rows[0].ID.should.be.exactly(2);
-              result.rows[0].NAME.should.eql('changjie');
+              (result.rows).should.be.eql([]);
               done();
             }
           );