support ARRAY[] in UPDATE set argument

Author: RandomEtc

index.js

@@ -29,14 +29,7 @@ function UPDATE(table) {
 
 UPDATE.prototype = {
     SET: function(set) {
-        // build set clause:
-        var set_columns = Object.keys(set),
-            set_clause = set_columns.map(function(c,i) {
-                return c + ' = $' + (i+1);
-            }),
-            set_values = set_columns.map(function(c){ return set[c]; });
-        this.text += ' SET ' + set_clause.join(', ');
-        this.values.push.apply(this.values, set_values);
+        this.text += ' SET ' + get_set_clause(set, this.values);
         return this;
     },
     WHERE: function(where,conjunction) {
@@ -176,16 +169,34 @@ DELETE.prototype = {
     }
 };
 
+function get_set_placeholder(value, values) {
+    if (Array.isArray(value)) {
+        return 'ARRAY[' + value.map(function(item){
+            return get_set_placeholder(item, values);
+        }).join(', ') + ']'
+    } else {
+        values.push(value);
+        return '$' + values.length;
+    }
+}
+
+// only used in UPDATE, but here for clarity/efficiency
+function get_set_clause(set, values) {
+    return Object.keys(set).map(function(c,i){
+        return c + ' = ' + get_set_placeholder(set[c], values);
+    }).join(', ');
+}
+
 // used in UPDATE, SELECT and DELETE
 // can handle where objects like so:
 // { foo: [1,2,3,4], bar: NOT_NULL, baz: null }
 function get_where_clause(where, values, conjunction){
-    return Object.keys(where).map(function(c,i) {
+    return Object.keys(where).map(function column_to_where(c,i) {
         var value = where[c];
         if (Array.isArray(value)) {
             return c + ' IN (' + value.map(function(v,i) {
                 values.push(v);
-                return '$'+values.length;
+                return '$' + values.length;
             }).join(', ') + ')';
         } else if (value === null) {
             return c + ' IS NULL';

test/update.js

@@ -68,4 +68,24 @@ describe('UPDATE', function(){
       sql.values.should.eql([1,2,3,4,5,6]);
     });
   });
+  describe('#(table).SET(set_array).WHERE(where_array)', function(){
+    it('should identify arrays in the set object and generate correct placeholders and flattened values', function(){
+      var sql = UPDATE('foo').SET({ a: 1, b: [ 2, 3, 4 ], c: 5 }).WHERE({ d: 6, e: [ 7, 8 ] });
+      sql.should.have.text;
+      sql.should.have.values;
+      sql.text.should.equal('UPDATE foo SET a = $1, b = ARRAY[$2, $3, $4], c = $5 WHERE d = $6 AND e IN ($7, $8)');
+      sql.values.should.be.an.instanceOf(Array)
+      sql.values.should.eql([1,2,3,4,5,6,7,8]);
+    });
+  });
+  describe('#(table).SET(set_nested_array).WHERE(where_array)', function(){
+    it('should identify nested arrays in the set object and generate correct placeholders and flattened values', function(){
+      var sql = UPDATE('foo').SET({ a: 1, b: [ [ 2, 3 ], [ 4, 5 ] ], c: 6 }).WHERE({ d: 7, e: [ 8, 9 ] });
+      sql.should.have.text;
+      sql.should.have.values;
+      sql.text.should.equal('UPDATE foo SET a = $1, b = ARRAY[ARRAY[$2, $3], ARRAY[$4, $5]], c = $6 WHERE d = $7 AND e IN ($8, $9)');
+      sql.values.should.be.an.instanceOf(Array)
+      sql.values.should.eql([1,2,3,4,5,6,7,8,9]);
+    });
+  });
 });