Merge branch 'master' into milestones/2.0.0

changelog.md

@@ -4,6 +4,7 @@ Notice: All 1.7.x changes are present in 2.0.x aswell
 - fixes issue with postgres sync and enums [#1020](https://github.com/sequelize/sequelize/issues/1020)
 - fixes various issues with limit and includes [#1322](https://github.com/sequelize/sequelize/pull/1322) 
 - fixes issues with migrations/queryInterface createTable and enums
+- migration/queryInterface.addIndex() no longer fals on reserved keywords like 'from'
 
 #### Backwards compatability changes
 - find/findAll will now always return primary keys regardless of `attributes` settings. (Motivation was to fix various issues with eager loading)

test/mysql/query-generator.test.js

@@ -469,7 +469,7 @@ if (Support.dialectIsMySQL()) {
       addIndexQuery: [
         {
           arguments: ['User', ['username', 'isAdmin']],
-          expectation: 'CREATE INDEX user_username_is_admin ON User (username, isAdmin)'
+          expectation: 'CREATE INDEX user_username_is_admin ON User (`username`, `isAdmin`)'
         }, {
           arguments: [
             'User', [
@@ -477,12 +477,12 @@ if (Support.dialectIsMySQL()) {
               'isAdmin'
             ]
           ],
-          expectation: "CREATE INDEX user_username_is_admin ON User (username(10) ASC, isAdmin)"
+          expectation: "CREATE INDEX user_username_is_admin ON User (`username`(10) ASC, `isAdmin`)"
         }, {
           arguments: [
             'User', ['username', 'isAdmin'], { parser: 'foo', indicesType: 'FULLTEXT', indexName: 'bar'}
           ],
-          expectation: "CREATE FULLTEXT INDEX bar ON User (username, isAdmin) WITH PARSER foo"
+          expectation: "CREATE FULLTEXT INDEX bar ON User (`username`, `isAdmin`) WITH PARSER foo"
         }
       ],