pg-promise 10.4.3 → 10.5.0

package/README.md

@@ -555,15 +555,15 @@ The only difference from [Explicit CTF] is that we set `toPostgres` and `rawType
 defined in the [ctf] namespace: 
 
 ```js
-const ctf = pgp.as.ctf; // Global CTF symbols
+const {toPostgres, rawType} = pgp.as.ctf; // Global CTF symbols
 
 const obj = {
-    [ctf.toPostgres](self) {
+    [toPostgres](self) {
         // self = this = obj
         
         // return a pre-formatted value that does not need escaping
     },
-    [ctf.rawType]: true // use result from toPostgres directly, as Raw Text
+    [rawType]: true // use result from toPostgres directly, as Raw Text
 };
 ```
 
@@ -885,8 +885,7 @@ savepoint names, based on the transaction level.
 [TransactionMode] type can extend your `BEGIN` command with transaction configuration:
 
 ```js
-const TransactionMode = pgp.txMode.TransactionMode;
-const isolationLevel = pgp.txMode.isolationLevel;
+const {TransactionMode, isolationLevel} = pgp.txMode;
  
 // Create a reusable transaction mode (serializable + read-only + deferrable):
 const mode = new TransactionMode({
@@ -975,8 +974,7 @@ db.txIf({cnd}, t => {
 This library manages all database connections via the [connection pool], which internally caches them.
 
 Connections in the cache expire due to inactivity after [idleTimeoutMillis] number of milliseconds, which you
-can adjust when creating the [Database] object, or override the default via `pgp.pg.defaults.idleTimeoutMillis`
-before creating the [Database] object. 
+can set only when creating the [Database] object. 
 
 While there is a single open connection in the pool, the process cannot terminate by itself, only via `process.exit()`. 
 If you want the process to finish by itself, without waiting for all connections in the pool to expire, you need
@@ -1110,6 +1108,6 @@ for detailed changes between versions you should see the corresponding release n
 [Bluebird]:https://github.com/petkaantonov/bluebird
 [SQL injection]:https://en.wikipedia.org/wiki/SQL_injection
 [Symbol]:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol
-[idleTimeoutMillis]:https://github.com/brianc/node-postgres/blob/master/lib/defaults.js#L46
+[idleTimeoutMillis]:https://github.com/brianc/node-postgres/blob/master/packages/pg/lib/defaults.js#L46
 [connection pool]:https://github.com/brianc/node-pg-pool
 [Error]:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error

package/lib/connect.js

@@ -45,7 +45,6 @@ function poolConnect(ctx, db, config) {
                         enumerable: false,
                         writable: true
                     });
-                    hidePassword(client); // See: https://github.com/brianc/node-postgres/issues/1568
                     setSchema(client, ctx);
                 }
                 setCtx(client, ctx);
@@ -78,7 +77,6 @@ function directConnect(ctx, config) {
                 });
                 reject(err);
             } else {
-                hidePassword(client); // See: https://github.com/brianc/node-postgres/issues/1568
                 setSchema(client, ctx);
                 setCtx(client, ctx);
                 const end = lockClientEnd(client);
@@ -142,16 +140,6 @@ function setCtx(client, ctx) {
     });
 }
 
-// See: https://github.com/brianc/node-postgres/issues/1568
-function hidePassword(client) {
-    hideProperty(client, `password`);
-    hideProperty(client.connectionParameters, `password`);
-}
-
-function hideProperty(obj, prop) {
-    Object.defineProperty(obj, prop, {value: obj[prop], enumerable: false});
-}
-
 function setSchema(client, ctx) {
     let s = ctx.options.schema;
     if (!s) {

package/lib/utils/color.js

@@ -23,6 +23,7 @@ class ColorConsole {
     }
 
     static writeNormal(params, color) {
+        // istanbul ignore else
         if (process.stdout.isTTY) {
             console.log.apply(null, ColorConsole.formatColor(params, color)); // eslint-disable-line no-console
         } else {
@@ -31,6 +32,7 @@ class ColorConsole {
     }
 
     static writeError(params, color) {
+        // istanbul ignore else
         if (process.stderr.isTTY) {
             console.error.apply(null, ColorConsole.formatColor(params, color)); // eslint-disable-line no-console
         } else {

package/lib/utils/index.js

@@ -80,6 +80,7 @@ function addReadProp(obj, name, value, hidden) {
 // Converts a connection string or object into its safe copy:
 // if password is present, it is masked with symbol '#'.
 function getSafeConnection(cn) {
+    const maskPassword = cs => cs.replace(/:(?![/])([^@]+)/, (_, m) => `:` + new Array(m.length + 1).join(`#`));
     if (typeof cn === `object`) {
         const copy = Object.assign({}, cn);
         if (typeof copy.password === `string`) {
@@ -93,14 +94,6 @@ function getSafeConnection(cn) {
     return maskPassword(cn);
 }
 
-///////////////////////////////////////////////////////////
-// Replaces password letters with # in a connection string.
-function maskPassword(connectionString) {
-    return connectionString.replace(/:(?![/])([^@]+)/, (_, m) => {
-        return `:` + new Array(m.length + 1).join(`#`);
-    });
-}
-
 ///////////////////////////////////////////
 // Returns a space gap for console output;
 function messageGap(level) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "10.4.3",
+  "version": "10.5.0",
   "description": "PostgreSQL interface for Node.js",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",
@@ -8,9 +8,9 @@
     "test": "jasmine-node --captureExceptions test",
     "test:native": "jasmine-node test --config PG_NATIVE true",
     "doc": "./node_modules/.bin/jsdoc -c ./jsdoc/jsdoc.js ./jsdoc/README.md -t ./jsdoc/templates/custom",
-    "coverage": "istanbul cover ./node_modules/jasmine-node/bin/jasmine-node test -x lib/utils/color.js",
+    "coverage": "istanbul cover ./node_modules/jasmine-node/bin/jasmine-node test",
     "travis": "npm run lint && npm run tslint && npm run coverage --captureExceptions && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
-    "lint": "./node_modules/.bin/eslint ./lib ./test/*.js ./test/db",
+    "lint": "./node_modules/.bin/eslint ./lib ./test/*.js ./test/db --fix",
     "tslint": "./node_modules/.bin/tslint ./typescript/*.ts"
   },
   "files": [
@@ -41,21 +41,21 @@
   },
   "dependencies": {
     "assert-options": "0.6.1",
-    "pg": "7.18.1",
+    "pg": "8.0.0",
     "pg-minify": "1.5.2",
     "spex": "3.0.1"
   },
   "devDependencies": {
-    "@types/node": "13.7.0",
+    "@types/node": "13.9.8",
     "JSONStream": "1.3.5",
     "bluebird": "3.7.2",
-    "coveralls": "3.0.9",
+    "coveralls": "3.0.11",
     "eslint": "6.8.0",
-    "tslint": "6.0.0",
+    "tslint": "6.1.0",
     "istanbul": "0.4.5",
     "jasmine-node": "3.0.0",
     "jsdoc": "3.6.3",
-    "pg-query-stream": "3.0.2",
-    "typescript": "3.7.5"
+    "pg-query-stream": "3.0.4",
+    "typescript": "3.8.3"
   }
 }

package/typescript/pg-subset.d.ts

@@ -13,7 +13,7 @@
 // Calling it 'pg-subset' to avoid a conflict in case the application also
 // includes the official 'pg' typings.
 //
-// Supported version of pg: 7.14.0 and later.
+// Supported version of pg: 8.0.0 and later.
 //
 // pg: https://github.com/brianc/node-postgres
 //////////////////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ declare namespace pg {
     type DynamicPassword = string | (() => string) | (() => Promise<string>);
 
     // See:
-    // 1) https://github.com/brianc/node-postgres/blob/master/lib/defaults.js
+    // 1) https://github.com/brianc/node-postgres/blob/master/packages/pg/lib/defaults.js
     // 2) https://github.com/brianc/node-pg-pool
     interface IConnectionParameters<C extends IClient = IClient> {
         connectionString?: string
@@ -212,9 +212,13 @@ declare namespace pg {
         // 0 will disable connection pooling
         max: number
 
-        // max milliseconds a client can go unused before it is removed
-        // from the pool and destroyed
-        idleTimeoutMillis: number
+        // max milliseconds a client can go unused before it is removed from the pool and destroyed;
+        //
+        // Made unavailable in v10.5.0, due to the following:
+        //  - https://github.com/brianc/node-postgres/issues/2139
+        //  - https://github.com/vitaly-t/pg-promise/issues/703
+        //
+        // idleTimeoutMillis: number
 
         client_encoding: string