made addQuotes and removeQuotes parts of the QueryGenerator

lib/dialects/mysql/query-generator.js

@@ -20,20 +20,20 @@ module.exports = (function() {
 
 
           if (Utils._.includes(dataType, 'PRIMARY KEY')) {
           if (Utils._.includes(dataType, 'PRIMARY KEY')) {
             primaryKeys.push(attr)
             primaryKeys.push(attr)
-            attrStr.push(Utils.addTicks(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
+            attrStr.push(QueryGenerator.addQuotes(attr) + " " + dataType.replace(/PRIMARY KEY/, ''))
           } else {
           } else {
-            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+            attrStr.push(QueryGenerator.addQuotes(attr) + " " + dataType)
           }
           }
         }
         }
       }
       }
 
 
       var values = {
       var values = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         attributes: attrStr.join(", "),
         attributes: attrStr.join(", "),
         engine: options.engine,
         engine: options.engine,
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
         charset: (options.charset ? "DEFAULT CHARSET=" + options.charset : "")
       }
       }
-      , pkString = primaryKeys.map(function(pk) { return Utils.addTicks(pk) }).join(", ")
+      , pkString = primaryKeys.map(function(pk) { return QueryGenerator.addQuotes(pk) }).join(", ")
 
 
       if (pkString.length > 0) {
       if (pkString.length > 0) {
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
         values.attributes += ", PRIMARY KEY (" + pkString + ")"
@@ -47,7 +47,9 @@ module.exports = (function() {
 
 
       var query = "DROP TABLE IF EXISTS <%= table %>;"
       var query = "DROP TABLE IF EXISTS <%= table %>;"
 
 
-      return Utils._.template(query)({table: Utils.addTicks(tableName)})
+      return Utils._.template(query)({
+        table: QueryGenerator.addQuotes(tableName)
+      })
     },
     },
 
 
     renameTableQuery: function(before, after) {
     renameTableQuery: function(before, after) {
@@ -118,12 +120,12 @@ module.exports = (function() {
         , table = null
         , table = null
 
 
       options            = options || {}
       options            = options || {}
-      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return Utils.addTicks(tbl) }).join(", ") : Utils.addTicks(tableName)
+      options.table      = table = Array.isArray(tableName) ? tableName.map(function(tbl){ return QueryGenerator.addQuotes(tbl) }).join(", ") : QueryGenerator.addQuotes(tableName)
       options.attributes = options.attributes && options.attributes.map(function(attr){
       options.attributes = options.attributes && options.attributes.map(function(attr){
         if(Array.isArray(attr) && attr.length == 2) {
         if(Array.isArray(attr) && attr.length == 2) {
-          return [attr[0], Utils.addTicks(attr[1])].join(' as ')
+          return [attr[0], QueryGenerator.addQuotes(attr[1])].join(' as ')
         } else {
         } else {
-          return attr.indexOf(Utils.TICK_CHAR) < 0 ? Utils.addTicks(attr) : attr
+          return attr.indexOf(Utils.TICK_CHAR) < 0 ? QueryGenerator.addQuotes(attr) : attr
         }
         }
       }).join(", ")
       }).join(", ")
       options.attributes = options.attributes || '*'
       options.attributes = options.attributes || '*'
@@ -159,7 +161,7 @@ module.exports = (function() {
       }
       }
 
 
       if (options.group) {
       if (options.group) {
-        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return Utils.addTicks(grp)}).join(', ') : Utils.addTicks(options.group)
+        options.group = Array.isArray(options.group) ? options.group.map(function(grp){return QueryGenerator.addQuotes(grp)}).join(', ') : QueryGenerator.addQuotes(options.group)
         query += " GROUP BY <%= group %>"
         query += " GROUP BY <%= group %>"
       }
       }
 
 
@@ -187,8 +189,8 @@ module.exports = (function() {
       var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
       var query = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>);"
 
 
       var replacements  = {
       var replacements  = {
-        table: Utils.addTicks(tableName),
-        attributes: Object.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
+        table: QueryGenerator.addQuotes(tableName),
+        attributes: Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(","),
         values: Utils._.values(attrValueHash).map(function(value){
         values: Utils._.values(attrValueHash).map(function(value){
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
           return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
         }).join(",")
         }).join(",")
@@ -207,11 +209,11 @@ module.exports = (function() {
         var value  = attrValueHash[key]
         var value  = attrValueHash[key]
           , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
           , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
 
 
-        values.push(Utils.addTicks(key) + "=" + Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + Utils.escape(_value))
       }
       }
 
 
       var replacements = {
       var replacements = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         values: values.join(","),
         values: values.join(","),
         where: QueryGenerator.getWhereConditions(where)
         where: QueryGenerator.getWhereConditions(where)
       }
       }
@@ -225,7 +227,7 @@ module.exports = (function() {
 
 
       var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
       var query = "DELETE FROM <%= table %> WHERE <%= where %> LIMIT <%= limit %>"
       var replacements = {
       var replacements = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         where: QueryGenerator.getWhereConditions(where),
         where: QueryGenerator.getWhereConditions(where),
         limit: Utils.escape(options.limit)
         limit: Utils.escape(options.limit)
       }
       }
@@ -243,11 +245,11 @@ module.exports = (function() {
         var value  = attrValueHash[key]
         var value  = attrValueHash[key]
           , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
           , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
 
 
-        values.push(Utils.addTicks(key) + "=" + Utils.addTicks(key) + " + " +Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
       }
       }
 
 
       var replacements = {
       var replacements = {
-        table: Utils.addTicks(tableName),
+        table: QueryGenerator.addQuotes(tableName),
         values: values.join(","),
         values: values.join(","),
         where: QueryGenerator.getWhereConditions(where)
         where: QueryGenerator.getWhereConditions(where)
       }
       }
@@ -342,7 +344,7 @@ module.exports = (function() {
         var value = hash[key]
         var value = hash[key]
 
 
          //handle qualified key names
          //handle qualified key names
-        var _key   = key.split('.').map(function(col){return Utils.addTicks(col)}).join(".")
+        var _key   = key.split('.').map(function(col){return QueryGenerator.addQuotes(col)}).join(".")
           , _value = null
           , _value = null
 
 
         if (Array.isArray(value)) {
         if (Array.isArray(value)) {
@@ -357,7 +359,7 @@ module.exports = (function() {
           // is value an object?
           // is value an object?
 
 
           //using as sentinel for join column => value
           //using as sentinel for join column => value
-          _value = value.join.split('.').map(function(col){ return Utils.addTicks(col) }).join(".")
+          _value = value.join.split('.').map(function(col){ return QueryGenerator.addQuotes(col) }).join(".")
           result.push([_key, _value].join("="))
           result.push([_key, _value].join("="))
         } else {
         } else {
           _value = Utils.escape(value)
           _value = Utils.escape(value)
@@ -432,6 +434,14 @@ module.exports = (function() {
       }
       }
 
 
       return fields
       return fields
+    },
+
+    addQuotes: function(s, quoteChar) {
+      return Utils.addTicks(s, quoteChar)
+    },
+
+    removeQuotes: function(s, quoteChar) {
+      return Utils.removeTicks(s, quoteChar)
     }
     }
   }
   }