Merge branch 'upstream' into batchTransaction

Author: davimacedo

Dockerfile

@@ -11,6 +11,10 @@ RUN npm run build
 
 # Release stage
 FROM node:lts-alpine as release
+
+RUN apk update; \
+  apk add git;
+
 VOLUME /parse-server/cloud /parse-server/config
 
 WORKDIR /parse-server

package-lock.json

@@ -43,8 +43,8 @@
     "mime": "2.4.4",
     "mongodb": "3.2.7",
     "node-rsa": "1.0.5",
-    "parse": "2.5.1",
-    "pg-promise": "8.7.5",
+    "parse": "2.6.0",
+    "pg-promise": "9.0.0",
     "redis": "2.8.0",
     "semver": "6.3.0",
     "subscriptions-transport-ws": "0.9.16",
@@ -73,7 +73,7 @@
     "cross-env": "5.2.0",
     "deep-diff": "1.0.2",
     "eslint": "6.1.0",
-    "eslint-plugin-flowtype": "3.12.1",
+    "eslint-plugin-flowtype": "3.12.2",
     "flow-bin": "0.104.0",
     "form-data": "2.5.0",
     "gaze": "1.1.3",
@@ -110,8 +110,7 @@
     "parse-server": "./bin/parse-server"
   },
   "optionalDependencies": {
-    "bcrypt": "3.0.6",
-    "uws": "10.148.1"
+    "bcrypt": "3.0.6"
   },
   "collective": {
     "type": "opencollective",

package.json

@@ -359,6 +359,24 @@ describe('Parse.Query testing', () => {
       }, done.fail);
   });
 
+  it('nested equalTo string with single quote', async () => {
+    const obj = new TestObject({ nested: { foo: "single'quote" } });
+    await obj.save();
+    const query = new Parse.Query(TestObject);
+    query.equalTo('nested.foo', "single'quote");
+    const result = await query.get(obj.id);
+    equal(result.get('nested').foo, "single'quote");
+  });
+
+  it('nested containedIn string with single quote', async () => {
+    const obj = new TestObject({ nested: { foo: ["single'quote"]} });
+    await obj.save();
+    const query = new Parse.Query(TestObject);
+    query.containedIn('nested.foo', ["single'quote"]);
+    const result = await query.get(obj.id);
+    equal(result.get('nested').foo[0], "single'quote");
+  });
+
   it('nested containedIn string', done => {
     const sender1 = { group: ['A', 'B'] };
     const sender2 = { group: ['A', 'C'] };