Fix 4K DML RETURNING strings with Oracle DB 11.2

Author: cjbj

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## node-oracledb v1.3.0 (DD Mon YYYY)
 
+- Fixed 11.2.0.4 DB-specific NULL output with DML RETURNING when string value is of size 4k.
+
 ## node-oracledb v1.2.0 (25 Sep 2015)
 
 - Added support for RAW data type.

src/njs/src/njsConnection.cpp

@@ -1061,7 +1061,6 @@ void Connection::Async_Execute (uv_work_t *req)
  */
 void Connection::PrepareAndBind (eBaton* executeBaton)
 {
-    DPI_SZ_TYPE maxSize = 0; // maxSize for out bind; add 1 for dml returning
     executeBaton->dpistmt = executeBaton->dpiconn->getStmt(executeBaton->sql);
     executeBaton->st = executeBaton->dpistmt->stmtType ();
     executeBaton->stmtIsReturning = executeBaton->dpistmt->isReturning ();
@@ -1110,26 +1109,15 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
             Connection::UpdateDateValue ( executeBaton, index ) ;
           }
 
-          /* 
-           * In case of DML Returning, add 1 extra byte, to check for
-           * more data 
-           */
-          if ( ( executeBaton->binds[index]->type == dpi::DpiVarChar) &&
-               ( executeBaton->stmtIsReturning ) )
-          {
-            maxSize = executeBaton->binds[index]->maxSize + 1;
-          }
-          else
-          {
-            maxSize = executeBaton->binds[index]->maxSize;
-          }
           // Bind by name
           executeBaton->dpistmt->bind(
                 (const unsigned char*)executeBaton->binds[index]->key.c_str(),
                 (int) executeBaton->binds[index]->key.length(), index,
                 executeBaton->binds[index]->type,
                 executeBaton->binds[index]->value,
-                (executeBaton->binds[index]->type == dpi::DpiVarChar ) ?
+                (executeBaton->stmtIsReturning &&
+                  executeBaton->binds[index]->isOut &&
+                  (executeBaton->binds[index]->type == dpi::DpiVarChar))?
                   (executeBaton->binds[index]->maxSize + 1) :
                   executeBaton->binds[index]->maxSize,
                 executeBaton->binds[index]->ind,
@@ -1168,25 +1156,13 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
             Connection::UpdateDateValue ( executeBaton, index ) ;
           }
 
-          /* 
-           * In case of DML Returning, add 1 extra byte, to check for
-           * more data 
-           */
-
-          if ( ( executeBaton->binds[index]->type == dpi::DpiVarChar) &&
-               ( executeBaton->stmtIsReturning ) )
-          {
-            maxSize = executeBaton->binds[index]->maxSize + 1;
-          }
-          else
-          {
-            maxSize = executeBaton->binds[index]->maxSize;
-          }
           // Bind by position
           executeBaton->dpistmt->bind(
                 index+1,executeBaton->binds[index]->type,
                 executeBaton->binds[index]->value,
-                (executeBaton->binds[index]->type == dpi::DpiVarChar ) ?
+                (executeBaton->stmtIsReturning &&
+                  executeBaton->binds[index]->isOut &&
+                  (executeBaton->binds[index]->type == dpi::DpiVarChar))?
                   (executeBaton->binds[index]->maxSize + 1) :
                    executeBaton->binds[index]->maxSize,
                 executeBaton->binds[index]->ind,

test/binding.js

@@ -675,7 +675,7 @@ describe('4. binding.js', function() {
       );
     })
 
-    it.skip('4.4.3 Negative - bind out data exceeds default length', function(done) {
+    it('4.4.3 Negative - bind out data exceeds default length', function(done) {
       connection.execute(
         "BEGIN :o := lpad('A',201,'x'); END;", 
          { o: { type: oracledb.STRING, dir : oracledb.BIND_OUT } },