Added support for collate in MySQL query generator and added es5: true to jshint…

… (removes errors about the use of reserved keywords

.jshintrc

@@ -18,5 +18,6 @@
     "unused": true,
     "unused": true,
     "asi": true,
     "asi": true,
     "evil": false,
     "evil": false,
-    "laxcomma": true
+    "laxcomma": true,
+    "es5": true
 }
 }
\ No newline at end of file

README.md

@@ -242,7 +242,8 @@ for (var key in obj) {
   "unused": true,
   "unused": true,
   "asi": true,
   "asi": true,
   "evil": false,
   "evil": false,
-  "laxcomma": true
+  "laxcomma": true,
+  "es5": true
 }
 }
 ```
 ```
 
 

lib/dialects/mysql/query-generator.js

@@ -43,7 +43,7 @@ module.exports = (function() {
         charset: null
         charset: null
       }, options || {})
       }, options || {})
 
 
-      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)<%= comment %> ENGINE=<%= engine %> <%= charset %>"
+      var query   = "CREATE TABLE IF NOT EXISTS <%= table %> (<%= attributes%>)<%= comment %> ENGINE=<%= engine %> <%= charset %> <%= collation %>"
         , primaryKeys = []
         , primaryKeys = []
         , foreignKeys = {}
         , foreignKeys = {}
         , attrStr = []
         , attrStr = []
@@ -71,7 +71,8 @@ module.exports = (function() {
         attributes: attrStr.join(", "),
         attributes: attrStr.join(", "),
         comment: options.comment && Utils._.isString(options.comment) ? " COMMENT " + this.escape(options.comment) : "",
         comment: options.comment && Utils._.isString(options.comment) ? " COMMENT " + this.escape(options.comment) : "",
         engine: options.engine,
         engine: options.engine,
-        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
+        charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : ""),
+        collation: (options.collate ? "COLLATE " + options.collate : "")
       }
       }
       , pkString = primaryKeys.map(function(pk) { return this.quoteIdentifier(pk) }.bind(this)).join(", ")
       , pkString = primaryKeys.map(function(pk) { return this.quoteIdentifier(pk) }.bind(this)).join(", ")
 
 

spec-jasmine/mysql/query-generator.spec.js

@@ -77,17 +77,21 @@ describe('QueryGenerator', function() {
       },
       },
       {
       {
         arguments: ['myTable', {title: "INTEGER COMMENT 'I\\'m a comment!'"}],
         arguments: ['myTable', {title: "INTEGER COMMENT 'I\\'m a comment!'"}],
-        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` INTEGER COMMENT 'I\\'m a comment!') ENGINE=InnoDB;",
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` INTEGER COMMENT 'I\\'m a comment!') ENGINE=InnoDB;"
       },
       },
       {
       {
         arguments: ['myTable', {title: "INTEGER"}, {comment:  "I'm a comment!"}],
         arguments: ['myTable', {title: "INTEGER"}, {comment:  "I'm a comment!"}],
-        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` INTEGER) COMMENT 'I\\'m a comment!' ENGINE=InnoDB;",
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` INTEGER) COMMENT 'I\\'m a comment!' ENGINE=InnoDB;"
       },
       },
       {
       {
         arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}, {engine: 'MyISAM'}],
         arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}, {engine: 'MyISAM'}],
         expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255)) ENGINE=MyISAM;"
         expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255)) ENGINE=MyISAM;"
       },
       },
       {
       {
+        arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}, {charset: 'utf8', collate: 'utf8_unicode_ci'}],
+        expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;"
+      },
+      {
         arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}, {charset: 'latin1'}],
         arguments: ['myTable', {title: 'VARCHAR(255)', name: 'VARCHAR(255)'}, {charset: 'latin1'}],
         expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255)) ENGINE=InnoDB DEFAULT CHARSET=latin1;"
         expectation: "CREATE TABLE IF NOT EXISTS `myTable` (`title` VARCHAR(255), `name` VARCHAR(255)) ENGINE=InnoDB DEFAULT CHARSET=latin1;"
       },
       },