add support for mysql insert ignore + tests

lib/dao-factory.js

@@ -778,7 +778,8 @@ module.exports = (function() {
 
 
     options = Utils._.extend({
     options = Utils._.extend({
       validate: false,
       validate: false,
-      hooks: false
+      hooks: false,
+      ignore: false
     }, options || {})
     }, options || {})
 
 
     if (fieldsOrOptions instanceof Array) {
     if (fieldsOrOptions instanceof Array) {

lib/dialects/mysql/query-generator.js

@@ -176,8 +176,8 @@ module.exports = (function() {
       return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
       return Utils._.template(query)({ tableName: tableName, attributes: attrString.join(', ') })
     },
     },
 
 
-    bulkInsertQuery: function(tableName, attrValueHashes) {
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %>;"
+    bulkInsertQuery: function(tableName, attrValueHashes, options) {
+      var query = "INSERT<%= ignore %> INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %>;"
         , tuples = []
         , tuples = []
         , allAttributes = []
         , allAttributes = []
 
 
@@ -196,6 +196,7 @@ module.exports = (function() {
       }.bind(this))
       }.bind(this))
 
 
       var replacements  = {
       var replacements  = {
+        ignore: options && options.ignore ? ' IGNORE' : '',
         table: this.quoteIdentifier(tableName),
         table: this.quoteIdentifier(tableName),
         attributes: allAttributes.map(function(attr){
         attributes: allAttributes.map(function(attr){
                       return this.quoteIdentifier(attr)
                       return this.quoteIdentifier(attr)

lib/query-interface.js

@@ -480,7 +480,7 @@ module.exports = (function() {
   }
   }
 
 
   QueryInterface.prototype.bulkInsert = function(tableName, records, options) {
   QueryInterface.prototype.bulkInsert = function(tableName, records, options) {
-    var sql = this.QueryGenerator.bulkInsertQuery(tableName, records)
+    var sql = this.QueryGenerator.bulkInsertQuery(tableName, records, options)
     return queryAndEmit.call(this, [sql, null, options], 'bulkInsert')
     return queryAndEmit.call(this, [sql, null, options], 'bulkInsert')
   }
   }
 
 

test/dao-factory/create.test.js

@@ -24,7 +24,8 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       data:         DataTypes.STRING,
       data:         DataTypes.STRING,
       intVal:       DataTypes.INTEGER,
       intVal:       DataTypes.INTEGER,
       theDate:      DataTypes.DATE,
       theDate:      DataTypes.DATE,
-      aBool:        DataTypes.BOOLEAN
+      aBool:        DataTypes.BOOLEAN,
+      uniqueName:   { type: DataTypes.STRING, unique: true }
     })
     })
 
 
     this.User.sync({ force: true }).success(function() {
     this.User.sync({ force: true }).success(function() {
@@ -990,6 +991,28 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
+    it("should support the insert ignore option", function(done) {
+      var self = this
+        , data = [{ uniqueName: 'Peter', secretValue: '42' },
+                  { uniqueName: 'Paul', secretValue: '23' }]
+
+      this.User.bulkCreate(data, { fields: ['uniqueName', 'secretValue'] }).success(function() {
+        data.push({ uniqueName: 'Michael', secretValue: '26' });
+        self.User.bulkCreate(data, { fields: ['uniqueName', 'secretValue'], ignore: true }).success(function() {
+          self.User.findAll({order: 'id'}).success(function(users) {
+            expect(users.length).to.equal(3)
+            expect(users[0].uniqueName).to.equal("Peter")
+            expect(users[0].secretValue).to.equal("42");
+            expect(users[1].uniqueName).to.equal("Paul")
+            expect(users[1].secretValue).to.equal("23");
+            expect(users[2].uniqueName).to.equal("Michael")
+            expect(users[2].secretValue).to.equal("26");
+            done()
+          });
+        });
+      })
+    })
+
     describe('enums', function() {
     describe('enums', function() {
       it('correctly restores enum values', function(done) {
       it('correctly restores enum values', function(done) {
         var self = this
         var self = this

test/mysql/query-generator.test.js

@@ -389,6 +389,9 @@ if (Support.dialectIsMySQL()) {
         }, {
         }, {
           arguments: ['myTable', [{name: "foo", value: true}, {name: 'bar', value: false}]],
           arguments: ['myTable', [{name: "foo", value: true}, {name: 'bar', value: false}]],
           expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('foo',true),('bar',false);"
           expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('foo',true),('bar',false);"
+        }, {
+          arguments: ['myTable', [{name: 'foo'}, {name: 'bar'}], {ignore: true}],
+          expectation: "INSERT IGNORE INTO `myTable` (`name`) VALUES ('foo'),('bar');"
         }
         }
       ],
       ],