Merge pull request mysqljs#608 from Loddan/identifiers-array

Identifiers array

Author: dresende

Readme.md

@@ -490,9 +490,13 @@ Alternatively, you can use `??` characters as placeholders for identifiers you w
 like to have escaped like this:
 
 ```js
-connection.query('SELECT * FROM ?? WHERE id = ?', ['users', userId], function(err, results) {
+var userId = 1;
+var columns = ['username', 'email'];
+var query = connection.query('SELECT ?? FROM ?? WHERE id = ?', [columns, 'users', userId], function(err, results) {
   // ...
 });
+
+console.log(query.sql); // SELECT `username`, `email` FROM `users` WHERE id = 1
 ```
 **Please note that this last character sequence is experimental and syntax might change**
 

lib/protocol/SqlString.js

@@ -1,6 +1,12 @@
 var SqlString = exports;
 
 SqlString.escapeId = function (val, forbidQualified) {
+  if (Array.isArray(val)) {
+    return val.map(function(v) {
+      return SqlString.escapeId(v, forbidQualified);
+    }).join(', ');
+  }
+
   if (forbidQualified) {
     return '`' + val.replace(/`/g, '``') + '`';
   }

test/unit/protocol/test-SqlString.js

@@ -3,6 +3,16 @@ var test      = require('utest');
 var assert    = require('assert');
 var SqlString = require(common.lib + '/protocol/SqlString');
 
+test('SqlString.escapeId', {
+  'arrays are turned into lists': function() {
+    assert.equal(SqlString.escapeId(['a', 'b', 't.c']), "`a`, `b`, `t`.`c`");
+  },
+
+  'nested arrays are flattened': function() {
+    assert.equal(SqlString.escapeId(['a', ['b', ['t.c']]]), "`a`, `b`, `t`.`c`");
+  },
+});
+
 test('SqlString.escape', {
   'undefined -> NULL': function() {
     assert.equal(SqlString.escape(undefined), 'NULL');