From 91f71d9a5ee3325c84cfba9d990d1bf804471d0b Mon Sep 17 00:00:00 2001 From: Alex Munda Date: Thu, 17 May 2018 22:02:23 -0500 Subject: [PATCH 1/3] Statement timeout pg pool option --- package.json | 6 ++++-- src/tiny.ts | 1 + src/types.ts | 2 ++ yarn.lock | 33 +++++++++++++++++++-------------- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 9c5eda1..1f99a9b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "homepage": "http://github.com/joeandaverde/tinypg", "author": "Joe Andaverde", "contributors": [ - "Scott Smerchek" + "Scott Smerchek", + "Alex Munda" ], "keywords": [ "postgres", @@ -39,7 +40,8 @@ "glob": "7.1.2", "lodash": "4.17.5", "node-uuid": "1.4.7", - "pg-format": "1.0.1" + "pg-format": "1.0.1", + "source-map-support": "0.5.6" }, "devDependencies": { "@types/chai": "3.4.34", diff --git a/src/tiny.ts b/src/tiny.ts index 8f9585c..5eff07a 100644 --- a/src/tiny.ts +++ b/src/tiny.ts @@ -45,6 +45,7 @@ export class TinyPg { connectionTimeoutMillis: pool_options.connection_timeout_ms, idleTimeoutMillis: pool_options.idle_timeout_ms, application_name: pool_options.application_name, + statement_timeout: pool_options.statement_timeout_ms, max: pool_options.max, min: pool_options.min, log: Debug('tinypg:pool'), diff --git a/src/types.ts b/src/types.ts index 3a00ce6..aa330b5 100644 --- a/src/types.ts +++ b/src/types.ts @@ -14,6 +14,7 @@ export interface TinyPgOptions { connection_timeout_ms?: number idle_timeout_ms?: number application_name?: string + statement_timeout_ms?: number } } @@ -86,5 +87,6 @@ export interface TinyPgEvents extends EventEmitter { declare module 'pg' { export interface PoolConfig { log?: any + statement_timeout?: number } } diff --git a/yarn.lock b/yarn.lock index 4bc12b6..27fc484 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,8 +19,8 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.41.tgz#e27cf0817153eb9f2713b2d3f6c68f1e1c3ca608" "@types/node@*": - version "9.6.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.2.tgz#e49ac1adb458835e95ca6487bc20f916b37aff23" + version "10.1.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.1.tgz#ca39d8607fa1fcb146b0530420b93f1dd4802f6c" "@types/node@^8.10.0": version "8.10.9" @@ -33,8 +33,8 @@ moment ">=2.14.0" "@types/pg@^7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@types/pg/-/pg-7.4.5.tgz#eca6fdfefaa0865cb652b9a8265be217e10acb1e" + version "7.4.9" + resolved "https://registry.yarnpkg.com/@types/pg/-/pg-7.4.9.tgz#441a88f14bb89d531e00bcf4cf02b23dd512168d" dependencies: "@types/events" "*" "@types/node" "*" @@ -59,6 +59,10 @@ browser-stdout@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" +buffer-from@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" + buffer-writer@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08" @@ -87,7 +91,7 @@ debug@2.6.8: dependencies: ms "2.0.0" -debug@^3.1.0: +debug@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: @@ -253,8 +257,8 @@ mocha@^3.2.0: supports-color "3.1.2" moment@>=2.14.0: - version "2.22.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" + version "2.22.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad" ms@2.0.0: version "2.0.0" @@ -346,15 +350,16 @@ semver@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" -source-map-support@0.4.11: - version "0.4.11" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322" +source-map-support@0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13" dependencies: - source-map "^0.5.3" + buffer-from "^1.0.0" + source-map "^0.6.0" -source-map@^0.5.3: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" split@^1.0.0: version "1.0.1" From ec48c8593fdb4911d1849d2f92a6a920c9bc1597 Mon Sep 17 00:00:00 2001 From: Alex Munda Date: Fri, 18 May 2018 09:43:21 -0500 Subject: [PATCH 2/3] Add keep_alive to pool options --- src/tiny.ts | 1 + src/types.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/tiny.ts b/src/tiny.ts index 5eff07a..ee00bad 100644 --- a/src/tiny.ts +++ b/src/tiny.ts @@ -42,6 +42,7 @@ export class TinyPg { port: port, database: database, ssl: enable_ssl ? _.defaultTo(options.tls_options, true) : false, + keepAlive: pool_options.keep_alive, connectionTimeoutMillis: pool_options.connection_timeout_ms, idleTimeoutMillis: pool_options.idle_timeout_ms, application_name: pool_options.application_name, diff --git a/src/types.ts b/src/types.ts index aa330b5..6fd2abb 100644 --- a/src/types.ts +++ b/src/types.ts @@ -15,6 +15,7 @@ export interface TinyPgOptions { idle_timeout_ms?: number application_name?: string statement_timeout_ms?: number + keep_alive?: boolean } } From 204684374d1a4cdfda1444c073b828c466d5d0ad Mon Sep 17 00:00:00 2001 From: Alex Munda Date: Fri, 18 May 2018 10:06:02 -0500 Subject: [PATCH 3/3] Bump version. Source map support as dev dependency --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1f99a9b..7cccea0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tinypg", - "version": "3.0.0", + "version": "3.0.1", "description": "Easy way to call sql files using postgres.", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -40,8 +40,7 @@ "glob": "7.1.2", "lodash": "4.17.5", "node-uuid": "1.4.7", - "pg-format": "1.0.1", - "source-map-support": "0.5.6" + "pg-format": "1.0.1" }, "devDependencies": { "@types/chai": "3.4.34", @@ -53,6 +52,7 @@ "mocha": "^3.2.0", "pg": "^7.4.1", "rimraf": "^2.6.0", + "source-map-support": "0.5.6", "typescript": "2.8.1" }, "peerDependencies": {