Merge branch 'master' into milestones/2.0.0

Conflicts:
	test/dao.validations.test.js

changelog.md

@@ -27,6 +27,7 @@
 - [BUG] Fixed problems with quoteIdentifiers and {raw: false} option on raw queries [#751](https://github.com/sequelize/sequelize/pull/751). thanks to janmeier
 - [BUG] Fixed SQL escaping with sqlite and unified escaping [#700](https://github.com/sequelize/sequelize/pull/700). thanks to PiPeep
 - [BUG] Fixed Postgres' pools [ff57af63](https://github.com/sequelize/sequelize/commit/ff57af63c2eb395b4828a5984a22984acdc2a5e1)
+- [BUG] Fixed BLOB/TEXT columns having a default value declared in MySQL [#793](https://github.com/sequelize/sequelize/pull/793). thanks to durango
 - [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude

lib/dialects/mysql/query-generator.js

@@ -520,7 +520,8 @@ module.exports = (function() {
             template += " auto_increment"
           }
 
-          if ((dataType.defaultValue !== undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+          // Blobs/texts cannot have a defaultValue
+          if (dataType.type !== "TEXT" && dataType.type._binary !== true && (dataType.defaultValue !== undefined) && (dataType.defaultValue != DataTypes.NOW)) {
             template += " DEFAULT " + this.escape(dataType.defaultValue)
           }
 

test/mysql/dao-factory.test.js

@@ -71,6 +71,18 @@ if (dialect.match(/^mysql/)) {
         expect(User.attributes).to.deep.equal({id:"INTEGER NOT NULL auto_increment PRIMARY KEY", deleted_at:"DATETIME", updated_at:"DATETIME NOT NULL", created_at:"DATETIME NOT NULL"})
         done()
       })
+
+      it('omits text fields with defaultValues', function(done) {
+        var User = this.sequelize.define('User' + config.rand(), {name: {type: DataTypes.TEXT, defaultValue: 'helloworld'}})
+        expect(User.attributes.name).to.equal('TEXT')
+        done()
+      })
+
+      it('omits blobs fields with defaultValues', function(done) {
+        var User = this.sequelize.define('User' + config.rand(), {name: {type: DataTypes.STRING.BINARY, defaultValue: 'helloworld'}})
+        expect(User.attributes.name).to.equal('VARCHAR(255) BINARY')
+        done()
+      })
     })
 
     describe('primaryKeys', function() {

test/mysql/query-generator.test.js

@@ -68,7 +68,7 @@ if (dialect.match(/^mysql/)) {
         {
           arguments: [{id: {type: 'INTEGER', allowNull: false, autoIncrement: true, defaultValue: 1, references: 'Bar', onDelete: 'CASCADE', onUpdate: 'RESTRICT'}}],
           expectation: {id: 'INTEGER NOT NULL auto_increment DEFAULT 1 REFERENCES `Bar` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT'}
-        },
+        }
       ],
 
       createTableQuery: [