Merge pull request #16 from OpenFn/update_insert

Updated insert() using pg-format, #15
OpenFn · Sep 8, 2020 · 8a3b8ab · 8a3b8ab
2 parents 92a00a3 + 4d1db60
commit 8a3b8ab
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/lib/Adaptor.js b/lib/Adaptor.js
@@ -257,8 +257,8 @@ function insert(table, record, options) {
       var columns = Object.keys(recordData).sort();
       var values = columns.map(function (key) {
         return recordData[key];
-      }).join("', '");
-      var query = handleValues("INSERT INTO ".concat(table, " (").concat(columns.join(', '), ") VALUES ('").concat(values, "');"), handleOptions(options));
+      });
+      var query = (0, _pgFormat["default"])("INSERT INTO ".concat(table, " (").concat(columns.join(', '), ") VALUES (%L);"), values);
       var safeQuery = handleValues("INSERT INTO ".concat(table, " (").concat(columns.join(', '), ") VALUES [--REDACTED--];"), handleOptions(options));
       return new Promise(function (resolve, reject) {
         console.log("Executing insert via : ".concat(safeQuery));
@@ -364,12 +364,13 @@ function upsert(table, uuid, record, options) {
       var columns = Object.keys(recordData).sort();
       var values = columns.map(function (key) {
         return recordData[key];
-      }).join("', '");
+      });
       var conflict = uuid.split(' ').length > 1 ? uuid : "(".concat(uuid, ")");
       var updateValues = columns.map(function (key) {
-        return "".concat(key, "='").concat(recordData[key], "'");
+        return "".concat(key, "=excluded.").concat(key);
       }).join(', ');
-      var query = handleValues("INSERT INTO ".concat(table, " (").concat(columns.join(', '), ") VALUES ('").concat(values, "')\n        ON CONFLICT ").concat(conflict, "\n        DO\n          UPDATE SET ").concat(updateValues, ";"), handleOptions(options));
+      var insertValues = (0, _pgFormat["default"])("INSERT INTO ".concat(table, " (").concat(columns.join(', '), ") VALUES (%L)"), values);
+      var query = "".concat(insertValues, "\n          ON CONFLICT ").concat(conflict, "\n          DO\n            UPDATE SET ").concat(updateValues, ";");
       var safeQuery = handleValues("INSERT INTO ".concat(table, " (").concat(columns.join(', '), ") VALUES [--REDACTED--]\n        ON CONFLICT ").concat(conflict, "\n        DO\n          UPDATE SET [--REDACTED--];"), handleOptions(options));
       return new Promise(function (resolve, reject) {
         console.log("Executing upsert via : ".concat(safeQuery));

diff --git a/src/Adaptor.js b/src/Adaptor.js
@@ -155,11 +155,12 @@ export function insert(table, record, options) {
       const recordData = expandReferences(record)(state);
 
       const columns = Object.keys(recordData).sort();
-      const values = columns.map(key => recordData[key]).join("', '");
 
-      const query = handleValues(
-        `INSERT INTO ${table} (${columns.join(', ')}) VALUES ('${values}');`,
-        handleOptions(options)
+      const values = columns.map(key => recordData[key]);
+
+      const query = format(
+        `INSERT INTO ${table} (${columns.join(', ')}) VALUES (%L);`,
+        values
       );
 
       const safeQuery = handleValues(
@@ -268,21 +269,26 @@ export function upsert(table, uuid, record, options) {
     try {
       const recordData = expandReferences(record)(state);
       const columns = Object.keys(recordData).sort();
-      const values = columns.map(key => recordData[key]).join("', '");
+
+      const values = columns.map(key => recordData[key]);
       const conflict = uuid.split(' ').length > 1 ? uuid : `(${uuid})`;
 
       const updateValues = columns
-        .map(key => `${key}='${recordData[key]}'`)
+        .map(key => {
+          return `${key}=excluded.${key}`;
+        })
         .join(', ');
 
-      const query = handleValues(
-        `INSERT INTO ${table} (${columns.join(', ')}) VALUES ('${values}')
-        ON CONFLICT ${conflict}
-        DO
-          UPDATE SET ${updateValues};`,
-        handleOptions(options)
+      const insertValues = format(
+        `INSERT INTO ${table} (${columns.join(', ')}) VALUES (%L)`,
+        values
       );
 
+      const query = `${insertValues}
+          ON CONFLICT ${conflict}
+          DO
+            UPDATE SET ${updateValues};`;
+
       const safeQuery = handleValues(
         `INSERT INTO ${table} (${columns.join(', ')}) VALUES [--REDACTED--]
         ON CONFLICT ${conflict}