Merge branch 'master' into master

parse-community · Mar 7, 2016 · 735200f · 735200f
2 parents 005c886 + 53e7337
commit 735200f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Schema.js b/src/Schema.js
@@ -409,10 +409,14 @@ class Schema {
 
             if (this.data[className][fieldName].startsWith('relation<')) {
               //For relations, drop the _Join table
-              return database.collectionExists(`_Join:${fieldName}:${className}`).then(exist => {
-                if (exist) {
-                  return database.dropCollection(`_Join:${fieldName}:${className}`);
+              return database.dropCollection(`_Join:${fieldName}:${className}`)
+              .then(() => {
+                return Promise.resolve();
+              }, error => {
+                if (error.message == 'ns not found') {
+                  return Promise.resolve();
                 }
+                return Promise.reject(error);
               });
             }