murmuration 1.1.3 → 1.1.9

package/bin/statement.js

@@ -147,26 +147,22 @@ class Statement {
     return this;
   }
 
-  values(object) {
-    const columns = this.columnsFromObject(object),
-          parameters = Object.values(object),
-          firstIndex = 0,
-          placeholders = columns.reduce((placeholders, column, index) => {
-            const placeholder = this.placeholder();
-
-            placeholders = (index === firstIndex) ?
-                            `${placeholder}` :
-                              `${placeholders}, ${placeholder}`;
+  values(objectOrArray, ...parameters) {
+    const objectOrArrayIsArray = Array.isArray(objectOrArray);
 
-            return placeholders;
-          }, EMPTY_STRING)
+    if (objectOrArrayIsArray) {
+      const array = objectOrArray,
+            strings = array,  ///
+            columnsAndValues = this.columnsAndValuesFromStringsAndParameters(strings, parameters);
 
-    this.sql = `${this.sql} (${columns}) VALUES (${placeholders})`;
+      this.sql = `${this.sql} ${columnsAndValues}`;
+    } else {
+      const object = objectOrArray,  ///
+            values = this.valuesFromObject(object),
+            columns = this.columnsFromObject(object)
 
-    this.parameters = [
-      ...this.parameters,
-      ...parameters
-    ];
+      this.sql = `${this.sql} (${columns}) VALUES (${values})`;
+    }
 
     return this;
   }
@@ -186,6 +182,28 @@ class Statement {
     return object;
   }
 
+  valuesFromObject(object) {
+    const columns = this.columnsFromObject(object),
+          parameters = Object.values(object), ///
+          firstIndex = 0,
+          values = columns.reduce((values, column, index) => {
+            const placeholder = this.placeholder();
+
+            values = (index === firstIndex) ?
+                      `${placeholder}` :
+                        ` ${values}, ${placeholder}`;
+
+            return values;
+          }, EMPTY_STRING);
+
+    this.parameters = [
+      ...this.parameters,
+      ...parameters
+    ];
+
+    return values;
+  }
+
   clauseFromObject(object) {
     const columns = this.columnsFromObject(object),
           parameters = Object.values(object), ///
@@ -260,6 +278,29 @@ class Statement {
     return clause;
   }
 
+  columnsAndValuesFromStringsAndParameters(strings, parameters) {
+    const stringsLength = strings.length,
+          lastIndex = stringsLength - 1,
+          columnsAndValues = strings.reduce((columnsAndValues, string, index) => {
+            if (index < lastIndex) {
+              const placeholder = this.placeholder();
+
+              columnsAndValues = `${columnsAndValues}${string}${placeholder}`
+            } else {
+              columnsAndValues = `${columnsAndValues}${string}`;
+            }
+
+            return columnsAndValues;
+          }, EMPTY_STRING);
+
+    this.parameters = [
+      ...this.parameters,
+      ...parameters
+    ];
+
+    return columnsAndValues;
+  }
+
   execute() {
     this.query ?
       query(this.connection, this.sql, ...this.parameters, this.queryHandler) :

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "murmuration",
   "author": "James Smith",
-  "version": "1.1.3",
+  "version": "1.1.9",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/murmuration",
   "description": "Database connections, transactions and migrations.",