Handle queries with equalTo on objectId and relation conditions (#2472)

* Add test for notEqualTo on relation with equalTo on objectId

* Properly handles queries with equalTo on objectId and relation conditions

This is done by converting shorthand $eq condition to $eq condition instead of clobbering.

spec/ParseQuery.spec.js

@@ -117,6 +117,16 @@ describe('Parse.Query testing', () => {
         let cake = results[0];
         expect(cake.id).toBe(cake3.id);
       });
+    }).then(function(){
+      var query = new Parse.Query(Cake);
+      // Exclude user1
+      query.notEqualTo("liker", user1);
+      // Only cake1
+      query.equalTo("objectId", cake1.id)
+      // user1 likes cake1 so this should return no results
+      return query.find().then(function(results){
+        equal(results.length, 0);
+      });
     }).then(function(){
       done();
     })