bc + jshint

lib/dialects/abstract/query-generator.js

@@ -471,6 +471,12 @@ module.exports = (function() {
       if (options.indexName) {
         options.name = options.indexName;
       }
+      if (options.indicesType) {
+        options.type = options.indicesType;
+      }
+      if (options.indexType || options.method) {
+        options.using = options.indexType || options.method;
+      }
 
       options.prefix = options.prefix || rawTablename || tableName;
 
@@ -533,10 +539,6 @@ module.exports = (function() {
         delete options.type;
       }
 
-      if (options.indexType || options.method) {
-        options.using = options.indexType || options.method;
-      }
-
       return Utils._.compact([
         'CREATE',
         options.unique ? 'UNIQUE' : '',

test/integration/model/json.test.js

@@ -3,13 +3,11 @@
 /* jshint -W030 */
 /* jshint -W110 */
 var chai = require('chai')
-  , sinon = require('sinon')
   , Sequelize = require('../../../index')
   , Promise = Sequelize.Promise
   , expect = chai.expect
   , Support = require(__dirname + '/../support')
   , DataTypes = require(__dirname + '/../../../lib/data-types')
-  , config = require(__dirname + '/../../config/config')
   , current = Support.sequelize;
 
 chai.config.includeStack = true;
@@ -161,5 +159,5 @@ describe(Support.getTestDialectTeaser('Model'), function() {
         });
       });
     });
-  };
+  }
 });
\ No newline at end of file