removed code duplication

lib/dialects/mysql/query-generator.js

@@ -127,18 +127,10 @@ module.exports = (function() {
     },
 
     insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
       var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
 
-      if(this.options.omitNull) {
-        _attrValueHash = {}
-        Utils._.each(attrValueHash, function(val, key) {
-          if(val !== null && val !== undefined) {
-            _attrValueHash[key] = val;
-          }
-        })
-        attrValueHash = _attrValueHash
-      }
-      
       var replacements  = {
         table: Utils.addTicks(tableName),
         attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
@@ -150,22 +142,14 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
-    updateQuery: function(tableName, values, where) {
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
       var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-      
-      if(this.options.omitNull) {
-        _attrValueHash = {}
-        Utils._.each(values, function(val, key) {
-          if(val !== null && val !== undefined) {
-            _attrValueHash[key] = val;
-          }
-        })
-        values = _attrValueHash
-      }
-		
+
       var replacements = {
         table: Utils.addTicks(tableName),
-        values: Utils._.map(values, function(value, key){
+        values: Utils._.map(attrValueHash, function(value, key){
           return Utils.addTicks(key) + "=" + Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(","),
         where: QueryGenerator.getWhereConditions(where)

lib/dialects/postgres/query-generator.js

@@ -191,19 +191,10 @@ module.exports = (function() {
     },
 
     insertQuery: function(tableName, attrValueHash) {
-      var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      if(this.options.omitNull) {
-        _attrValueHash = {}
-        Utils._.each(attrValueHash, function(val, key) {
-          if(val !== null && val !== undefined) {
-            _attrValueHash[key] = val;
-          }
-        })
-        attrValueHash = _attrValueHash
-      }
-
-      var returning = []
+      var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
+        , returning = []
 
       Utils._.forEach(attrValueHash, function(value, key, hash) {
         if (tables[tableName] && tables[tableName][key]) {
@@ -227,22 +218,14 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
-    updateQuery: function(tableName, values, where) {
-      var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
-      if(this.options.omitNull) {
-        _attrValueHash = {}
-        Utils._.each(values, function(val, key) {
-          if(val !== null && val !== undefined) {
-            _attrValueHash[key] = val;
-          }
-        })
-        values = _attrValueHash
-      }
+      var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
 
       var replacements = {
         table: addQuotes(tableName),
-        values: Utils._.map(values, function(value, key){
+        values: Utils._.map(attrValueHash, function(value, key){
           return addQuotes(key) + "=" + pgEscape((value instanceof Date) ? pgSqlDate(value) : value)
         }).join(","),
         where: QueryGenerator.getWhereConditions(where)

lib/dialects/sqlite/query-generator.js

@@ -16,7 +16,7 @@ var escape = function(str) {
 module.exports = (function() {
   var QueryGenerator = {
     options: {},
-    
+
     createTableQuery: function(tableName, attributes, options) {
       options = options || {}
 
@@ -44,18 +44,10 @@ module.exports = (function() {
     },
 
     insertQuery: function(tableName, attrValueHash) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
       var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);";
 
-      if(this.options.omitNull) {
-        _attrValueHash = {}
-        Utils._.each(attrValueHash, function(val, key) {
-          if(val !== null && val !== undefined) {
-            _attrValueHash[key] = val;
-          }
-        })
-        attrValueHash = _attrValueHash
-      }
-      
       var replacements  = {
         table: Utils.addTicks(tableName),
         attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
@@ -67,21 +59,14 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
     },
 
-    updateQuery: function(tableName, values, where) {
+    updateQuery: function(tableName, attrValueHash, where) {
+      attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
+
       var query = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %>"
-      
-      if(this.options.omitNull) {
-        _attrValueHash = {}
-        Utils._.each(values, function(val, key) {
-          if(val !== null && val !== undefined) {
-            _attrValueHash[key] = val;
-          }
-        })
-        values = _attrValueHash
-      }
+
       var replacements = {
         table: Utils.addTicks(tableName),
-        values: Utils._.map(values, function(value, key){
+        values: Utils._.map(attrValueHash, function(value, key){
           return Utils.addTicks(key) + "=" + escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(","),
         where: MySqlQueryGenerator.getWhereConditions(where)