ignoreNull option added. Should be passed in the options hash to new Sequelize()…

…. Tested and works for MySQL only

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

@@ -89,6 +89,17 @@ describe('QueryGenerator', function() {
       }, {
       }, {
         arguments: ['myTable', {name: 'foo', foo: 1}],
         arguments: ['myTable', {name: 'foo', foo: 1}],
         expectation: "INSERT INTO `myTable` (`name`,`foo`) VALUES ('foo',1);"
         expectation: "INSERT INTO `myTable` (`name`,`foo`) VALUES ('foo',1);"
+      }, {
+        arguments: ['myTable', {name: 'foo', foo: 1, nullValue: null}],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL);"
+      }, {
+        arguments: ['myTable', {name: 'foo', foo: 1, nullValue: null}],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL);",
+        context: {options: {ignoreNull: false}}
+      }, {
+        arguments: ['myTable', {name: 'foo', foo: 1, nullValue: null}],
+        expectation: "INSERT INTO `myTable` (`name`,`foo`) VALUES ('foo',1);",
+        context: {options: {ignoreNull: true}}
       }
       }
     ],
     ],
 
 
@@ -105,6 +116,17 @@ describe('QueryGenerator', function() {
       }, {
       }, {
         arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {name: 'foo'}],
         arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {name: 'foo'}],
         expectation: "UPDATE `myTable` SET `name`='foo\\';DROP TABLE myTable;' WHERE `name`='foo'"
         expectation: "UPDATE `myTable` SET `name`='foo\\';DROP TABLE myTable;' WHERE `name`='foo'"
+      }, {
+        arguments: ['myTable', {bar: 2, nullValue: null}, {name: 'foo'}],
+        expectation: "UPDATE `myTable` SET `bar`=2,`nullValue`=NULL WHERE `name`='foo'"
+      }, {
+        arguments: ['myTable', {bar: 2, nullValue: null}, {name: 'foo'}],
+        expectation: "UPDATE `myTable` SET `bar`=2,`nullValue`=NULL WHERE `name`='foo'",
+        context: {options: {ignoreNull: false}}
+      }, {
+        arguments: ['myTable', {bar: 2, nullValue: null}, {name: 'foo'}],
+        expectation: "UPDATE `myTable` SET `bar`=2 WHERE `name`='foo'",
+        context: {options: {ignoreNull: true}}
       }
       }
     ],
     ],
 
 
@@ -177,7 +199,10 @@ describe('QueryGenerator', function() {
       tests.forEach(function(test) {
       tests.forEach(function(test) {
         var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
         var title = test.title || 'correctly returns ' + test.expectation + ' for ' + util.inspect(test.arguments)
         it(title, function() {
         it(title, function() {
-          var conditions = QueryGenerator[suiteTitle].apply(null, test.arguments)
+          // Options would normally be set by the query interface that instantiates the query-generator, but here we specify it explicitly
+          var context = test.context || {options: {}};
+          var conditions = QueryGenerator[suiteTitle].apply(context, test.arguments)
+          
           expect(conditions).toEqual(test.expectation)
           expect(conditions).toEqual(test.expectation)
         })
         })
       })
       })