不要怂,就是干,撸起袖子干!

Commit dcf079b2 by Sushant Committed by GitHub

fix: update sequelize-pool (#11055)

1 parent 3a494ee6
'use strict';
const { Pool } = require('sequelize-pool');
const { Pool, TimeoutError } = require('sequelize-pool');
const _ = require('lodash');
const semver = require('semver');
const Promise = require('../../promise');
......@@ -278,9 +278,11 @@ class ConnectionManager {
return promise.then(() => {
return this.pool.acquire(options.type, options.useMaster)
.catch(Promise.TimeoutError, err => { throw new errors.ConnectionAcquireTimeoutError(err); })
.tap(() => { debug('connection acquired'); });
});
.catch(error => {
if (error instanceof TimeoutError) throw new errors.ConnectionAcquireTimeoutError(error);
throw error;
});
}).tap(() => { debug('connection acquired'); });
}
/**
......
......@@ -40,7 +40,7 @@
"moment-timezone": "^0.5.21",
"retry-as-promised": "^3.1.0",
"semver": "^5.6.0",
"sequelize-pool": "^1.0.2",
"sequelize-pool": "^2.1.0",
"toposort-class": "^1.0.1",
"uuid": "^3.2.1",
"validator": "^10.11.0",
......
......@@ -294,19 +294,6 @@ describe(Support.getTestDialectTeaser('Sequelize'), () => {
});
describe('logging', () => {
it('executes a query with global benchmarking option and default logger', () => {
const logger = sinon.stub(console, 'log');
const sequelize = Support.createSequelizeInstance({
logging: logger,
benchmark: true
});
return sequelize.query('select 1;').then(() => {
expect(logger.calledOnce).to.be.true;
expect(logger.args[0][0]).to.be.match(/Executed \((\d*|default)\): select 1; Elapsed time: \d+ms/);
});
});
it('executes a query with global benchmarking option and custom logger', () => {
const logger = sinon.spy();
const sequelize = Support.createSequelizeInstance({
......@@ -321,17 +308,6 @@ describe(Support.getTestDialectTeaser('Sequelize'), () => {
});
});
it('executes a query with benchmarking option and default logger', function() {
const logger = sinon.stub(console, 'log');
return this.sequelize.query('select 1;', {
logging: logger,
benchmark: true
}).then(() => {
expect(logger.calledOnce).to.be.true;
expect(logger.args[0][0]).to.be.match(/Executed \((\d*|default)\): select 1; Elapsed time: \d+ms/);
});
});
it('executes a query with benchmarking option and custom logger', function() {
const logger = sinon.spy();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!