yujunjun/knex
1
0
Fork 0
mirror of https://github.com/knex/knex.git synced 2025-12-28 15:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some indentation and test comment

Browse Source
This commit is contained in:
wubzz 2016-02-01 21:27:30 +01:00
parent 80ee5a8021
commit 57bac6cd58
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/runner.js
View File

@ -146,11 +146,14 @@ assign(Runner.prototype, {
var additionalErrorInformation = {
timeoutStack: error.stack
}
if(runner.builder) {
additionalErrorInformation.sql = runner.builder.sql
additionalErrorInformation.bindings = runner.builder.bindings
}
assign(timeoutError, additionalErrorInformation)
rejecter(timeoutError)
})
.catch(rejecter)

2
test/integration/builder/transaction.js
View File

@ -294,7 +294,7 @@ module.exports = function(knex) {
trx.raw('SELECT 1 = 1').then(function() {
//No connection is available, so try issuing a query without transaction.
//Since there is no available connection, it should throw a timeout error based on knex pool config.
//Since there is no available connection, it should throw a timeout error based on `aquireConnectionTimeout` from the knex config.
knexDb.raw('select * FROM accounts WHERE username = ?', ['Test'])
.then(function(res) {
expect(res).to.not.exist();