upgraded node-postgres to 7.4.x

irakliy81 · irakliy81 · commit ab450c0380bc · 2018-01-23T02:31:46.000-08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,17 +7,15 @@
 			"request": "launch",
 			"program": "${workspaceRoot}/bin/tests/run.js",
 			"stopOnEntry": false,
-			"args": [],
-			"cwd": "${workspaceRoot}",
-			"preLaunchTask": "build",
-			"runtimeExecutable": null,
+			"cwd": "${workspaceRoot}/bin",
 			"runtimeArgs": ["--nolazy"],
             "env": {
                 "NODE_ENV": "development"
             },
             "console": "externalTerminal",
             "sourceMaps": true,
-            "outDir": "${workspaceRoot}/bin"
+			"outFiles": ["${workspaceRoot}/bin/**/*.js"],
+			"preLaunchTask": "build"
 		}
 	]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,45 +1,38 @@
 {
-    "version": "0.1.0",
-    "command": "gulp",
-    "isShellCommand": true,
-    "args": [
-        "--no-color"
-    ],
+    "version": "2.0.0",
     "tasks": [
         {
-            "taskName": "clean",
-            "args": [],
-            "isBuildCommand": false,
-            "isTestCommand": false,
-            "isWatching": false,
-            "showOutput": "silent"
+            "type": "gulp",
+            "task": "clean",
+            "presentation": {
+                "reveal": "silent"
+            },
         },
         {
-            "taskName": "build",
-            "args": [],
-            "isBuildCommand": true,
-            "isTestCommand": false,
-            "isWatching": false,
-            "problemMatcher": ["$tsc"],
-            "showOutput": "silent"
+            "type": "gulp",
+            "task": "build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": ["$tsc"]
         },
         {
-            "taskName": "test",
-            "args": [],
-            "isBuildCommand": false,
-            "isTestCommand": true,
-            "isWatching": false,
-            "problemMatcher": ["$tsc"],
-            "showOutput": "always"
+            "type": "gulp",
+            "task": "test",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "problemMatcher": ["$tsc"]
         },
         {
-            "taskName": "publish",
-            "args": [],
-            "isBuildCommand": false,
-            "isTestCommand": false,
-            "isWatching": false,
-            "problemMatcher": ["$tsc"],
-            "showOutput": "always"
+            "type": "gulp",
+            "task": "publish",
+            "problemMatcher": ["$tsc"]
         }
     ]
 }
diff --git a/bin/lib/Database.js b/bin/lib/Database.js
diff --git a/bin/package.json b/bin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg-io",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Promise-based PostgreSQL client for node.js written in TypeScript",
   "keywords": [
     "pg",
@@ -21,10 +21,10 @@
     "email": "irakliy81@live.com"
   },
   "engines": {
-    "node": "6.9.x"
+    "node": "6.11.x"
   },
   "dependencies": {
-    "pg": "6.1.x"
+    "pg": "7.4.x"
   },
   "devDependencies": {
     "del": "2.2.x",
diff --git a/lib/Database.ts b/lib/Database.ts
@@ -68,9 +68,9 @@ export class Database extends events.EventEmitter {
         this.pgPool = new pg.Pool(buildPgPoolOptions(connectionSettings, poolOptions));
 
         this.pgPool.on('error', (error) => {
-            this.logger && this.logger.warn('pg.pool error: ' + error.message);
-            // turn off error emitter because pgPool emits duplicate errors when client creation fails
-            // this.emit(ERROR_EVENT, error); 
+            //this.logger && this.logger.warn('pg.pool error: ' + error.message);
+            //turn off error emitter because pgPool emits duplicate errors when client creation fails
+            this.emit(ERROR_EVENT, error); 
         });
     }
 
@@ -99,13 +99,13 @@ export class Database extends events.EventEmitter {
     // --------------------------------------------------------------------------------------------
     getPoolState(): PoolState {
         return {
-            size        : this.pgPool.pool.getPoolSize(),
-            available   : this.pgPool.pool.availableObjectsCount()
+            size        : this.pgPool.totalCount,
+            available   : this.pgPool.idleCount
         };
     }
     
     getPoolDescription(): string {
-        return `{ size: ${this.pgPool.pool.getPoolSize()}, available: ${this.pgPool.pool.availableObjectsCount()} }`;
+        return `{ size: ${this.pgPool.totalCount}, available: ${this.pgPool.idleCount} }`;
     }
 }
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg-io",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Promise-based PostgreSQL client for node.js written in TypeScript",
   "keywords": [
     "pg",
@@ -21,10 +21,10 @@
     "email": "irakliy81@live.com"
   },
   "engines": {
-    "node": "6.9.x"
+    "node": "6.11.x"
   },
   "dependencies": {
-    "pg": "6.1.x"
+    "pg": "7.4.x"
   },
   "devDependencies": {
     "del": "2.2.x",
diff --git a/typings/pg/pg.d.ts b/typings/pg/pg.d.ts
@@ -55,10 +55,13 @@ declare module "pg" {
     }
 
     export class Pool extends events.EventEmitter {
-        pool: any;
         constructor(config: ClientConfig);
         connect(callback?: (err: Error, client: Client, done: (err: Error) => void) => void): Promise<Client>;
         end(): Promise<any>;
+
+        waitingCount: number;
+        idleCount   : number;
+        totalCount  : number;
     }
 
     export class Client extends events.EventEmitter {

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,13 @@ declare module "pg" {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`export class Pool extends events.EventEmitter {`
`58`		`- pool: any;`
`59`	`58`	`constructor(config: ClientConfig);`
`60`	`59`	`connect(callback?: (err: Error, client: Client, done: (err: Error) => void) => void): Promise<Client>;`
`61`	`60`	`end(): Promise<any>;`
	`61`	`+`
	`62`	`+ waitingCount: number;`
	`63`	`+ idleCount : number;`
	`64`	`+ totalCount : number;`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`export class Client extends events.EventEmitter {`