Tidy up empty array errors in con.executeMany() and coll.insertMany()

Author: cjbj

CHANGELOG.md

@@ -106,6 +106,9 @@
     - The NJS-014 error when setting a read-only property was replaced
       with a standard JavaScript message.
 
+    - When passing 0 or a negative value for the number of iterations to
+      `connection.executeMany()`, errors now occur through the error callback.
+
     - Some error numbers may have changed due to code refactoring.
       Some message text was updated.
 

lib/connection.js

@@ -175,14 +175,16 @@ function executeMany(sql, bindsOrNumIters, a3, a4) {
   const self = this;
   let options = {};
   let executeCb;
+  let okBinds;
 
   nodbUtil.assert(arguments.length > 2 && arguments.length < 5, 'NJS-009');
   nodbUtil.assert(typeof sql === 'string', 'NJS-005', 1);
   if (typeof bindsOrNumIters === 'number') {
-    nodbUtil.assert(Number.isInteger(bindsOrNumIters) && bindsOrNumIters > 0,
-      'NJS-005', 2);
+    nodbUtil.assert(Number.isInteger(bindsOrNumIters), 'NJS-005', 2);
+    okBinds = (bindsOrNumIters > 0);
   } else {
     nodbUtil.assert(Array.isArray(bindsOrNumIters), 'NJS-005', 2);
+    okBinds = (bindsOrNumIters.length > 0);
   }
 
   switch (arguments.length) {
@@ -197,6 +199,10 @@ function executeMany(sql, bindsOrNumIters, a3, a4) {
       executeCb = a4;
       break;
   }
+  if (!okBinds) {
+    executeCb(new Error(nodbUtil.getErrorMessage('NJS-005', 2)));
+    return;
+  }
 
   self._executeMany.call(self, sql, bindsOrNumIters, options, executeCb);
 }

lib/sodaCollection.js

@@ -35,6 +35,10 @@ function insertMany(docs, cb) {
   nodbUtil.assert(arguments.length === 2, 'NJS-009');
   nodbUtil.assert(Array.isArray(docs), 'NJS-005', 1);
   nodbUtil.assert(typeof cb === 'function', 'NJS-005', 2);
+  if (docs.length == 0) {
+    cb(new Error(nodbUtil.getErrorMessage('NJS-005', 1)));
+    return;
+  }
 
   let actualDocs = Array(docs.length);
   for (let i = 0; i < docs.length; i++) {
@@ -55,6 +59,10 @@ function insertManyAndGet(docs, cb) {
   nodbUtil.assert(arguments.length === 2, 'NJS-009');
   nodbUtil.assert(Array.isArray(docs), 'NJS-005', 1);
   nodbUtil.assert(typeof cb === 'function', 'NJS-005', 2);
+  if (docs.length == 0) {
+    cb(new Error(nodbUtil.getErrorMessage('NJS-005', 1)));
+    return;
+  }
 
   let actualDocs = Array(docs.length);
   for (let i = 0; i < docs.length; i++) {

test/executeMany1.js

@@ -659,7 +659,7 @@ describe('163. executeMany1.js', function() {
   it('163.15 Negative - set numIterations to be negative value', function(done) {
     async.series([
       function(cb) {
-        var sql = `
+        const sql = `
         declare
             t_Id number;
         begin
@@ -670,19 +670,13 @@ describe('163. executeMany1.js', function() {
             values (t_Id, 'Test String ' || t_Id);
         end;`;
 
-        var numIterations = -8;
-
-        should.throws(
-          function() {
-            conn.executeMany(
-              sql,
-              numIterations,
-              function() { }
-            );
-          },
-          /NJS-005: invalid value for parameter 2/
-        );
-        cb();
+        const numIterations = -8;
+        conn.executeMany(sql, numIterations, function(err, result) {
+          should.exist(err);
+          err.message.should.startWith('NJS-005:');
+          should.not.exist(result);
+          cb();
+        });
       },
       function(cb) {
         dotruncate(cb);