From 2e69bca82d9fa6b73b7bd8017d57fe639a4ebefc Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Fri, 1 Apr 2016 14:45:29 -0700
Subject: [PATCH] Making master a reserved key name

---
 spec/ParseObject.spec.js | 11 +++++++++++
 src/transform.js         |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/spec/ParseObject.spec.js b/spec/ParseObject.spec.js
index 7db455207a..95c5fbec0c 100644
--- a/spec/ParseObject.spec.js
+++ b/spec/ParseObject.spec.js
@@ -1887,3 +1887,14 @@ describe('Parse.Object testing', () => {
     });
   });
 });
+
+it('column name master is not allowed', (done) => {
+  let obj = new Parse.Object("SomeObject");
+  obj.set('master', 'hi');
+  obj.save().then((objAgain) => {
+    fail('Object shoult not have saved.');
+  done();
+  }, () => {
+    done(); 
+  }); 
+});
diff --git a/src/transform.js b/src/transform.js
index 6c1b85ec32..0aff0c3e5d 100644
--- a/src/transform.js
+++ b/src/transform.js
@@ -33,6 +33,9 @@ export function transformKeyValue(schema, className, restKey, restValue, options
   case '_id':
     key = '_id';
     break;
+  case 'master':
+    throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, "Master is an invalid field name");
+    break;
   case 'createdAt':
   case '_created_at':
     key = '_created_at';