think-model-postgresql
Advanced tools
Comparing version 1.1.5 to 1.1.6
@@ -174,2 +174,6 @@ const thinkInstance = require('think-instance'); | ||
return this[QUERY](sqlOptions, connection, startTime); | ||
}).then(data => { | ||
// release connection if debounce patch | ||
this.releaseConnection(connection); | ||
return data; | ||
}); | ||
@@ -176,0 +180,0 @@ } else { |
{ | ||
"name": "think-model-postgresql", | ||
"version": "1.1.5", | ||
"version": "1.1.6", | ||
"description": "PostgreSQL adapter for ThinkJS 3.x", | ||
@@ -5,0 +5,0 @@ "scripts": { |
@@ -77,3 +77,3 @@ const { test } = require('ava'); | ||
t.is(await socket.getConnection(2), 2); | ||
socket.pool.connect = function() { | ||
socket.pool.connect = function () { | ||
t.pass(); | ||
@@ -90,3 +90,3 @@ return 3; | ||
const defaultConnection = Promise.resolve(2); | ||
socket.query = async function(option, connection) { | ||
socket.query = async function (option, connection) { | ||
t.deepEqual(option, { | ||
@@ -108,3 +108,3 @@ sql: 'BEGIN', | ||
const defaultConnection = Promise.resolve(3); | ||
socket.query = function(option, connection) { | ||
socket.query = function (option, connection) { | ||
t.deepEqual(option, { | ||
@@ -126,3 +126,3 @@ sql: 'COMMIT', | ||
const defaultConnection = Promise.resolve(3); | ||
socket.query = function(option, connection) { | ||
socket.query = function (option, connection) { | ||
t.deepEqual(option, { | ||
@@ -154,11 +154,11 @@ sql: 'ROLLBACK', | ||
const defaultConnection = 'connection'; | ||
const defaultFn = function(connection) { | ||
const defaultFn = function (connection) { | ||
t.deepEqual(connection, defaultConnection); | ||
return 'lizheming'; | ||
}; | ||
socket.startTrans = socket.commit = function(connection) { | ||
socket.startTrans = socket.commit = function (connection) { | ||
t.deepEqual(connection, defaultConnection); | ||
return Promise.resolve(connection); | ||
}; | ||
socket.rollback = function() { | ||
socket.rollback = function () { | ||
t.fail(); | ||
@@ -175,15 +175,15 @@ }; | ||
const defaultConnection = 'connection'; | ||
const defaultFn = function(connection) { | ||
const defaultFn = function (connection) { | ||
t.deepEqual(connection, defaultConnection); | ||
return 'lizheming'; | ||
}; | ||
socket.startTrans = function(connection) { | ||
socket.startTrans = function (connection) { | ||
t.deepEqual(connection, defaultConnection); | ||
return Promise.resolve(connection); | ||
}; | ||
socket.commit = function(connection) { | ||
socket.commit = function (connection) { | ||
t.deepEqual(connection, defaultConnection); | ||
return Promise.reject(new Error('error')); | ||
}; | ||
socket.rollback = function(connection) { | ||
socket.rollback = function (connection) { | ||
t.deepEqual(connection, defaultConnection); | ||
@@ -223,3 +223,3 @@ return Promise.resolve(); | ||
test('query', async t => { | ||
t.plan(4); | ||
t.plan(5); | ||
@@ -241,3 +241,3 @@ const sqlOption1 = 'string sqloption'; | ||
const socket = new Socket(); | ||
socket.releaseConnection = function(connection) { | ||
socket.releaseConnection = function (connection) { | ||
t.deepEqual(connection, defaultConnection); | ||
@@ -270,3 +270,3 @@ }; | ||
const socket = new Socket(); | ||
socket.releaseConnection = function() { }; | ||
socket.releaseConnection = function () { }; | ||
const ret = await socket.query(sqlOption2, defaultConnection); | ||
@@ -297,3 +297,3 @@ mock.stopAll(); | ||
const socket = new Socket({ debounce: false }); | ||
socket.releaseConnection = function() { }; | ||
socket.releaseConnection = function () { }; | ||
const ret = await socket.query(sqlOption3, defaultConnection); | ||
@@ -358,3 +358,3 @@ mock.stopAll(); | ||
const socket = new Socket(); | ||
socket.releaseConnection = function(connection) { | ||
socket.releaseConnection = function (connection) { | ||
t.is(connection, defaultConnection); | ||
@@ -402,3 +402,3 @@ }; | ||
let i = 0; | ||
Date.now = function() { | ||
Date.now = function () { | ||
if (i) { | ||
@@ -440,3 +440,3 @@ return 4; | ||
let i = 0; | ||
Date.now = function() { | ||
Date.now = function () { | ||
if (i) { | ||
@@ -467,3 +467,3 @@ return 4; | ||
const socket = new Socket(); | ||
socket.query = function(sqlOption, connection) { | ||
socket.query = function (sqlOption, connection) { | ||
t.deepEqual(sqlOption, { sql: 'lizheming', debounce: false }); | ||
@@ -475,3 +475,3 @@ t.is(connection, 222); | ||
socket.query = function(sqlOption) { | ||
socket.query = function (sqlOption) { | ||
t.deepEqual(sqlOption, { a: 1, b: 2, debounce: false }); | ||
@@ -478,0 +478,0 @@ }; |
44520
1295