@openfn/language-mssql 2.6.11 → 3.0.0

package/ast.json

@@ -15,7 +15,7 @@
           },
           {
             "title": "example",
-            "description": "execute(\n  sql(sqlQuery)\n)(state)"
+            "description": "sql({ query, options })"
           },
           {
             "title": "constructor",
@@ -105,7 +105,7 @@
           },
           {
             "title": "example",
-            "description": "execute(\n  insert(table, record, {setNull: [\"'undefined'\", \"''\"], logValues: false})\n)(state)"
+            "description": "insert(table, record, {setNull: [\"'undefined'\", \"''\"], logValues: false})"
           },
           {
             "title": "constructor",
@@ -169,7 +169,7 @@
           },
           {
             "title": "example",
-            "description": "execute(\n  insertMany(table, records, { setNull: false, writeSql: true, logValues: false })\n)(state)"
+            "description": "insertMany(table, records, { setNull: false, writeSql: true, logValues: false })"
           },
           {
             "title": "constructor",
@@ -234,7 +234,7 @@
           },
           {
             "title": "example",
-            "description": "execute(\n  upsert(table, uuid, record, { setNull: \"'undefined'\", logValues: false})\n)(state)\nexecute(\n  upsert(table, [uuid1, uuid2], record, { setNull: \"'undefined'\", logValues: false})\n)(state)"
+            "description": "upsert(table, uuid, record, { setNull: \"'undefined'\", logValues: false})\nupsert(table, [uuid1, uuid2], record, { setNull: \"'undefined'\", logValues: false})"
           },
           {
             "title": "constructor",

package/lib/Adaptor.js

@@ -254,6 +254,20 @@ function flattenRows(state, rows) {
   });
 }
 
+function composeNextState(state, rows) {
+  var obj = {};
+  rows.forEach(function (row) {
+    row.forEach(function (col) {
+      obj[col.metadata.colName] = col.value;
+    });
+  });
+  return _objectSpread(_objectSpread({}, state), {}, {
+    response: {
+      body: obj
+    }
+  });
+}
+
 function queryHandler(state, query, callback, options) {
   var connection = state.connection;
   return new Promise(function (resolve, reject) {
@@ -286,9 +300,7 @@ function queryHandler(state, query, callback, options) {
  * Execute an SQL statement
  * @public
  * @example
- * execute(
- *   sql(sqlQuery)
- * )(state)
+ * sql({ query, options })
  * @constructor
  * @param {object} params - Payload data for the message
  * @returns {Operation}
@@ -305,7 +317,7 @@ function sql(params) {
           options = _expandReferences.options;
 
       console.log("Preparing to execute sql statement: ".concat(query));
-      return queryHandler(state, query, flattenRows, options);
+      return queryHandler(state, query, composeNextState, options);
     } catch (e) {
       connection.close();
       throw e;
@@ -419,9 +431,7 @@ function findValue(filter) {
  * Insert a record
  * @public
  * @example
- * execute(
- *   insert(table, record, {setNull: ["'undefined'", "''"], logValues: false})
- * )(state)
+ * insert(table, record, {setNull: ["'undefined'", "''"], logValues: false})
  * @constructor
  * @param {string} table - The target table
  * @param {object} record - Payload data for the record as a JS object
@@ -457,9 +467,7 @@ function insert(table, record, options) {
  * Insert many records, using the keys of the first as the column template
  * @public
  * @example
- * execute(
- *   insertMany(table, records, { setNull: false, writeSql: true, logValues: false })
- * )(state)
+ * insertMany(table, records, { setNull: false, writeSql: true, logValues: false })
  * @constructor
  * @param {string} table - The target table
  * @param {function} records - A function that takes state and returns an array of records
@@ -496,12 +504,8 @@ function insertMany(table, records, options) {
  * Insert or update a record using SQL MERGE
  * @public
  * @example
- * execute(
- *   upsert(table, uuid, record, { setNull: "'undefined'", logValues: false})
- * )(state)
- * execute(
- *   upsert(table, [uuid1, uuid2], record, { setNull: "'undefined'", logValues: false})
- * )(state)
+ * upsert(table, uuid, record, { setNull: "'undefined'", logValues: false})
+ * upsert(table, [uuid1, uuid2], record, { setNull: "'undefined'", logValues: false})
  * @constructor
  * @param {string} table - The target table
  * @param {string} uuid - The uuid column to determine a matching/existing record

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/language-mssql",
-  "version": "2.6.11",
+  "version": "3.0.0",
   "description": "A Microsoft SQL language pack for OpenFn",
   "main": "lib/index.js",
   "homepage": "https://docs.openfn.org",