Handle multiple OUT binds with DbObject type (Issue #1464)

Author: cjbj

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 **This release is under development and information may be incomplete**
 
+- Added code to handle multiple out-binds with ([DbObject](https://oracle.github.io/node-oracledb/doc/api.html#dbobjectclass)) correctly, earlier only
+  the first one was processed and was resulting in a crash.
+  ([Issue #1464](https://github.com/oracle/node-oracledb/issues/1464))
 
 - Added a [`connection.isHealthy()`](https://oracle.github.io/node-oracledb/doc/api.html#ishealthy)
   function to perform a local connection health check

src/njsVariable.c

@@ -921,12 +921,15 @@ bool njsVariable_processJS(njsVariable *vars, uint32_t numVars, napi_env env,
         if (var->bindDir != NJS_BIND_OUT &&
                 var->varTypeNum != DPI_ORACLE_TYPE_STMT)
             continue;
-        if (!var->dmlReturningBuffers)
-            return njsVariable_processBufferJS(var, var->buffer, env, baton);
-        for (j = 0; j < var->numDmlReturningBuffers; j++) {
-            buffer = &var->dmlReturningBuffers[j];
-            if (!njsVariable_processBufferJS(var, buffer, env, baton))
+        if (!var->dmlReturningBuffers) {
+            if (!njsVariable_processBufferJS(var, var->buffer, env, baton))
                 return false;
+        } else {
+            for (j = 0; j < var->numDmlReturningBuffers; j++) {
+                buffer = &var->dmlReturningBuffers[j];
+                if (!njsVariable_processBufferJS(var, buffer, env, baton))
+                    return false;
+            }
         }
     }
 

test/dbObjectOutBind.js

@@ -0,0 +1,112 @@
+/* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. */
+
+/******************************************************************************
+ *
+ * You may not use the identified files except in compliance with the Apache
+ * License, Version 2.0 (the "License.")
+ *
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, withOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ * The node-oracledb test suite uses 'mocha', 'assert' and 'async'.
+ * See LICENSE.md for relevant licenses.
+ *
+ * NAME
+ *   262. dbObjectOutBind.js
+ *
+ * DESCRIPTION
+ *   Test cases to check the OUT Binds with DBObject Type not crashing
+ *
+ *****************************************************************************/
+'use strict';
+
+const oracledb  = require('oracledb');
+const assert    = require('assert');
+const dbConfig  = require('./dbconfig.js');
+
+describe('262. dbObjectOutBind.js', function() {
+  let conn = null;
+  let proc1 =
+    `create or replace procedure nodb_getDataCursor1(p_cur out sys_refcursor) is
+      begin
+        open p_cur for
+          select
+            level
+          from
+            dual
+        connect by level < 10;
+      end; `;
+  let proc2 =
+    `create or replace procedure nodb_getDataCursor2(p_cur out sys_refcursor) is
+      begin
+        open p_cur for
+          select
+            group_by,
+            cast(collect(lvl) as sys.odcinumberlist) group_values
+        from (
+          select
+            mod(level, 3) group_by,
+            level lvl
+          from
+            dual
+          connect by level < 10
+        )
+        group by  group_by;
+      end;`;
+  let proc3 =
+      `create or replace procedure nodb_getDataCursor3(
+          p_cur1 out sys_refcursor,
+          p_cur2 out sys_refcursor
+       ) is
+       begin
+         nodb_getDataCursor1(p_cur1);
+         nodb_getDataCursor2(p_cur2);
+       end;`;
+
+  before(async function() {
+    try {
+      conn = await oracledb.getConnection(dbConfig);
+      await conn.execute(proc1);
+      await conn.execute(proc2);
+      await conn.execute(proc3);
+    } catch (e) {
+      assert.fail(e);
+    }
+  });
+
+  after(async function() {
+    try {
+      await conn.execute(`DROP PROCEDURE nodb_getDataCursor3`);
+      await conn.execute(`DROP PROCEDURE nodb_getDataCursor2`);
+      await conn.execute(`DROP PROCEDURE nodb_getDataCursor1`);
+      await conn.close();
+    } catch (e) {
+      assert.fail(e);
+    }
+  });
+
+  it('262.1 call procedure with 2 OUT binds of DbObject', async function() {
+    try {
+      let result = await conn.execute(
+        `BEGIN nodb_getDataCursor3(p_cur1 => :p_cur1,
+            p_cur2 => :p_cur2); end;`,
+        {
+          p_cur1: {type: oracledb.CURSOR, dir: oracledb.BIND_OUT},
+          p_cur2: {type: oracledb.CURSOR, dir: oracledb.BIND_OUT}
+        }
+      );
+      result.outBinds.p_cur1.close();
+      result.outBinds.p_cur2.close();
+    } catch (e) {
+      assert.fail(e);
+    }
+  });
+
+});
+

test/list.txt

@@ -5296,3 +5296,6 @@ oracledb.OUT_FORMAT_OBJECT and resultSet =  true
     261.1 connection health on stand alone connections
         261.1.1 connection health on good connection
         261.1.2 connection health on closed connection
+
+262. dbObjectOutBind.js
+    262.1 call procedure with 2 OUT binds of DbObject

test/opts/.mocharc.yaml

@@ -248,3 +248,4 @@ spec:
   - test/tpc.js
   - test/tpcResume.js
   - test/connHealthy.js
+  - test/dbObjectOutBind.js