Adds support for AddUnique and Remove

Author: flovilmart

spec/ParseAPI.spec.js

@@ -817,7 +817,7 @@ it_exclude_dbs(['postgres'])('ensure that if you try to sign up a user with a un
     });
   });
 
-  it_exclude_dbs(['postgres'])('should return the updated fields on PUT', done => {
+  it('should return the updated fields on PUT', done => {
     let obj = new Parse.Object('GameScore');
     obj.save({a:'hello', c: 1, d: ['1'], e:['1'], f:['1','2']}).then(( ) => {
       var headers = {

spec/ParseObject.spec.js

@@ -625,15 +625,21 @@ describe('Parse.Object testing', () => {
       var query = new Parse.Query('X');
       return query.get(x1.id);
     }).then((x3) => {
-      expect(x3.get('stuff')).toEqual([1, {'hello': 'world'},  {'foo': 'bar'}, {'bar': 'baz'}]);
+      let stuff = x3.get('stuff');
+      let target = [1, {'hello': 'world'},  {'foo': 'bar'}, {'bar': 'baz'}];
+      expect(stuff.length).toEqual(target.length);
+      let found = 0;
+      for (let thing in target) {
+        for (let st in stuff) {
+          if (st == thing) {
+            found++;
+          }
+        }
+      }
+      expect(found).toBe(target.length);
       done();
     }, (error) => {
-      on_db('mongo', () => {
-        jfail(error);
-      });
-      on_db('postgres', () => {
-        expect(error.message).toEqual("Postgres does not support AddUnique operator.");
-      });
+      jfail(error);
       done();
     });
   });
@@ -654,6 +660,7 @@ describe('Parse.Object testing', () => {
       expect(x3.get('stuff')).toEqual([1, {'foo': 'bar'}]);
       done();
     }, (error) => {
+      console.error(error);
       on_db('mongo', () => {
         jfail(error);
       });

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -624,8 +624,16 @@ export class PostgresStorageAdapter {
     });
 
     columnsArray = columnsArray.concat(Object.keys(geoPoints));
-    let initialValues = valuesArray.map((val, index) => `$${index + 2 + columnsArray.length}${(['_rperm','_wperm'].includes(columnsArray[index])) ? '::text[]' : ''}`);
-    
+    let initialValues = valuesArray.map((val, index) => {
+      let termination = '';
+      let fieldName = columnsArray[index];
+      if (['_rperm','_wperm'].includes(fieldName)) {
+        termination = '::text[]';
+      } else if (schema.fields[fieldName] && schema.fields[fieldName].type === 'Array') {
+        termination = '::jsonb';
+      }
+      return `$${index + 2 + columnsArray.length}${termination}`;
+    });
     let geoPointsInjects = Object.keys(geoPoints).map((key, idx) => {
       let value = geoPoints[key];
       valuesArray.push(value.latitude, value.longitude);
@@ -725,17 +733,21 @@ export class PostgresStorageAdapter {
         values.push(fieldName, fieldValue.amount);
         index += 2;
       } else if (fieldValue.__op === 'Add') {
-        updatePatterns.push(`$${index}:name = COALESCE($${index}:name, '[]'::jsonb) || $${index + 1}`);
+        updatePatterns.push(`$${index}:name = COALESCE($${index}:name, '[]'::jsonb) || array_to_json($${index + 1})::jsonb`);
         values.push(fieldName, fieldValue.objects);
         index += 2;
       } else if (fieldValue.__op === 'Delete') {
         updatePatterns.push(`$${index}:name = $${index + 1}`)
         values.push(fieldName, null);
         index += 2;
       } else if (fieldValue.__op === 'Remove') {
-        return Promise.reject(new Parse.Error(Parse.Error.OPERATION_FORBIDDEN, 'Postgres does not support Remove operator.'));
+        updatePatterns.push(`$${index}:name = array_remove(COALESCE($${index}:name, '[]'::jsonb), $${index + 1}::jsonb)`)
+        values.push(fieldName, JSON.stringify(fieldValue.objects));
+        index += 2;
       } else if (fieldValue.__op === 'AddUnique') {
-        return Promise.reject(new Parse.Error(Parse.Error.OPERATION_FORBIDDEN, 'Postgres does not support AddUnique operator.'));
+        updatePatterns.push(`$${index}:name = array_add_unique(COALESCE($${index}:name, '[]'::jsonb), $${index + 1}::jsonb)`);
+        values.push(fieldName, JSON.stringify(fieldValue.objects));
+        index += 2;
       } else if (fieldName === 'updatedAt') { //TODO: stop special casing this. It should check for __type === 'Date' and use .iso
         updatePatterns.push(`$${index}:name = $${index + 1}`)
         values.push(fieldName, fieldValue);
@@ -958,11 +970,18 @@ export class PostgresStorageAdapter {
         throw err;
       });
     });
-
     return Promise.all(promises).then(() => {
-      return this._client.any(json_object_set_key).catch((err) => {
-        console.error(err);
-      })
+      return Promise.all([
+        this._client.any(json_object_set_key).catch((err) => {
+          console.error(err);
+        }),
+        this._client.any(array_add_unique).catch((err) => {
+          console.error(err);
+        }),
+        this._client.any(array_remove).catch((err) => {
+          console.error(err);
+        })
+      ]);
     }).then(() => {
       debug(`initialzationDone in ${new Date().getTime() - now}`);
     })
@@ -992,5 +1011,29 @@ SELECT concat(\'{\', string_agg(to_json("key") || \':\' || "value", \',\'), \'}\
         SELECT "key_to_set", to_json("value_to_set")::jsonb) AS "fields"\
 $function$;'
 
+const array_add_unique = `CREATE OR REPLACE FUNCTION "array_add_unique"(
+  "array"   jsonb,
+  "values"  jsonb
+)
+  RETURNS jsonb 
+  LANGUAGE sql 
+  IMMUTABLE 
+  STRICT 
+AS $function$ 
+  SELECT to_jsonb(ARRAY(SELECT DISTINCT jsonb_array_elements("values" || "array")))
+$function$;`;
+
+const array_remove = `CREATE OR REPLACE FUNCTION "array_remove"(\
+  "array"   jsonb,\
+  "values"  jsonb\
+)\
+  RETURNS jsonb \
+  LANGUAGE sql \
+  IMMUTABLE \
+  STRICT \
+AS $function$ \
+  SELECT to_jsonb(ARRAY(SELECT * FROM jsonb_array_elements("array") as elt WHERE elt NOT IN (SELECT * FROM (SELECT jsonb_array_elements("values")) AS sub))) \
+$function$;`;
+
 export default PostgresStorageAdapter;
 module.exports = PostgresStorageAdapter; // Required for tests