Add support for sequelize.fn in indexes. Closes #3108

lib/dialects/abstract/query-generator.js

@@ -460,6 +460,8 @@ module.exports = (function() {
       var transformedAttributes = attributes.map(function(attribute) {
         if (typeof attribute === 'string') {
           return this.quoteIdentifier(attribute);
+        } else if (attribute._isSequelizeMethod) {
+          return this.handleSequelizeMethod(attribute);
         } else {
           var result = '';
 

lib/sequelize.js

@@ -512,7 +512,7 @@ module.exports = (function() {
    * @param {String}                  [options.indexes[].method] The method to create the index by (`USING` statement in SQL). BTREE and HASH are supported by mysql and postgres, and postgres additionally supports GIST and GIN.
    * @param {Boolean}                 [options.indexes[].unique=false] Should the index by unique? Can also be triggered by setting type to `UNIQUE`
    * @param {Boolean}                 [options.indexes[].concurrently=false] PostgreSQL will build the index without taking any write locks. Postgres only
-   * @param {Array<String|Object}     [options.indexes[].fields] An array of the fields to index. Each field can either be a string containing the name of the field, or an object with the following attributes: `attribute` (field name), `length` (create a prefix index of length chars), `order` (the direction the column should be sorted in), `collate` (the collation (sort order) for the column)
+   * @param {Array<String|Object}     [options.indexes[].fields] An array of the fields to index. Each field can either be a string containing the name of the field, a sequelize object (e.g `sequelize.fn`), or an object with the following attributes: `attribute` (field name), `length` (create a prefix index of length chars), `order` (the direction the column should be sorted in), `collate` (the collation (sort order) for the column)
    * @param {String|Boolean}          [options.createdAt] Override the name of the createdAt column if a string is provided, or disable it if false. Timestamps must be true
    * @param {String|Boolean}          [options.updatedAt] Override the name of the updatedAt column if a string is provided, or disable it if false. Timestamps must be true
    * @param {String|Boolean}          [options.deletedAt] Override the name of the deletedAt column if a string is provided, or disable it if false. Timestamps must be true

test/unit/sql/index.test.js

+'use strict';
+
+var Support   = require(__dirname + '/../support')
+  , DataTypes = require(__dirname + '/../../../lib/data-types')
+  , util      = require('util')
+  , expectsql = Support.expectsql
+  , current   = Support.sequelize
+  , sql       = current.dialect.QueryGenerator
+  , current = Support.sequelize;
+
+// Notice: [] will be replaced by dialect specific tick/quote character when there is not dialect specific expectation but only a default expectation
+
+suite(Support.getTestDialectTeaser('SQL'), function() {
+  suite('addIndex', function () {
+    test('naming', function () {
+      expectsql(sql.addIndexQuery('table', ['column1', 'column2'], {}, 'table'), {
+        default: 'CREATE INDEX [table_column1_column2] ON [table] ([column1], [column2])'
+      });
+    });
+
+    test('POJO field', function () {
+      expectsql(sql.addIndexQuery('table', [{ attribute: 'column', collate: 'BINARY', length: 5, order: 'DESC'}], {}, 'table'), {
+        default: 'CREATE INDEX [table_column] ON [table] ([column] COLLATE [BINARY] DESC)',
+        mysql: 'CREATE INDEX `table_column` ON `table` (`column`(5) DESC)'
+      });
+    });
+
+
+    test('function', function () {
+      expectsql(sql.addIndexQuery('table', [current.fn('UPPER', current.col('test'))], { name: 'myindex'}), {
+        default: 'CREATE INDEX [myindex] ON [table] (UPPER([test]))'
+      });
+    });
+  });
+});