Adding $nor operator support

spec/ParseQuery.spec.js

@@ -2567,6 +2567,48 @@ describe('Parse.Query testing', () => {
     });
   });
 
+  it('$select inside $nor', (done) => {
+    const objects = Array.from(Array(10).keys()).map((rating) => {
+      return new TestObject({ 'rating': rating });
+    });
+
+    const highValue = 5;
+    const lowValue = 3;
+    const options = Object.assign({}, masterKeyOptions, {
+      body: {
+        where: {
+          $nor: [
+            { rating : { $gt : highValue } },
+            { rating : { $lte : lowValue } },
+          ]
+        },
+      }
+    });
+
+    Parse.Object.saveAll(objects).then(() => {
+      return rp.get(Parse.serverURL + "/classes/TestObject", options);
+    }).then((results) => {
+      expect(results.results.length).toBe(highValue - lowValue);
+      expect(results.results.every(res => res.rating > lowValue && res.rating <= highValue)).toBe(true);
+      done();
+    });
+  });
+
+  it('$nor invalid query', (done) => {
+    const options = Object.assign({}, masterKeyOptions, {
+      body: {
+        where: { $nor: [] },
+      }
+    });
+    const obj = new TestObject();
+    obj.save().then(() => {
+      return rp.get(Parse.serverURL + "/classes/TestObject", options);
+    }).then(done.fail).catch((error) => {
+      equal(error.error.code, Parse.Error.INVALID_JSON);
+      done();
+    });
+  });
+
   it("dontSelect query", function(done) {
     const RestaurantObject = Parse.Object.extend("Restaurant");
     const PersonObject = Parse.Object.extend("Person");

src/Adapters/Storage/Mongo/MongoTransform.js

@@ -247,9 +247,9 @@ function transformQueryKeyValue(className, key, value, schema) {
   case '_perishable_token':
   case '_email_verify_token': return {key, value}
   case '$or':
-    return {key: '$or', value: value.map(subQuery => transformWhere(className, subQuery, schema))};
   case '$and':
-    return {key: '$and', value: value.map(subQuery => transformWhere(className, subQuery, schema))};
+  case '$nor':
+    return {key: key, value: value.map(subQuery => transformWhere(className, subQuery, schema))};
   case 'lastUsed':
     if (valueAsDate(value)) {
       return {key: '_last_used', value: valueAsDate(value)}

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -306,12 +306,15 @@ const buildWhereClause = ({ schema, query, index }): WhereClause => {
       patterns.push(`$${index}:name = $${index + 1}`);
       values.push(fieldName, fieldValue);
       index += 2;
-    } else if (fieldName === '$or' || fieldName === '$and') {
+    } else if (['$or', '$nor', '$and'].includes(fieldName)) {
       const clauses = [];
       const clauseValues = [];
       fieldValue.forEach((subQuery) =>  {
         const clause = buildWhereClause({ schema, query: subQuery, index });
         if (clause.pattern.length > 0) {
+          if (fieldName === '$nor') {
+            clause.pattern = `(NOT ${clause.pattern})`;
+          }
           clauses.push(clause.pattern);
           clauseValues.push(...clause.values);
           index += clause.values.length;

src/Controllers/DatabaseController.js

@@ -50,7 +50,7 @@ const transformObjectACL = ({ ACL, ...result }) => {
   return result;
 }
 
-const specialQuerykeys = ['$and', '$or', '_rperm', '_wperm', '_perishable_token', '_email_verify_token', '_email_verify_token_expires_at', '_account_lockout_expires_at', '_failed_login_count'];
+const specialQuerykeys = ['$and', '$or', '$nor', '_rperm', '_wperm', '_perishable_token', '_email_verify_token', '_email_verify_token_expires_at', '_account_lockout_expires_at', '_failed_login_count'];
 
 const isSpecialQueryKey = key => {
   return specialQuerykeys.indexOf(key) >= 0;
@@ -62,7 +62,7 @@ const validateQuery = (query: any): void => {
   }
 
   if (query.$or) {
-    if (query.$or instanceof Array) {
+    if (query.$or instanceof Array && query.$or.length > 1) {
       query.$or.forEach(validateQuery);
 
       /* In MongoDB, $or queries which are not alone at the top level of the
@@ -99,15 +99,23 @@ const validateQuery = (query: any): void => {
       });
       query.$or.forEach(validateQuery);
     } else {
-      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Bad $or format - use an array value.');
+      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Bad $or format - use an array of at least 2 values.');
     }
   }
 
   if (query.$and) {
-    if (query.$and instanceof Array) {
+    if (query.$and instanceof Array && query.$and.length > 1) {
       query.$and.forEach(validateQuery);
     } else {
-      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Bad $and format - use an array value.');
+      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Bad $and format - use an array of at least 2 values.');
+    }
+  }
+
+  if (query.$nor) {
+    if (query.$nor instanceof Array && query.$nor.length > 0) {
+      query.$nor.forEach(validateQuery);
+    } else {
+      throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Bad $nor format - use an array of at least 1 value.');
     }
   }