Merge pull request #2665 from mbroadst/fix-schema-test-move-drop-schema

fix schema test and move dropSchema to AbstractDialect

lib/dialects/abstract/query-generator.js

@@ -28,6 +28,13 @@ module.exports = (function() {
     },
     },
 
 
     /*
     /*
+      Returns a query for dropping a schema
+    */
+    dropSchema: function(tableName, options) {
+      return this.dropTableQuery(tableName, options);
+    },
+
+    /*
       Returns a query for creating a table.
       Returns a query for creating a table.
       Parameters:
       Parameters:
         - tableName: Name of the new table.
         - tableName: Name of the new table.

lib/dialects/mysql/query-generator.js

@@ -13,10 +13,6 @@ module.exports = (function() {
       return Utils._.template(query)({});
       return Utils._.template(query)({});
     },
     },
 
 
-    dropSchema: function(tableName, options) {
-      return this.dropTableQuery(tableName, options);
-    },
-
     showSchemasQuery: function() {
     showSchemasQuery: function() {
       return 'SHOW TABLES';
       return 'SHOW TABLES';
     },
     },

lib/dialects/sqlite/query-generator.js

@@ -24,10 +24,6 @@ module.exports = (function() {
       return Utils._.template(query)({});
       return Utils._.template(query)({});
     },
     },
 
 
-    dropSchema: function(tableName, options) {
-      return this.dropTableQuery(tableName, options);
-    },
-
     showSchemasQuery: function() {
     showSchemasQuery: function() {
       return "SELECT name FROM `sqlite_master` WHERE type='table' and name!='sqlite_sequence';";
       return "SELECT name FROM `sqlite_master` WHERE type='table' and name!='sqlite_sequence';";
     },
     },

test/schema.test.js

@@ -8,11 +8,11 @@ var chai = require('chai')
 chai.config.includeStack = true;
 chai.config.includeStack = true;
 
 
 describe(Support.getTestDialectTeaser('Schema'), function () {
 describe(Support.getTestDialectTeaser('Schema'), function () {
-  before(function() {
+  beforeEach(function() {
     return this.sequelize.createSchema('testschema');
     return this.sequelize.createSchema('testschema');
   });
   });
 
 
-  after(function() {
+  afterEach(function() {
     return this.sequelize.dropSchema('testschema');
     return this.sequelize.dropSchema('testschema');
   });
   });