@openfn/language-mssql 6.0.0 → 6.0.1

package/configuration-schema.json

@@ -55,13 +55,6 @@
         false
       ]
     },
-    "rowCollectionOnRequestCompletion": {
-      "type": "boolean",
-      "default": true,
-      "examples": [
-        false
-      ]
-    },
     "trustServerCertificate": {
       "type": "boolean",
       "default": true,

package/dist/index.cjs

@@ -108,7 +108,6 @@ function createConnection(state) {
     database,
     port = 1433,
     encrypt = true,
-    rowCollectionOnRequestCompletion = true,
     trustServerCertificate = true
   } = state.configuration;
   if (!server) {
@@ -124,7 +123,7 @@ function createConnection(state) {
       port,
       database,
       encrypt,
-      rowCollectionOnRequestCompletion,
+      rowCollectionOnRequestCompletion: true,
       trustServerCertificate
     }
   };
@@ -199,19 +198,20 @@ function queryHandler(state, query, callback, options) {
         return state;
       }
     }
-    const rows = [];
-    const request = new import_tedious.Request(query, (err) => {
+    const request = new import_tedious.Request(query, (err, rowCount, rows) => {
       if (err) {
-        console.error(err);
+        if (err.name === "AggregateError" && err.errors) {
+          err.errors.map((error) => console.error("Error: ", error.message));
+        } else {
+          console.error(err);
+        }
         reject(err);
+        return;
       } else {
-        console.log(`Finished: ${rows.length} row(s).`);
+        console.log(`Finished: ${rowCount} row(s).`);
         resolve(callback(state, rows));
       }
     });
-    request.on("row", (columns) => {
-      rows.push(columns);
-    });
     connection.execSql(request);
   });
 }
@@ -270,25 +270,24 @@ function findValue(filter) {
     try {
       const body = `select ${uuid} from ${relation} ${condition}`;
       console.log("Preparing to execute sql statement");
+      let returnValue = null;
       return new Promise((resolve, reject) => {
         console.log(`Executing query: ${body}`);
-        const rows = [];
-        const request = new import_tedious.Request(body, (err) => {
+        const request = new import_tedious.Request(body, (err, rowCount, rows) => {
           if (err) {
             console.error(err.message);
             reject(err);
           } else {
             if (rows.length > 0) {
-              resolve(rows[0][0].value);
-            } else {
+              returnValue = rows[0][0].value;
+            }
+            if (returnValue === null) {
               console.log("No value found");
               resolve(void 0);
             }
+            resolve(returnValue);
           }
         });
-        request.on("row", (columns) => {
-          rows.push(columns);
-        });
         connection.execSql(request);
       });
     } catch (e) {
@@ -311,7 +310,7 @@ function insert(table, record, options) {
       const safeQuery = `INSERT INTO ${table} (${columns.join(
         ", "
       )}) VALUES [--REDACTED--]];`;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         const queryToLog = options && options.logValues ? query : safeQuery;
         console.log(`Executing insert via: ${queryToLog}`);
         resolve(queryHandler(state, query, addRowsToRefs, options));
@@ -340,7 +339,7 @@ function insertMany(table, records, options) {
       const safeQuery = `INSERT INTO ${table} (${columns.join(
         ", "
       )}) VALUES [--REDACTED--]];`;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         const queryToLog = options && options.logValues ? query : safeQuery;
         console.log(`Executing insertMany via: ${queryToLog}`);
         resolve(queryHandler(state, query, addRowsToRefs, options));
@@ -386,7 +385,7 @@ function upsert(table, uuid, record, options) {
           UPDATE SET [--REDACTED--] 
         WHEN NOT MATCHED THEN
           INSERT (${insertColumns}) VALUES [--REDACTED--];`;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         const queryToLog = options && options.logValues ? query : safeQuery;
         console.log(`Executing upsert via: ${queryToLog}`);
         resolve(queryHandler(state, query, addRowsToRefs, options));
@@ -404,7 +403,7 @@ function upsertIf(logical, table, uuid, record, options) {
       const [recordData] = (0, import_util.expandReferences)(state, record);
       const columns = Object.keys(recordData).sort();
       const [logicalData] = (0, import_util.expandReferences)(state, logical);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!logicalData) {
           console.log(`Skipping upsert for ${uuid}.`);
           resolve(state);
@@ -454,7 +453,7 @@ function upsertMany(table, uuid, records, options) {
     const { connection } = state;
     try {
       const [recordData] = (0, import_util.expandReferences)(state, records);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!recordData || recordData.length === 0) {
           console.log("No records provided; skipping upsert.");
           resolve(state);
@@ -523,7 +522,7 @@ function insertTable(tableName, columns, options) {
     const { connection } = state;
     try {
       const [data] = (0, import_util.expandReferences)(state, columns);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table creation.");
           resolve(state);
@@ -549,7 +548,7 @@ function modifyTable(tableName, columns, options) {
     const { connection } = state;
     try {
       const [data] = (0, import_util.expandReferences)(state, columns);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table modification.");
           resolve(state);

package/dist/index.js

@@ -78,7 +78,6 @@ function createConnection(state) {
     database,
     port = 1433,
     encrypt = true,
-    rowCollectionOnRequestCompletion = true,
     trustServerCertificate = true
   } = state.configuration;
   if (!server) {
@@ -94,7 +93,7 @@ function createConnection(state) {
       port,
       database,
       encrypt,
-      rowCollectionOnRequestCompletion,
+      rowCollectionOnRequestCompletion: true,
       trustServerCertificate
     }
   };
@@ -169,19 +168,20 @@ function queryHandler(state, query, callback, options) {
         return state;
       }
     }
-    const rows = [];
-    const request = new Request(query, (err) => {
+    const request = new Request(query, (err, rowCount, rows) => {
       if (err) {
-        console.error(err);
+        if (err.name === "AggregateError" && err.errors) {
+          err.errors.map((error) => console.error("Error: ", error.message));
+        } else {
+          console.error(err);
+        }
         reject(err);
+        return;
       } else {
-        console.log(`Finished: ${rows.length} row(s).`);
+        console.log(`Finished: ${rowCount} row(s).`);
         resolve(callback(state, rows));
       }
     });
-    request.on("row", (columns) => {
-      rows.push(columns);
-    });
     connection.execSql(request);
   });
 }
@@ -240,25 +240,24 @@ function findValue(filter) {
     try {
       const body = `select ${uuid} from ${relation} ${condition}`;
       console.log("Preparing to execute sql statement");
+      let returnValue = null;
       return new Promise((resolve, reject) => {
         console.log(`Executing query: ${body}`);
-        const rows = [];
-        const request = new Request(body, (err) => {
+        const request = new Request(body, (err, rowCount, rows) => {
           if (err) {
             console.error(err.message);
             reject(err);
           } else {
             if (rows.length > 0) {
-              resolve(rows[0][0].value);
-            } else {
+              returnValue = rows[0][0].value;
+            }
+            if (returnValue === null) {
               console.log("No value found");
               resolve(void 0);
             }
+            resolve(returnValue);
           }
         });
-        request.on("row", (columns) => {
-          rows.push(columns);
-        });
         connection.execSql(request);
       });
     } catch (e) {
@@ -281,7 +280,7 @@ function insert(table, record, options) {
       const safeQuery = `INSERT INTO ${table} (${columns.join(
         ", "
       )}) VALUES [--REDACTED--]];`;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         const queryToLog = options && options.logValues ? query : safeQuery;
         console.log(`Executing insert via: ${queryToLog}`);
         resolve(queryHandler(state, query, addRowsToRefs, options));
@@ -310,7 +309,7 @@ function insertMany(table, records, options) {
       const safeQuery = `INSERT INTO ${table} (${columns.join(
         ", "
       )}) VALUES [--REDACTED--]];`;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         const queryToLog = options && options.logValues ? query : safeQuery;
         console.log(`Executing insertMany via: ${queryToLog}`);
         resolve(queryHandler(state, query, addRowsToRefs, options));
@@ -356,7 +355,7 @@ function upsert(table, uuid, record, options) {
           UPDATE SET [--REDACTED--] 
         WHEN NOT MATCHED THEN
           INSERT (${insertColumns}) VALUES [--REDACTED--];`;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         const queryToLog = options && options.logValues ? query : safeQuery;
         console.log(`Executing upsert via: ${queryToLog}`);
         resolve(queryHandler(state, query, addRowsToRefs, options));
@@ -374,7 +373,7 @@ function upsertIf(logical, table, uuid, record, options) {
       const [recordData] = expandReferences(state, record);
       const columns = Object.keys(recordData).sort();
       const [logicalData] = expandReferences(state, logical);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!logicalData) {
           console.log(`Skipping upsert for ${uuid}.`);
           resolve(state);
@@ -424,7 +423,7 @@ function upsertMany(table, uuid, records, options) {
     const { connection } = state;
     try {
       const [recordData] = expandReferences(state, records);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!recordData || recordData.length === 0) {
           console.log("No records provided; skipping upsert.");
           resolve(state);
@@ -493,7 +492,7 @@ function insertTable(tableName, columns, options) {
     const { connection } = state;
     try {
       const [data] = expandReferences(state, columns);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table creation.");
           resolve(state);
@@ -519,7 +518,7 @@ function modifyTable(tableName, columns, options) {
     const { connection } = state;
     try {
       const [data] = expandReferences(state, columns);
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         if (!data || data.length === 0) {
           console.log("No columns provided; skipping table modification.");
           resolve(state);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openfn/language-mssql",
   "label": "MSSQL",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "A Microsoft SQL language pack for OpenFn",
   "exports": {
     ".": {