Postgres: $all, $and CLP and more

spec/ParseQuery.spec.js

@@ -2488,8 +2488,7 @@ describe('Parse.Query testing', () => {
     })
   })
 
-  // TODO: tricky with PG with non existant columns
-  it_exclude_dbs(['postgres'])('query with two OR subqueries (regression test #1259)', done => {
+  it('query with two OR subqueries (regression test #1259)', done => {
     let relatedObject = new Parse.Object('Class2');
     relatedObject.save().then(relatedObject => {
       let anObject = new Parse.Object('Class1');

spec/PushController.spec.js

@@ -357,7 +357,7 @@ describe('PushController', () => {
    })
   });
 
-  it_exclude_dbs(['postgres'])('should support full RESTQuery for increment', (done) => {
+  it('should support full RESTQuery for increment', (done) => {
     var payload = {data: {
      alert: "Hello World!",
      badge: 'Increment',
@@ -392,7 +392,7 @@ describe('PushController', () => {
    pushController.sendPush(payload, where, config, auth).then((result) => {
       done();
     }).catch((err) => {
-      fail('should not fail');
+      jfail(err);
       done();
     });
   });

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -135,6 +135,15 @@ const buildWhereClause = ({ schema, query, index }) => {
           && schema.fields[fieldName].type === 'Array';
     let initialPatternsLength = patterns.length;
     let fieldValue = query[fieldName];
+
+    // nothingin the schema, it's gonna blow up
+    if (!schema.fields[fieldName]) {
+      // as it won't exist
+      if (fieldValue.$exists === false) {
+        continue;
+      }
+    } 
+
     if (fieldName.indexOf('.') >= 0) {
       let components = fieldName.split('.').map((cmpt, index) => {
         if (index == 0) {
@@ -715,16 +724,15 @@ export class PostgresStorageAdapter {
       }
     });
   }
+  // Return value not currently well specified.
+  findOneAndUpdate(className, schema, query, update) {
+    debug('findOneAndUpdate', className, query, update);
+    return this.updateObjectsByQuery(className, schema, query, update).then((val) => val[0]);
+  }
 
   // Apply the update to all objects that match the given Parse Query.
   updateObjectsByQuery(className, schema, query, update) {
     debug('updateObjectsByQuery', className, query, update);
-    return this.findOneAndUpdate(className, schema, query, update);
-  }
-
-  // Return value not currently well specified.
-  findOneAndUpdate(className, schema, query, update) {
-    debug('findOneAndUpdate', className, query, update);
     let conditionPatterns = [];
     let updatePatterns = [];
     let values = [className]
@@ -850,8 +858,7 @@ export class PostgresStorageAdapter {
 
     let qs = `UPDATE $1:name SET ${updatePatterns.join(',')} WHERE ${where.pattern} RETURNING *`;
     debug('update: ', qs, values);
-    return this._client.any(qs, values) 
-    .then(val => val[0]); // TODO: This is unsafe, verification is needed, or a different query method;
+    return this._client.any(qs, values); // TODO: This is unsafe, verification is needed, or a different query method;
   }
 
   // Hopefully, we can get rid of this. It's only used for config and hooks.