Merge pull request #23 from OpenFn/array_check

Check if data is send to the helper
OpenFn · Feb 8, 2021 · adb28fc · adb28fc
2 parents f35339c + dda2682
commit adb28fc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/lib/Adaptor.js b/lib/Adaptor.js
@@ -289,7 +289,13 @@ function insertMany(table, records, options) {
     var client = state.client;
 
     try {
-      var recordData = records(state); // Note: we select the keys of the FIRST object as the canonical template.
+      var recordData = records(state);
+
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping insert.');
+        return state;
+      } // Note: we select the keys of the FIRST object as the canonical template.
+
 
       var columns = Object.keys(recordData[0]);
       var columnsList = columns.join(', ');
@@ -375,6 +381,12 @@ function upsertMany(table, uuid, records, options) {
 
     try {
       var recordData = records(state);
+
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping upsert.');
+        return state;
+      }
+
       var columns = Object.keys(recordData[0]);
       var columnsList = columns.join(', ');
       var values = recordData.map(function (x) {
@@ -447,6 +459,12 @@ function insertTable(tableName, columns, options) {
 
     try {
       var recordData = columns(state);
+
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping create.');
+        return state;
+      }
+
       var structureData = recordData.map(function (x) {
         return "".concat(x.name, " ").concat(x.type, " ").concat(x.unique ? 'UNIQUE' : '', " ").concat(x.required ? 'NOT NULL' : '');
       }).join(', ');
@@ -485,6 +503,12 @@ function modifyTable(tableName, columns, options) {
 
     try {
       var recordData = columns(state);
+
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping modification.');
+        return state;
+      }
+
       var structureData = recordData.map(function (x) {
         return "ADD COLUMN ".concat(x.name, " ").concat(x.type, " ").concat(x.required ? 'NOT NULL' : '');
       }).join(', ');

diff --git a/src/Adaptor.js b/src/Adaptor.js
@@ -191,6 +191,10 @@ export function insertMany(table, records, options) {
 
     try {
       const recordData = records(state);
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping insert.');
+        return state;
+      }
       // Note: we select the keys of the FIRST object as the canonical template.
       const columns = Object.keys(recordData[0]);
       const columnsList = columns.join(', ');
@@ -290,6 +294,10 @@ export function upsertMany(table, uuid, records, options) {
 
     try {
       const recordData = records(state);
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping upsert.');
+        return state;
+      }
       const columns = Object.keys(recordData[0]);
       const columnsList = columns.join(', ');
       const values = recordData.map(x => Object.values(x));
@@ -374,6 +382,10 @@ export function insertTable(tableName, columns, options) {
     let { client } = state;
     try {
       const recordData = columns(state);
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping create.');
+        return state;
+      }
       const structureData = recordData
         .map(
           x =>
@@ -420,6 +432,10 @@ export function modifyTable(tableName, columns, options) {
 
     try {
       const recordData = columns(state);
+      if (recordData.length === 0) {
+        console.log('No data found, Skipping modification.');
+        return state;
+      }
       const structureData = recordData
         .map(
           x => `ADD COLUMN ${x.name} ${x.type} ${x.required ? 'NOT NULL' : ''}`