Merge pull request #1280 from bulkan/feature/skip_tables_dropAllTables

Optional array argument of table names to skip

lib/dialects/sqlite/query-interface.js

@@ -120,9 +120,15 @@ var QueryInterface = module.exports = {
       }.bind(this))
       }.bind(this))
   },
   },
 
 
-  dropAllTables: function() {
+  dropAllTables: function(options) {
     var self = this
     var self = this
 
 
+    if (!options) {
+      options = {}
+    }
+
+    var skip = options.skip || [];
+
    return new Utils.CustomEventEmitter(function(dropAllTablesEmitter) {
    return new Utils.CustomEventEmitter(function(dropAllTablesEmitter) {
       var events  = []
       var events  = []
         , chainer = new Utils.QueryChainer()
         , chainer = new Utils.QueryChainer()
@@ -149,7 +155,10 @@ var QueryInterface = module.exports = {
                 queries.push('PRAGMA foreign_keys = OFF')
                 queries.push('PRAGMA foreign_keys = OFF')
 
 
                 tableNames.forEach(function(tableName) {
                 tableNames.forEach(function(tableName) {
-                  queries.push(self.QueryGenerator.dropTableQuery(tableName).replace(';', ''))
+                  // if tableName is not in the Array of tables names then dont drop it
+                  if (skip.indexOf(tableName) === -1) {
+                    queries.push(self.QueryGenerator.dropTableQuery(tableName).replace(';', ''))
+                  }
                 })
                 })
 
 
                 queries.push('PRAGMA foreign_keys = ON')
                 queries.push('PRAGMA foreign_keys = ON')

lib/query-interface.js

@@ -234,12 +234,18 @@ module.exports = (function() {
     }).run()
     }).run()
   }
   }
 
 
-  QueryInterface.prototype.dropAllTables = function() {
+  QueryInterface.prototype.dropAllTables = function(options) {
     var self = this
     var self = this
 
 
+    if (!options) {
+      options = {}
+    }
+
+    var skip = options.skip || [];
+
     if (this.sequelize.options.dialect === 'sqlite') {
     if (this.sequelize.options.dialect === 'sqlite') {
       // sqlite needs some special treatment as it cannot drop a column
       // sqlite needs some special treatment as it cannot drop a column
-      return SQLiteQueryInterface.dropAllTables.call(this)
+      return SQLiteQueryInterface.dropAllTables.call(this, options)
     } else {
     } else {
       return new Utils.CustomEventEmitter(function(dropAllTablesEmitter) {
       return new Utils.CustomEventEmitter(function(dropAllTablesEmitter) {
         var events  = []
         var events  = []
@@ -262,7 +268,10 @@ module.exports = (function() {
 
 
             // add the table removal query to the chainer
             // add the table removal query to the chainer
             tableNames.forEach(function(tableName) {
             tableNames.forEach(function(tableName) {
-              chainer.add(self, 'dropTable', [ tableName, { cascade: true } ])
+              // if tableName is not in the Array of tables names then dont drop it
+              if (skip.indexOf(tableName) === -1) {
+                chainer.add(self, 'dropTable', [ tableName, { cascade: true } ])
+              }
             })
             })
 
 
             chainer
             chainer

test/query-interface.test.js

@@ -45,6 +45,24 @@ describe(Support.getTestDialectTeaser("QueryInterface"), function () {
         })
         })
       })
       })
     })
     })
+
+    it('should be able to skip given tables', function(done){
+      var self = this
+      self.queryInterface.createTable('skipme', {
+        name: DataTypes.STRING,
+      }).success(function() {
+        self.queryInterface.dropAllTables({skip: ['skipme']}).complete(function(err){
+          expect(err).to.be.null
+          
+          self.queryInterface.showAllTables().complete(function(err, tableNames) {
+            expect(err).to.be.null
+
+            expect(tableNames).to.contain('skipme');
+            done();
+          })
+        })
+      })
+    })
   })
   })
 
 
   describe('indexes', function() {
   describe('indexes', function() {