@openfn/language-mssql 5.2.2 → 6.0.0

package/dist/index.cjs

@@ -35,7 +35,6 @@ __export(src_exports, {
   findValue: () => findValue,
   fn: () => import_language_common2.fn,
   fnIf: () => import_language_common2.fnIf,
-  http: () => import_language_common2.http,
   insert: () => insert,
   insertMany: () => insertMany,
   insertTable: () => insertTable,
@@ -69,7 +68,6 @@ __export(Adaptor_exports, {
   findValue: () => findValue,
   fn: () => import_language_common2.fn,
   fnIf: () => import_language_common2.fnIf,
-  http: () => import_language_common2.http,
   insert: () => insert,
   insertMany: () => insertMany,
   insertTable: () => insertTable,
@@ -201,15 +199,19 @@ function queryHandler(state, query, callback, options) {
         return state;
       }
     }
-    const request = new import_tedious.Request(query, (err, rowCount, rows) => {
+    const rows = [];
+    const request = new import_tedious.Request(query, (err) => {
       if (err) {
         console.error(err);
         reject(err);
       } else {
-        console.log(`Finished: ${rowCount} row(s).`);
+        console.log(`Finished: ${rows.length} row(s).`);
         resolve(callback(state, rows));
       }
     });
+    request.on("row", (columns) => {
+      rows.push(columns);
+    });
     connection.execSql(request);
   });
 }
@@ -256,8 +258,7 @@ function findValue(filter) {
   return (state) => {
     const { connection } = state;
     const { uuid, relation, where, operator } = filter;
-    const [whereData] = (0, import_util.expandReferences)(state, where);
-    const [operatorData] = (0, import_util.expandReferences)(state, operator);
+    const [whereData, operatorData] = (0, import_util.expandReferences)(state, where, operator);
     let conditionsArray = [];
     for (let key in whereData) {
       const escapedValue = escape(whereData[key]);
@@ -269,24 +270,25 @@ 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 request = new import_tedious.Request(body, (err, rowCount, rows) => {
+        const rows = [];
+        const request = new import_tedious.Request(body, (err) => {
           if (err) {
             console.error(err.message);
             reject(err);
           } else {
             if (rows.length > 0) {
-              returnValue = rows[0][0].value;
-            }
-            if (returnValue === null) {
+              resolve(rows[0][0].value);
+            } else {
               console.log("No value found");
               resolve(void 0);
             }
-            resolve(returnValue);
           }
         });
+        request.on("row", (columns) => {
+          rows.push(columns);
+        });
         connection.execSql(request);
       });
     } catch (e) {
@@ -586,7 +588,6 @@ var src_default = Adaptor_exports;
   findValue,
   fn,
   fnIf,
-  http,
   insert,
   insertMany,
   insertTable,

package/dist/index.js

@@ -22,7 +22,6 @@ __export(Adaptor_exports, {
   findValue: () => findValue,
   fn: () => fn,
   fnIf: () => fnIf,
-  http: () => http,
   insert: () => insert,
   insertMany: () => insertMany,
   insertTable: () => insertTable,
@@ -65,7 +64,6 @@ import {
   fields,
   fn,
   fnIf,
-  http,
   lastReferenceValue,
   cursor,
   merge,
@@ -171,15 +169,19 @@ function queryHandler(state, query, callback, options) {
         return state;
       }
     }
-    const request = new Request(query, (err, rowCount, rows) => {
+    const rows = [];
+    const request = new Request(query, (err) => {
       if (err) {
         console.error(err);
         reject(err);
       } else {
-        console.log(`Finished: ${rowCount} row(s).`);
+        console.log(`Finished: ${rows.length} row(s).`);
         resolve(callback(state, rows));
       }
     });
+    request.on("row", (columns) => {
+      rows.push(columns);
+    });
     connection.execSql(request);
   });
 }
@@ -226,8 +228,7 @@ function findValue(filter) {
   return (state) => {
     const { connection } = state;
     const { uuid, relation, where, operator } = filter;
-    const [whereData] = expandReferences(state, where);
-    const [operatorData] = expandReferences(state, operator);
+    const [whereData, operatorData] = expandReferences(state, where, operator);
     let conditionsArray = [];
     for (let key in whereData) {
       const escapedValue = escape(whereData[key]);
@@ -239,24 +240,25 @@ 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 request = new Request(body, (err, rowCount, rows) => {
+        const rows = [];
+        const request = new Request(body, (err) => {
           if (err) {
             console.error(err.message);
             reject(err);
           } else {
             if (rows.length > 0) {
-              returnValue = rows[0][0].value;
-            }
-            if (returnValue === null) {
+              resolve(rows[0][0].value);
+            } else {
               console.log("No value found");
               resolve(void 0);
             }
-            resolve(returnValue);
           }
         });
+        request.on("row", (columns) => {
+          rows.push(columns);
+        });
         connection.execSql(request);
       });
     } catch (e) {
@@ -556,7 +558,6 @@ export {
   findValue,
   fn,
   fnIf,
-  http,
   insert,
   insertMany,
   insertTable,

package/package.json

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

package/types/Adaptor.d.ts

@@ -170,4 +170,4 @@ export function insertTable(tableName: string, columns: any[], options: object):
  * @returns {Operation}
  */
 export function modifyTable(tableName: string, columns: any[], options: object): Operation;
-export { alterState, combine, dataPath, dataValue, dateFns, each, field, fields, fn, fnIf, http, lastReferenceValue, cursor, merge, sourceValue, as } from "@openfn/language-common";
+export { alterState, combine, dataPath, dataValue, dateFns, each, field, fields, fn, fnIf, lastReferenceValue, cursor, merge, sourceValue, as } from "@openfn/language-common";