Merge branch 'master' of github.com:sidorares/node-mysql2

Author: sidorares

lib/pool.js

@@ -126,7 +126,7 @@ Pool.prototype.end = function (cb) {
 
 Pool.prototype.query = function (sql, values, cb) {
   var cmdQuery = Connection.createQuery(sql, values, cb, this.config.connectionConfig);
-  cmdQuery.namedPlaceholders = this.config.namedPlaceholders;
+  cmdQuery.namedPlaceholders = this.config.connectionConfig.namedPlaceholders;
 
   this.getConnection(function (err, conn) {
     if (err) {
@@ -145,12 +145,7 @@ Pool.prototype.query = function (sql, values, cb) {
 };
 
 Pool.prototype.execute = function (sql, values, cb) {
-  if (typeof values === 'function') {
-    cb = values;
-    values = null;
-  }
-
-  var useNamedPlaceholders = this.config.namedPlaceholders;
+  var useNamedPlaceholders = this.config.connectionConfig.namedPlaceholders;
 
   this.getConnection(function (err, conn) {
     if (err) {

test/integration/connection/test-named-paceholders.js

@@ -56,7 +56,7 @@ assert.equal(sql, 'SELECT * from test_table where num1 < 2 and num2 > 100');
 connection.end();
 
 var pool = common.createPool();
-pool.config.namedPlaceholders = true;
+pool.config.connectionConfig.namedPlaceholders = true;
 pool.query('SELECT :a + :a as sum', {a: 2}, function (err, rows, fields) {
   pool.end();
   if (err) {