Fix some LOB BIND_INOUT issues with nulls and empty strings

Author: cjbj

src/njs/src/njsConnection.cpp

@@ -2215,7 +2215,6 @@ void Connection::LOB2StringOrBuffer ( eBaton* executeBaton, unsigned int index,
  */
 void Connection::String2CLOB ( eBaton* executeBaton, unsigned int index )
 {
-  executeBaton->binds[index]->type = DpiClob;
   StringOrBuffer2LOB ( executeBaton, index, OCI_TEMP_CLOB );
 }
 
@@ -2235,7 +2234,6 @@ void Connection::String2CLOB ( eBaton* executeBaton, unsigned int index )
  */
 void Connection::Buffer2BLOB ( eBaton* executeBaton, unsigned int index )
 {
-  executeBaton->binds[index]->type = DpiBlob;
   StringOrBuffer2LOB ( executeBaton, index, OCI_TEMP_BLOB );
 }
 
@@ -2272,10 +2270,14 @@ void Connection::StringOrBuffer2LOB ( eBaton* executeBaton, unsigned int index,
                        executeBaton->dpiconn->getErrh (),
                        lobLocator, lobType );
 
-  Lob::write ( ( DpiHandle * ) executeBaton->dpiconn->getSvch (),
-               ( DpiHandle * ) executeBaton->dpiconn->getErrh (),
-               ( Descriptor * ) lobLocator, byteAmount, charAmount, offset,
-               bind->value, bufLen );
+  if ( byteAmount || charAmount )
+  {
+    // Write into Temp LOB only in case of non-empty inputs
+    Lob::write ( ( DpiHandle * ) executeBaton->dpiconn->getSvch (),
+                 ( DpiHandle * ) executeBaton->dpiconn->getErrh (),
+                 ( Descriptor * ) lobLocator, byteAmount, charAmount, offset,
+                 bind->value, bufLen );
+  }
 
   // Free the memory allocated to store js input string/buffer and
   // re-allocate to store lobLocator
@@ -2383,60 +2385,52 @@ void Connection::ConvertStringOrBuffer2LOB ( eBaton* executeBaton,
                                              unsigned int index )
 {
   Bind *bind = executeBaton->binds[index];
+  DPI_SZ_TYPE size = 0;
+
+  if ( !bind->isOut && !bind->isInOut )
+  {
+    // Case for BIND_IN
+    size = *bind->len;
+  }
+  else if ( bind->isInOut )
+  {
+    // Case for BIND_INOUT
+    size = ( bind->maxSize >= *( bind->len ) ) ? bind->maxSize : *( bind->len );
+  }
+  else if ( bind->isOut && !bind->isInOut )
+  {
+    // Case for BIND_OUT
+    size = bind->maxSize;
+  }
 
-  // In case of IN or INOUT bind convert string/buffer to LOB if input data
-  // is not NULL and input data size more than 32k for strict IN binds or
-  // maxSize more than 32k for INOUT binds
-  if ( ( ( !bind->isOut || bind->isInOut ) && *bind->ind != -1 ) &&
-       ( ( !bind->isOut && *bind->len > NJS_THRESHOLD_SIZE_PLSQL_STRING_ARG ) ||
-         ( bind->isInOut && bind->maxSize > NJS_THRESHOLD_SIZE_PLSQL_STRING_ARG
-         ) ) )
+  if ( size > NJS_THRESHOLD_SIZE_PLSQL_STRING_ARG )
   {
-    // This block is only for BIND_IN case
     ExtBind* extBind = new ExtBind ( NJS_EXTBIND_LOB );
     if ( !extBind )
     {
       executeBaton->error = NJSMessages::getErrorMsg
                                     ( errInsufficientMemory );
       goto exitConvertStringOrBuffer2LOB;
     }
-    // Set a flag to know that type conversion happened
-    // This helps in later steps to clean LOB resources
-    extBind->fields.extLob.isStringBuffer2LOB = true;
-    executeBaton->extBinds[index]             = extBind;
-    extBind->fields.extLob.maxSize            = bind->maxSize;
+    extBind->fields.extLob.maxSize = bind->maxSize;
 
-    if ( bind->type == DpiVarChar )
+    // Convert the input data into Temp LOB for IN and INOUT binds
+    if ( !bind->isOut || bind->isInOut )
     {
-      String2CLOB ( executeBaton, index );
-    }
-    else
-    {
-      Buffer2BLOB ( executeBaton, index );
-    }
-    // Set a flag to know that type conversion happened
-    // This helps in later steps to clean LOB resources
-    extBind->fields.extLob.isStringBuffer2LOB = true;
-    executeBaton->extBinds[index]             = extBind;
-  }
-  else if ( ( bind->isOut || bind->isInOut ) &&
-            bind->maxSize > NJS_THRESHOLD_SIZE_PLSQL_STRING_ARG )
-  {
-    // This block is only for BIND_OUT case
-    ExtBind* extBind = new ExtBind ( NJS_EXTBIND_LOB );
+      switch ( bind->type )
+      {
+        case DpiVarChar:
+          String2CLOB ( executeBaton, index );
+          break;
 
-    if ( !extBind )
-    {
-      executeBaton->error = NJSMessages::getErrorMsg
-                                    ( errInsufficientMemory );
-      goto exitConvertStringOrBuffer2LOB;
+        case DpiRaw:
+          Buffer2BLOB ( executeBaton, index );
+          break;
+      }
     }
 
-    extBind->fields.extLob.maxSize = bind->maxSize;
-
     // Set a flag to know that type conversion happened
-    // This helps in later steps for converting LOB to String/Buffer and
-    // clean LOB resources
+    // This helps in later steps to clean LOB resources
     extBind->fields.extLob.isStringBuffer2LOB = true;
     executeBaton->extBinds[index]             = extBind;
 

test/clobPlsqlBindAsString_bindinout.js

@@ -313,7 +313,7 @@ describe('76.clobPlsqlBindAsString_bindinout.js', function() {
       ], done);
     }); // 76.1.2
 
-    it.skip('76.1.3 works with EMPTY_CLOB and maxSize set to (64K - 1)', function(done) {
+    it('76.1.3 works with EMPTY_CLOB and maxSize set to (64K - 1)', function(done) {
       var sequence = getID();
       var bindVar = {
         i: { val: sequence, dir: oracledb.BIND_IN, type: oracledb.NUMBER },
@@ -353,7 +353,7 @@ describe('76.clobPlsqlBindAsString_bindinout.js', function() {
       plsqlBindInOut(sqlRun, bindVar, null, null, false, client11gPlus, done);
     }); // 76.1.5
 
-    it.skip('76.1.6 works with null and maxSize set to (64K - 1)', function(done) {
+    it('76.1.6 works with null and maxSize set to (64K - 1)', function(done) {
       var sequence = getID();
       var bindVar = {
         i: { val: sequence, dir: oracledb.BIND_IN, type: oracledb.NUMBER },
@@ -383,7 +383,7 @@ describe('76.clobPlsqlBindAsString_bindinout.js', function() {
       plsqlBindInOut(sqlRun, bindVar, "", null, false, client11gPlus, done);
     }); // 76.1.8
 
-    it.skip('76.1.9 works with empty string and maxSize set to (64K - 1)', function(done) {
+    it('76.1.9 works with empty string and maxSize set to (64K - 1)', function(done) {
       var sequence = getID();
       var bindVar = {
         i: { val: sequence, dir: oracledb.BIND_IN, type: oracledb.NUMBER },
@@ -413,7 +413,7 @@ describe('76.clobPlsqlBindAsString_bindinout.js', function() {
       plsqlBindInOut(sqlRun, bindVar, undefined, null, false, client11gPlus, done);
     }); // 76.1.11
 
-    it.skip('76.1.12 works with undefined and maxSize set to (64K - 1)', function(done) {
+    it('76.1.12 works with undefined and maxSize set to (64K - 1)', function(done) {
       var sequence = getID();
       var bindVar = {
         i: { val: sequence, dir: oracledb.BIND_IN, type: oracledb.NUMBER },

test/list.txt

@@ -1180,16 +1180,16 @@ Overview of node-oracledb functional tests
     76.1 CLOB, PLSQL, BIND_INOUT
        76.1.1 works with EMPTY_CLOB
        76.1.2 works with EMPTY_CLOB and maxSize set to 1
-     - 76.1.3 works with EMPTY_CLOB and maxSize set to (64K - 1)
+       76.1.3 works with EMPTY_CLOB and maxSize set to (64K - 1)
        76.1.4 works with null
        76.1.5 works with null and maxSize set to 1
-     - 76.1.6 works with null and maxSize set to (64K - 1)
+       76.1.6 works with null and maxSize set to (64K - 1)
        76.1.7 works with empty string
        76.1.8 works with empty string and maxSize set to 1
-     - 76.1.9 works with empty string and maxSize set to (64K - 1)
+       76.1.9 works with empty string and maxSize set to (64K - 1)
        76.1.10 works with undefined
        76.1.11 works with undefined and maxSize set to 1
-     - 76.1.12 works with undefined and maxSize set to (64K - 1)
+       76.1.12 works with undefined and maxSize set to (64K - 1)
        76.1.13 works with NaN
        76.1.14 works with 0
        76.1.15 works with String length 32K