Rebase onto sequelize master and reflect MySQL query generator refactoring there

lib/dialects/mysql/query-generator.js

@@ -244,8 +244,7 @@ module.exports = (function() {
     },
     },
 
 
     bulkInsertQuery: function(tableName, attrValueHashes) {
     bulkInsertQuery: function(tableName, attrValueHashes) {
-      var query  = "INSERT INTO <%= table %> (<%= attributes %>) VALUES <%= tuples %>;"
-        , tuples = []
+      var tuples = []
 
 
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
         tuples.push("(" +
         tuples.push("(" +
@@ -255,13 +254,12 @@ module.exports = (function() {
         ")")
         ")")
       })
       })
 
 
-      var replacements  = {
-        table: QueryGenerator.addQuotes(tableName),
-        attributes: Object.keys(attrValueHashes[0]).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(","),
-        tuples: tuples.join(",")
-      }
+      var table      = QueryGenerator.addQuotes(tableName)
+      var attributes = Object.keys(attrValueHashes[0]).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(",")
+
+      var query  = "INSERT INTO " + table + " (" + attributes + ") VALUES " + tuples.join(",") + ";"
 
 
-      return Utils._.template(query)(replacements)
+      return query
     },
     },
 
 
     updateQuery: function(tableName, attrValueHash, where) {
     updateQuery: function(tableName, attrValueHash, where) {
@@ -306,13 +304,12 @@ module.exports = (function() {
     bulkDeleteQuery: function(tableName, where, options) {
     bulkDeleteQuery: function(tableName, where, options) {
       options = options || {}
       options = options || {}
 
 
-      var query = "DELETE FROM <%= table %> WHERE <%= where %>"
-      var replacements = {
-        table: QueryGenerator.addQuotes(tableName),
-        where: QueryGenerator.getWhereConditions(where)
-      }
+      var table = QueryGenerator.addQuotes(tableName)
+      var where = QueryGenerator.getWhereConditions(where)
+
+      var query = "DELETE FROM " + table + " WHERE " + where
 
 
-      return Utils._.template(query)(replacements)
+      return query
     },
     },
 
 
     incrementQuery: function (tableName, attrValueHash, where) {
     incrementQuery: function (tableName, attrValueHash, where) {
@@ -326,7 +323,7 @@ module.exports = (function() {
 
 
         values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
         values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
       }
       }
-      
+
       var table = QueryGenerator.addQuotes(tableName)
       var table = QueryGenerator.addQuotes(tableName)
       var values =  values.join(",")
       var values =  values.join(",")
       var where = QueryGenerator.getWhereConditions(where)
       var where = QueryGenerator.getWhereConditions(where)

lib/dialects/postgres/query.js

@@ -116,6 +116,7 @@ module.exports = (function() {
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
             }
             }
             this.callee[key] = record
             this.callee[key] = record
+          }
         }
         }
       }
       }
 
 
@@ -129,6 +130,7 @@ module.exports = (function() {
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
               record = this.callee.daoFactory.daoFactoryManager.sequelize.queryInterface.QueryGenerator.toHstore(record)
             }
             }
             this.callee[key] = record
             this.callee[key] = record
+          }
         }
         }
       }
       }