Skip to content

Commit 625d7ca

Browse files
committed
Merge pull request #755 from swekaj/master
Only set options.values = values when values is defined. Otherwise, whe...
2 parents 1a83712 + 199eead commit 625d7ca

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

lib/Connection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Connection.createQuery = function(sql, values, cb) {
3939
options = sql;
4040
if (typeof values === 'function') {
4141
cb = values;
42-
} else {
42+
} else if (typeof values !== 'undefined') {
4343
options.values = values;
4444
}
4545
} else if (typeof values === 'function') {
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
var common = require('../../common');
2+
var connection = common.createConnection();
3+
var assert = require('assert');
4+
5+
connection.connect();
6+
7+
var rows = undefined;
8+
var fields = undefined;
9+
var query = connection.query({
10+
sql: 'SELECT ?',
11+
values: [ 1 ]
12+
});
13+
query.on('error', function (err) {
14+
throw err;
15+
});
16+
query.on('fields', function (_fields) {
17+
fields = _fields;
18+
});
19+
query.on('result', function (_rows) {
20+
rows = [ _rows ];
21+
});
22+
23+
connection.end();
24+
25+
process.on('exit', function() {
26+
assert.deepEqual(rows, [{1: 1}]);
27+
assert.equal(fields[0].name, '1');
28+
});

0 commit comments

Comments
 (0)