Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions utilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,33 @@ module.exports = {
callback = values;
values = [];
}
var query = this.inherited(sql, values, function(err, res, fields) {
var endTime = new Date().getTime(),
if (callback) {
var query = this.inherited(sql, values, function(err, res, fields) {
var endTime = new Date().getTime(),
executionTime = endTime-startTime;
connection.emit('query', err, res, fields, query);
if (connection.slowTime && (executionTime >= connection.slowTime)) connection.emit('slow', err, res, fields, query, executionTime);
if (callback) callback(err, res, fields);
});
connection.emit('query', err, res, fields, query);
if (connection.slowTime && (executionTime >= connection.slowTime)) connection.emit('slow', err, res, fields, query, executionTime);
callback(err, res, fields);
});
}
else {
var res = []
, fields
, err;
var query = this.inherited(sql, values);
query.on('error', function (e) {
err = e;
}).on('fields', function (f) {
fields = f;
}).on('result', function (r) {
res.push(r);
}).on('end', function () {
var endTime = new Date().getTime()
, executionTime = endTime-startTime;
connection.emit('query', err, res, fields, query);
if (connection.slowTime && (executionTime >= connection.slowTime)) connection.emit('slow', err, res, fields, query, executionTime);
});
}
return query;
});

Expand Down Expand Up @@ -465,4 +485,4 @@ module.exports = {

}

}
}