Added dropping all tables to sync when force is true, and removed sync statement…

…s from n:m constraint tests

lib/sequelize.js

@@ -387,6 +387,10 @@ module.exports = (function() {
     // Topologically sort by foreign key constraints to give us an appropriate
     // creation order
 
+    if (this.options.force) {
+      chainer.add(this, 'drop')
+    }
+
     this.daoFactoryManager.forEachDAO(function(dao) {
       if (dao) {
         chainer.add(dao, 'sync', [options])

test/associations/has-many.test.js

@@ -44,7 +44,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
 
           Article.hasMany(Label)
 
-          sequelize.drop().success(function () {
           sequelize.sync({ force: true }).success(function() {
             Article.create({ title: 'foo' }).success(function(article) {
               Label.create({ text: 'bar' }).success(function(label) {
@@ -68,7 +67,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
           })
         })
       })
-      })
 
       it('does not have any labels assigned to it initially', function(done) {
         var chainer = new Sequelize.Utils.QueryChainer([
@@ -139,7 +137,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
 
           Article.hasMany(Label)
 
-          sequelize.drop().success(function () {
           sequelize.sync({ force: true }).success(function() {
             Article.create({ title: 'foo' }).success(function(article) {
               Label.create({ text: 'bar' }).success(function(label) {
@@ -163,7 +160,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
           })
         })
       })
-      })
 
       it('answers false if only some labels have been assigned', function(done) {
         var chainer = new Sequelize.Utils.QueryChainer([
@@ -411,7 +407,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
 
         this.Article.hasMany(this.Label)
 
-        this.sequelize.drop().success(function () {
         self.sequelize.sync({ force: true }).success(function() {
           var chainer = new Sequelize.Utils.QueryChainer([
             self.Article.create({ title: 'Article' }),
@@ -431,7 +426,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
           })
         })
       })
-      })
 
       it("gets all associated objects when no options are passed", function(done) {
         this.User.find({where: {username: 'John'}}).success(function (john) {
@@ -566,7 +560,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
           Article.hasMany(Label)
           Label.hasMany(Article)
 
-          sequelize.drop().success(function () {
           sequelize.sync({ force: true }).success(function() {
             Article.create({ title: 'foo' }).success(function(article) {
               Label.create({ text: 'bar' }).success(function(label) {
@@ -590,7 +583,6 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
           })
         })
       })
-      })
 
       it("gets all associated objects when no options are passed", function(done) {
         this.User.find({where: {username: 'John'}}).success(function (john) {

test/dao-factory/find.test.js

@@ -277,7 +277,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         self.Worker      = self.sequelize.define('Worker', { name: Sequelize.STRING })
 
         this.init = function(callback) {
-          self.sequelize.drop().success(function () {
           self.sequelize.sync({ force: true }).success(function() {
             self.Worker.create({ name: 'worker' }).success(function(worker) {
               self.Task.create({ title: 'homework' }).success(function(task) {
@@ -285,8 +284,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
                 self.task      = task
                 callback()
               })
-              
-              })
             })
           })
         }
@@ -519,7 +516,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           })
           self.Group.hasOne(self.User)
 
-          self.sequelize.drop().success(function () {
           self.sequelize.sync({ force: true }).success(function() {
             self.Group.create({ name: 'people' }).success(function() {
               self.User.create({ username: 'someone', GroupPKeageroneName: 'people' }).success(function() {
@@ -540,7 +536,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           })
         })
       })
-      })
 
       describe('hasOne with alias', function() {
         it('throws an error if included DaoFactory is not referenced by alias', function(done) {
@@ -654,7 +649,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           self.Contact.hasMany(self.Photo, { as: 'Photos' })
           self.Contact.hasMany(self.PhoneNumber)
 
-          self.sequelize.drop().success(function () {
           self.sequelize.sync({ force: true }).success(function() {
             self.Contact.create({ name: 'Boris' }).success(function(someContact) {
               self.Photo.create({ img: 'img.jpg' }).success(function(somePhoto) {
@@ -683,7 +677,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
             })
           })
         })
-        })
 
         it('eager loads with non-id primary keys', function(done) {
           var self = this
@@ -702,7 +695,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           self.Group.hasMany(self.User)
           self.User.hasMany(self.Group)
 
-          self.sequelize.drop().success(function () {
           self.sequelize.sync({ force: true }).success(function() {
             self.User.create({ username: 'someone' }).success(function(someUser) {
               self.Group.create({ name: 'people' }).success(function(someGroup) {
@@ -726,7 +718,6 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           })
         })
       })
-      })
 
       describe('hasMany with alias', function() {
         it('throws an error if included DaoFactory is not referenced by alias', function(done) {