pg-promise 8.6.4 → 8.7.2

package/README.md

@@ -376,6 +376,9 @@ db.any('SELECT * FROM products $1:raw', where);
 
 Special syntax `this:raw` / `this^` is supported, to inject the formatting object as raw JSON string.
 
+**WARNING:**<br/>
+This filter is unsafe, and should not be used for values that come from the client side, as it may result in [SQL injection].
+
 ### Open Values
 
 When a variable ends with `:value`, or shorter syntax `#`, it is escaped as usual, except when its type is a string,
@@ -398,6 +401,9 @@ open-value syntax to add the extra search logic:
 SELECT * FROM table WHERE name LIKE '%$1:value%')
 ```
 
+**WARNING:**<br/>
+This filter is unsafe, and should not be used for values that come from the client side, as it may result in [SQL injection].
+
 Method [as.value] implements the formatting.
 
 ### JSON Filter

package/lib/connect.js

@@ -107,7 +107,6 @@ function onError(err) {
     const ctx = this.$ctx;
     const cn = npm.utils.getSafeConnection(ctx.cn);
     npm.events.error(ctx.options, err, {cn, dc: ctx.dc});
-    ctx.disconnect(err);
     if (ctx.cnOptions && typeof ctx.cnOptions.onLost === 'function' && !ctx.notified) {
         try {
             ctx.cnOptions.onLost.call(this, err, {

package/lib/database.js

@@ -1614,6 +1614,11 @@ function Database(cn, dc, config) {
 // which cannot be tested automatically; removing from coverage:
 // istanbul ignore next
 function onError(err) {
+    // this client was never seen by pg-promise, which
+    // can happen if it failed to initialize
+    if (!err.client.$ctx) {
+        return;
+    }
     const ctx = err.client.$ctx;
     npm.events.error(ctx.options, err, {
         cn: npm.utils.getSafeConnection(ctx.cn),

package/lib/errors/paramQuery.js

@@ -43,27 +43,20 @@ const npm = {
  *
  * @see ParameterizedQuery
  */
-function ParameterizedQueryError(error, ps) {
-    const temp = Error.apply(this, arguments);
-    temp.name = this.name = 'ParameterizedQueryError';
-    this.stack = temp.stack;
-    if (error instanceof npm.QueryFileError) {
-        this.error = error;
-        this.message = 'Failed to initialize \'text\' from a QueryFile.';
-    } else {
-        this.message = error;
+class ParameterizedQueryError extends Error {
+    constructor(error, ps) {
+        const isQueryFileError = error instanceof npm.QueryFileError;
+        const message = isQueryFileError ? 'Failed to initialize \'text\' from a QueryFile.' : error;
+        super(message);
+        this.name = this.constructor.name;
+        if (isQueryFileError) {
+            this.error = error;
+        }
+        this.result = ps;
+        Error.captureStackTrace(this, this.constructor);
     }
-    this.result = ps;
 }
 
-ParameterizedQueryError.prototype = Object.create(Error.prototype, {
-    constructor: {
-        value: ParameterizedQueryError,
-        writable: true,
-        configurable: true
-    }
-});
-
 /**
  * @method errors.ParameterizedQueryError#toString
  * @description

package/lib/errors/prepared.js

@@ -43,27 +43,20 @@ const npm = {
  *
  * @see PreparedStatement
  */
-function PreparedStatementError(error, ps) {
-    const temp = Error.apply(this, arguments);
-    temp.name = this.name = 'PreparedStatementError';
-    this.stack = temp.stack;
-    if (error instanceof npm.QueryFileError) {
-        this.error = error;
-        this.message = 'Failed to initialize \'text\' from a QueryFile.';
-    } else {
-        this.message = error;
+class PreparedStatementError extends Error {
+    constructor(error, ps) {
+        const isQueryFileError = error instanceof npm.QueryFileError;
+        const message = isQueryFileError ? 'Failed to initialize \'text\' from a QueryFile.' : error;
+        super(message);
+        this.name = this.constructor.name;
+        if (isQueryFileError) {
+            this.error = error;
+        }
+        this.result = ps;
+        Error.captureStackTrace(this, this.constructor);
     }
-    this.result = ps;
 }
 
-PreparedStatementError.prototype = Object.create(Error.prototype, {
-    constructor: {
-        value: PreparedStatementError,
-        writable: true,
-        configurable: true
-    }
-});
-
 /**
  * @method errors.PreparedStatementError#toString
  * @description

package/lib/errors/queryFile.js

@@ -46,28 +46,21 @@ const npm = {
  * @see QueryFile
  *
  */
-function QueryFileError(error, qf) {
-    const temp = Error.apply(this, arguments);
-    temp.name = this.name = 'QueryFileError';
-    this.stack = temp.stack;
-    if (error instanceof npm.minify.SQLParsingError) {
-        this.error = error;
-        this.message = 'Failed to parse the SQL.';
-    } else {
-        this.message = error.message;
+class QueryFileError extends Error {
+    constructor(error, qf) {
+        const isSqlError = error instanceof npm.minify.SQLParsingError;
+        const message = isSqlError ? 'Failed to parse the SQL.' : error.message;
+        super(message);
+        this.name = this.constructor.name;
+        if (isSqlError) {
+            this.error = error;
+        }
+        this.file = qf.file;
+        this.options = qf.options;
+        Error.captureStackTrace(this, this.constructor);
     }
-    this.file = qf.file;
-    this.options = qf.options;
 }
 
-QueryFileError.prototype = Object.create(Error.prototype, {
-    constructor: {
-        value: QueryFileError,
-        writable: true,
-        configurable: true
-    }
-});
-
 /**
  * @method errors.QueryFileError#toString
  * @description

package/lib/errors/queryResult.js

@@ -127,25 +127,19 @@ const errorMessages = [
  * {@link Database#oneOrNone oneOrNone}, {@link Database#many many}
  *
  */
-function QueryResultError(code, result, query, values) {
-    const temp = Error.apply(this, arguments);
-    temp.name = this.name = 'QueryResultError';
-    this.stack = temp.stack;
-    this.message = errorMessages[code].message;
-    this.code = code;
-    this.result = result;
-    this.query = query;
-    this.values = values;
-    this.received = result.rows.length;
-}
-
-QueryResultError.prototype = Object.create(Error.prototype, {
-    constructor: {
-        value: QueryResultError,
-        writable: true,
-        configurable: true
+class QueryResultError extends Error {
+    constructor(code, result, query, values) {
+        const message = errorMessages[code].message;
+        super(message);
+        this.name = this.constructor.name;
+        this.code = code;
+        this.result = result;
+        this.query = query;
+        this.values = values;
+        this.received = result.rows.length;
+        Error.captureStackTrace(this, this.constructor);
     }
-});
+}
 
 /**
  * @method errors.QueryResultError#toString

package/lib/utils/index.js

@@ -106,7 +106,7 @@ function maskPassword(connectionString) {
 ///////////////////////////////////////////
 // Returns a space gap for console output;
 function messageGap(level) {
-    return Array(1 + level * 4).join(' ');
+    return ' '.repeat(level * 4);
 }
 
 /////////////////////////////////////////

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "pg-promise",
-  "version": "8.6.4",
+  "version": "8.7.2",
   "description": "Promises interface for PostgreSQL",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",
   "scripts": {
-    "test": "jasmine-node test",
+    "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",
@@ -41,23 +41,23 @@
     "npm": ">=2.15"
   },
   "dependencies": {
+    "assert-options": "0.1.3",
     "manakin": "0.5.2",
-    "pg": "7.9.0",
-    "pg-minify": "0.5.5",
-    "spex": "2.2.0",
-    "assert-options": "0.1.3"
+    "pg": "7.11.0",
+    "pg-minify": "1.2.0",
+    "spex": "2.2.0"
   },
   "devDependencies": {
-    "@types/node": "11.11.3",
+    "@types/node": "12.0.0",
     "JSONStream": "1.3.5",
-    "bluebird": "3.5.3",
+    "bluebird": "3.5.4",
     "coveralls": "3.0.3",
-    "eslint": "5.15.2",
-    "tslint": "5.14.0",
+    "eslint": "5.16.0",
+    "tslint": "5.16.0",
     "istanbul": "0.4.5",
     "jasmine-node": "1.16.2",
-    "jsdoc": "3.5.5",
+    "jsdoc": "3.6.1",
     "pg-query-stream": "2.0.0",
-    "typescript": "3.3.3333"
+    "typescript": "3.4.5"
   }
 }

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.8.0 and later.
+// Supported version of pg: 7.11.0 and later.
 //
 // pg: https://github.com/brianc/node-postgres
 //////////////////////////////////////////////////////////////////////////////
@@ -25,6 +25,7 @@ declare namespace pg {
 
     interface IColumn {
         name: string
+        oid: number
         dataTypeID: number
 
         // NOTE: properties below are not available within Native Bindings:
@@ -43,8 +44,15 @@ declare namespace pg {
         fields: IColumn[]
 
         // properties below are not available within Native Bindings:
-
         rowAsArray: boolean
+
+        _types: {
+            _types: any,
+            text: any,
+            binary: any
+        };
+        _parsers: Array<Function>;
+
     }
 
     // SSL configuration;
@@ -67,11 +75,11 @@ declare namespace pg {
     // 2) https://github.com/brianc/node-pg-pool
     type TConnectionParameters = {
         connectionString?: string
+        host?: string
         database?: string
         user?: string
         password?: string
         port?: number
-        host?: string
         ssl?: boolean | TSSLConfig
         binary?: boolean
         client_encoding?: string
@@ -79,18 +87,18 @@ declare namespace pg {
         application_name?: string
         fallback_application_name?: string
         isDomainSocket?: boolean
-        poolSize?: number // is the same as `max` below
-        max?: number // replaces `poolSize`
+        max?: number
         min?: number
         idleTimeoutMillis?: number
-        reapIntervalMillis?: number
-        returnToHead?: boolean
-        poolLog?: boolean | (() => void)
         parseInputDatesAsUTC?: boolean
         rows?: number
         statement_timeout?: boolean | number
         query_timeout?: boolean | number
+        connect_timeout?: number
+        keepAliveInitialDelayMillis?: number
         keepAlive?: boolean
+        keepalives?: number
+        keepalives_idle?: number
     }
 
     // Interface of 'pg-types' module;
@@ -109,39 +117,34 @@ declare namespace pg {
         // database host. defaults to localhost
         host: string
 
-        //database user's name
+        // database user's name
         user: string
 
-        //name of database to connect
+        // name of database to connect
         database: string
 
-        //database user's password
+        // database user's password
         password: string
 
-        //database port
+        // database port
         port: number
 
-        //number of rows to return at a time from a prepared statement's
-        //portal. 0 will return all rows at once
+        // number of rows to return at a time from a prepared statement's
+        // portal. 0 will return all rows at once
         rows: number
 
         // binary result mode
         binary: boolean
 
-        //Connection pool options - see https://github.com/coopernurse/node-pool
-        //number of connections to use in connection pool
-        //0 will disable connection pooling
-        poolSize: number
+        // Connection pool options - see https://github.com/brianc/node-pg-pool
 
-        //max milliseconds a client can go unused before it is removed
-        //from the pool and destroyed
-        idleTimeoutMillis: number
+        // number of connections to use in connection pool
+        // 0 will disable connection pooling
+        max: 10,
 
-        //frequency to check for idle clients within the client pool
-        reapIntervalMillis: number
-
-        //pool log function / boolean
-        poolLog: boolean | (() => void)
+        // max milliseconds a client can go unused before it is removed
+        // from the pool and destroyed
+        idleTimeoutMillis: number
 
         client_encoding: string
 
@@ -153,9 +156,18 @@ declare namespace pg {
 
         parseInputDatesAsUTC: boolean
 
+        // max milliseconds any query using this connection will execute for before timing out in error.
+        // false=unlimited
         statement_timeout: boolean | number
 
+        // max milliseconds to wait for query to complete (client side)
         query_timeout: boolean | number
+
+        connect_timeout: number
+
+        keepalives: number
+
+        keepalives_idle: number
     }
 
     class Connection {