Improve delete flow for non-existence _Join collection

2016-03-07 14:14:28 +08:00
parent b36fd6f245
commit 91ff816839
1 changed files with 7 additions and 3 deletions
--- 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);
              });
            }