pg-promise 12.4.0 → 12.6.0

package/lib/errors/parameterized-query-error.js

@@ -11,7 +11,8 @@ const {QueryFileError} = require('./query-file-error');
 
 const npm = {
     os: require('os'),
-    utils: require('../utils')
+    utils: require('../utils'),
+    inspect: require('util').inspect
 };
 
 /**
@@ -56,40 +57,15 @@ class ParameterizedQueryError extends Error {
     }
 }
 
-/**
- * @method errors.ParameterizedQueryError#toString
- * @description
- * Creates a well-formatted multi-line string that represents the error.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-ParameterizedQueryError.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap0 = npm.utils.messageGap(level),
-        gap1 = npm.utils.messageGap(level + 1),
-        gap2 = npm.utils.messageGap(level + 2),
-        lines = [
-            'ParameterizedQueryError {',
-            gap1 + 'message: "' + this.message + '"',
-            gap1 + 'result: {',
-            gap2 + 'text: ' + npm.utils.toJson(this.result.text),
-            gap2 + 'values: ' + npm.utils.toJson(this.result.values),
-            gap1 + '}'
-        ];
+npm.utils.addInspection(ParameterizedQueryError, function () {
+    const obj = {
+        message: this.message,
+        result: this.result
+    };
     if (this.error) {
-        lines.push(gap1 + 'error: ' + this.error.toString(level + 1));
+        obj.error = this.error;
     }
-    lines.push(gap0 + '}');
-    return lines.join(npm.os.EOL);
-};
-
-npm.utils.addInspection(ParameterizedQueryError, function () {
-    return this.toString();
+    return 'ParameterizedQueryError ' + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
 });
 
 module.exports = {ParameterizedQueryError};

package/lib/errors/prepared-statement-error.js

@@ -11,7 +11,8 @@ const {QueryFileError} = require('./query-file-error');
 
 const npm = {
     os: require('os'),
-    utils: require('../utils')
+    utils: require('../utils'),
+    inspect: require('util').inspect
 };
 
 /**
@@ -56,41 +57,15 @@ class PreparedStatementError extends Error {
     }
 }
 
-/**
- * @method errors.PreparedStatementError#toString
- * @description
- * Creates a well-formatted multi-line string that represents the error.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-PreparedStatementError.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap0 = npm.utils.messageGap(level),
-        gap1 = npm.utils.messageGap(level + 1),
-        gap2 = npm.utils.messageGap(level + 2),
-        lines = [
-            'PreparedStatementError {',
-            gap1 + 'message: "' + this.message + '"',
-            gap1 + 'result: {',
-            gap2 + 'name: ' + npm.utils.toJson(this.result.name),
-            gap2 + 'text: ' + npm.utils.toJson(this.result.text),
-            gap2 + 'values: ' + npm.utils.toJson(this.result.values),
-            gap1 + '}'
-        ];
+npm.utils.addInspection(PreparedStatementError, function () {
+    const obj = {
+        message: this.message,
+        result: this.result
+    };
     if (this.error) {
-        lines.push(gap1 + 'error: ' + this.error.toString(level + 1));
+        obj.error = this.error;
     }
-    lines.push(gap0 + '}');
-    return lines.join(npm.os.EOL);
-};
-
-npm.utils.addInspection(PreparedStatementError, function () {
-    return this.toString();
+    return 'PreparedStatementError ' + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
 });
 
 module.exports = {PreparedStatementError};

package/lib/errors/query-file-error.js

@@ -10,7 +10,8 @@
 const npm = {
     os: require('os'),
     utils: require('../utils'),
-    minify: require('pg-minify')
+    minify: require('pg-minify'),
+    inspect: require('util').inspect
 };
 
 /**
@@ -59,37 +60,16 @@ class QueryFileError extends Error {
     }
 }
 
-/**
- * @method errors.QueryFileError#toString
- * @description
- * Creates a well-formatted multi-line string that represents the error.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-QueryFileError.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap0 = npm.utils.messageGap(level),
-        gap1 = npm.utils.messageGap(level + 1),
-        lines = [
-            'QueryFileError {',
-            gap1 + 'message: "' + this.message + '"',
-            gap1 + 'options: ' + npm.utils.toJson(this.options),
-            gap1 + 'file: "' + this.file + '"'
-        ];
+npm.utils.addInspection(QueryFileError, function () {
+    const obj = {
+        message: this.message,
+        file: this.file,
+        options: this.options
+    };
     if (this.error) {
-        lines.push(gap1 + 'error: ' + this.error.toString(level + 1));
+        obj.error = this.error;
     }
-    lines.push(gap0 + '}');
-    return lines.join(npm.os.EOL);
-};
-
-npm.utils.addInspection(QueryFileError, function () {
-    return this.toString();
+    return 'QueryFileError ' + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
 });
 
 module.exports = {QueryFileError};

package/lib/errors/query-result-error.js

@@ -10,7 +10,8 @@
 const npm = {
     os: require('os'),
     utils: require('../utils'),
-    text: require('../text')
+    text: require('../text'),
+    inspect: require('util').inspect
 };
 
 /**
@@ -102,7 +103,7 @@ const errorMessages = [
  *   error(err, e) {
  *       if (err instanceof QueryResultError) {
  *           // A query returned unexpected number of records, and thus rejected;
- *           
+ *
  *           // we can check the error code, if we want specifics:
  *           if(err.code === qrec.noData) {
  *               // expected some data, but received none;
@@ -112,7 +113,7 @@ const errorMessages = [
  *           // you will get a nicely formatted output.
  *
  *           console.log(err);
- *           
+ *
  *           // See also: err, e.query, e.params, etc.
  *       }
  *   }
@@ -137,38 +138,17 @@ class QueryResultError extends Error {
     }
 }
 
-/**
- * @method errors.QueryResultError#toString
- * @description
- * Creates a well-formatted multi-line string that represents the error.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-QueryResultError.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap0 = npm.utils.messageGap(level),
-        gap1 = npm.utils.messageGap(level + 1),
-        lines = [
-            'QueryResultError {',
-            gap1 + 'code: queryResultErrorCode.' + errorMessages[this.code].name,
-            gap1 + 'message: "' + this.message + '"',
-            gap1 + 'received: ' + this.received,
-            gap1 + 'query: ' + (typeof this.query === 'string' ? '"' + this.query + '"' : npm.utils.toJson(this.query))
-        ];
+npm.utils.addInspection(QueryResultError, function () {
+    const obj = {
+        code: 'queryResultErrorCode.' + errorMessages[this.code].name,
+        message: this.message,
+        received: this.received,
+        query: typeof this.query === 'string' ? this.query : npm.utils.toJson(this.query)
+    };
     if (this.values !== undefined) {
-        lines.push(gap1 + 'values: ' + npm.utils.toJson(this.values));
+        obj.values = this.values;
     }
-    lines.push(gap0 + '}');
-    return lines.join(npm.os.EOL);
-};
-
-npm.utils.addInspection(QueryResultError, function () {
-    return this.toString();
+    return 'QueryResultError ' + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
 });
 
 module.exports = {

package/lib/helpers/column-set.js

@@ -56,6 +56,12 @@ const npm = {
  *
  * By default, only the object's own properties are enumerated for column names.
  *
+ * @param {'error' | 'skip' | 'replace'} [options.duplicate = 'error']
+ * Strategy for processing duplicate columns:
+ * - `'error'` - throws {@link external:Error Error} = `Duplicate column name "name".` (Default)
+ * - `'skip'` - skips repeated columns (only the first will be used)
+ * - `'replace'` - replaces repeated columns (the last one will be used)
+ *
  * @returns {helpers.ColumnSet}
  *
  * @see
@@ -166,17 +172,17 @@ const npm = {
  */
 class ColumnSet extends InnerState {
 
-    constructor(columns, opt) {
+    constructor(columns, options) {
         super();
 
         if (!columns || typeof columns !== 'object') {
             throw new TypeError('Invalid parameter \'columns\' specified.');
         }
 
-        opt = assert(opt, ['table', 'inherit']);
+        options = assert(options, ['table', 'inherit', 'duplicate']);
 
-        if (!npm.utils.isNull(opt.table)) {
-            this.table = (opt.table instanceof TableName) ? opt.table : new TableName(opt.table);
+        if (!npm.utils.isNull(options.table)) {
+            this.table = (options.table instanceof TableName) ? options.table : new TableName(options.table);
         }
 
         /**
@@ -190,6 +196,7 @@ class ColumnSet extends InnerState {
          * - **secondary:** to be automatically written into the console (for logging purposes).
          */
 
+        this.columns = [];
 
         /**
          * @name helpers.ColumnSet#columns
@@ -199,22 +206,28 @@ class ColumnSet extends InnerState {
          * Array of {@link helpers.Column Column} objects.
          */
         if (Array.isArray(columns)) {
-            const colNames = {};
-            this.columns = columns.map(c => {
+            const duplicate = options.duplicate || 'error';
+            columns.forEach(c => {
                 const col = (c instanceof Column) ? c : new Column(c);
-                if (col.name in colNames) {
-                    throw new Error(`Duplicate column name "${col.name}".`);
+                const idx = this.columns.findIndex(a => a.name === col.name);
+                if (idx === -1) {
+                    this.columns.push(col);
+                } else {
+                    if (duplicate === 'replace') {
+                        this.columns[idx] = col;
+                        return;
+                    }
+                    if (duplicate !== 'skip') {
+                        throw new Error(`Duplicate column name "${col.name}".`);
+                    }
                 }
-                colNames[col.name] = true;
-                return col;
             });
         } else {
             if (columns instanceof Column) {
                 this.columns = [columns];
             } else {
-                this.columns = [];
                 for (const name in columns) {
-                    if (opt.inherit || Object.prototype.hasOwnProperty.call(columns, name)) {
+                    if (options.inherit || Object.prototype.hasOwnProperty.call(columns, name)) {
                         this.columns.push(new Column(name));
                     }
                 }
@@ -415,13 +428,18 @@ ColumnSet.prototype.assignColumns = function (options) {
  * @description
  * Creates a new {@link helpers.ColumnSet ColumnSet}, by joining the two sets of columns.
  *
- * If the two sets contain a column with the same `name` (case-sensitive), an error is thrown.
+ * If the two sets contain a column with the same `name` (case-sensitive), an error is thrown (unless `options.skip` is set to `true`).
  *
  * @param {helpers.Column|helpers.ColumnSet|array} columns
  * Columns to be appended, of the same type as parameter `columns` during {@link helpers.ColumnSet ColumnSet} construction, except:
  * - it can also be of type {@link helpers.ColumnSet ColumnSet}
  * - it cannot be a simple object (properties enumeration is not supported here)
  *
+ * @param {object} [options]
+ *
+ * @param {boolean} [options.skip = false]
+ * When set to `true`, it skips duplicate columns (by default, it throws an error).
+ *
  * @returns {helpers.ColumnSet}
  * New {@link helpers.ColumnSet ColumnSet} object with the extended/concatenated list of columns.
  *
@@ -465,13 +483,12 @@ ColumnSet.prototype.assignColumns = function (options) {
  * //    ]
  * // }
  */
-ColumnSet.prototype.extend = function (columns) {
-    let cs = columns;
-    if (!(cs instanceof ColumnSet)) {
-        cs = new ColumnSet(columns);
-    }
-    // Any duplicate column will throw Error = 'Duplicate column name "name".',
-    return new ColumnSet(this.columns.concat(cs.columns), {table: this.table});
+ColumnSet.prototype.extend = function (columns, options) {
+    options = assert(options, ['skip']);
+    const duplicate = options.skip ? 'skip' : 'error';
+    const cs = columns instanceof ColumnSet ? columns : new ColumnSet(columns, {duplicate});
+    const joinedCols = this.columns.concat(...cs.columns);
+    return new ColumnSet(joinedCols, {table: this.table, duplicate});
 };
 
 /**
@@ -536,23 +553,10 @@ ColumnSet.prototype.extend = function (columns) {
  *
  */
 ColumnSet.prototype.merge = function (columns) {
-    let cs = columns;
-    if (!(cs instanceof ColumnSet)) {
-        cs = new ColumnSet(columns);
-    }
-    const colNames = {}, cols = [];
-    this.columns.forEach((c, idx) => {
-        cols.push(c);
-        colNames[c.name] = idx;
-    });
-    cs.columns.forEach(c => {
-        if (c.name in colNames) {
-            cols[colNames[c.name]] = c;
-        } else {
-            cols.push(c);
-        }
-    });
-    return new ColumnSet(cols, {table: this.table});
+    const duplicate = 'replace';
+    const cs = columns instanceof ColumnSet ? columns : new ColumnSet(columns, {duplicate});
+    const joinedCols = this.columns.concat(...cs.columns);
+    return new ColumnSet(joinedCols, {table: this.table, duplicate});
 };
 
 /**
@@ -607,43 +611,4 @@ function colDesc(column, source) {
     return a;
 }
 
-/**
- * @method helpers.ColumnSet#toString
- * @description
- * Creates a well-formatted multi-line string that represents the object.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-ColumnSet.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap0 = npm.utils.messageGap(level),
-        gap1 = npm.utils.messageGap(level + 1),
-        lines = [
-            'ColumnSet {'
-        ];
-    if (this.table) {
-        lines.push(gap1 + 'table: ' + this.table);
-    }
-    if (this.columns.length) {
-        lines.push(gap1 + 'columns: [');
-        this.columns.forEach(c => {
-            lines.push(c.toString(2));
-        });
-        lines.push(gap1 + ']');
-    } else {
-        lines.push(gap1 + 'columns: []');
-    }
-    lines.push(gap0 + '}');
-    return lines.join(npm.os.EOL);
-};
-
-npm.utils.addInspection(ColumnSet, function () {
-    return this.toString();
-});
-
 module.exports = {ColumnSet};

package/lib/helpers/column.js

@@ -289,55 +289,6 @@ function isValidVariable(name) {
     return !!m && m[0] === name;
 }
 
-/**
- * @method helpers.Column#toString
- * @description
- * Creates a well-formatted multi-line string that represents the object.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-Column.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap0 = npm.utils.messageGap(level),
-        gap1 = npm.utils.messageGap(level + 1),
-        lines = [
-            gap0 + 'Column {',
-            gap1 + 'name: ' + npm.utils.toJson(this.name)
-        ];
-    if ('prop' in this) {
-        lines.push(gap1 + 'prop: ' + npm.utils.toJson(this.prop));
-    }
-    if ('mod' in this) {
-        lines.push(gap1 + 'mod: ' + npm.utils.toJson(this.mod));
-    }
-    if ('cast' in this) {
-        lines.push(gap1 + 'cast: ' + npm.utils.toJson(this.cast));
-    }
-    if ('cnd' in this) {
-        lines.push(gap1 + 'cnd: ' + npm.utils.toJson(this.cnd));
-    }
-    if ('def' in this) {
-        lines.push(gap1 + 'def: ' + npm.utils.toJson(this.def));
-    }
-    if ('init' in this) {
-        lines.push(gap1 + 'init: [Function]');
-    }
-    if ('skip' in this) {
-        lines.push(gap1 + 'skip: [Function]');
-    }
-    lines.push(gap0 + '}');
-    return lines.join(npm.os.EOL);
-};
-
-npm.utils.addInspection(Column, function () {
-    return this.toString();
-});
-
 /**
  * @typedef helpers.ColumnConfig
  * @description
@@ -364,7 +315,7 @@ npm.utils.addInspection(Column, function () {
  * Used by methods {@link helpers.update update} and {@link helpers.sets sets}, ignored by methods {@link helpers.insert insert} and
  * {@link helpers.values values}. It indicates that the column is reserved for a `WHERE` condition, not to be set or updated.
  *
- * It can be set from a string initialization, by adding `?` in front of the name.
+ * It can be set from a string initialization by adding `?` in front of the name.
  *
  * @property {*} [def]
  * Default value for the property, to be used only when the source object doesn't have the property.
@@ -379,7 +330,7 @@ npm.utils.addInspection(Column, function () {
  * Used by methods {@link helpers.update update} (for a single object) and {@link helpers.sets sets}, ignored by methods
  * {@link helpers.insert insert} and {@link helpers.values values}.
  *
- * It is also ignored when conditional flag `cnd` is set.
+ * It is also ignored when the conditional flag `cnd` is set.
  *
  */
 

package/lib/helpers/table-name.js

@@ -109,23 +109,6 @@ TableName.prototype[npm.format.ctf.toPostgres] = function (self) {
 
 TableName.prototype[npm.format.ctf.rawType] = true; // use as pre-formatted
 
-/**
- * @method helpers.TableName#toString
- * @description
- * Creates a well-formatted string that represents the object.
- *
- * It is called automatically when writing the object into the console.
- *
- * @returns {string}
- */
-TableName.prototype.toString = function () {
-    return this.name;
-};
-
-npm.utils.addInspection(TableName, function () {
-    return this.toString();
-});
-
 /**
  * @interface Table
  * @description

package/lib/main.js

@@ -34,7 +34,7 @@ let originalClientConnect;
  * @module pg-promise
  *
  * @description
- * ## pg-promise v12.0
+ * ## pg-promise v12.5
  * All documentation here is for the latest official release only.
  *
  * ### Initialization Options

package/lib/query-file.js

@@ -18,7 +18,8 @@ const npm = {
     path: require('path'),
     minify: require('pg-minify'),
     utils: require('./utils'),
-    formatting: require('./formatting')
+    formatting: require('./formatting'),
+    inspect: require('util').inspect
 };
 
 const file$query = Symbol('QueryFile.query');
@@ -312,38 +313,18 @@ QueryFile.prototype[npm.formatting.as.ctf.toPostgres] = function (self) {
 
 QueryFile.prototype[npm.formatting.as.ctf.rawType] = true; // use as pre-formatted
 
-/**
- * @method QueryFile#toString
- * @description
- * Creates a well-formatted multi-line string that represents the object's current state.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-QueryFile.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap = npm.utils.messageGap(level + 1);
-    const lines = [
-        'QueryFile {'
-    ];
+npm.utils.addInspection(QueryFile, function () {
+    const s = 'QueryFile ';
+    const obj = {
+        file: this.file,
+        options: this.options
+    };
     this.prepare();
-    lines.push(gap + 'file: "' + this.file + '"');
-    lines.push(gap + 'options: ' + npm.utils.toJson(this.options));
     if (this.error) {
-        lines.push(gap + 'error: ' + this.error.toString(level + 1));
-    } else {
-        lines.push(gap + 'query: "' + this[QueryFile.$query] + '"');
+        obj.error = this.error;
     }
-    lines.push(npm.utils.messageGap(level) + '}');
-    return lines.join(npm.os.EOL);
-};
-
-npm.utils.addInspection(QueryFile, function () {
-    return this.toString();
+    obj.query = this[QueryFile.$query];
+    return s + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
 });
 
 module.exports = {QueryFile};

package/lib/tx-mode.js

@@ -8,9 +8,13 @@
  */
 
 const {InnerState} = require('./inner-state');
-const {addInspection} = require('./utils');
 const {assert} = require('./assert');
 
+const npm = {
+    addInspection: require('./utils').addInspection,
+    inspect: require('util').inspect
+};
+
 /**
  * @enum {number}
  * @alias txMode.isolationLevel
@@ -22,7 +26,7 @@ const {assert} = require('./assert');
  * @see $[Transaction Isolation]
  */
 const isolationLevel = {
-    /** Isolation level not specified. */
+    /** Isolation level isn't specified. */
     none: 0,
 
     /** `ISOLATION LEVEL SERIALIZABLE` */
@@ -161,8 +165,9 @@ class TransactionMode extends InnerState {
     }
 }
 
-addInspection(TransactionMode, function () {
-    return this.begin(true);
+npm.addInspection(TransactionMode, function () {
+    const obj = {SQL: this.begin(true)};
+    return 'TransactionMode ' + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
 });
 
 /**
@@ -187,4 +192,3 @@ module.exports = {
     isolationLevel,
     TransactionMode
 };
-

package/lib/types/parameterized-query.js

@@ -14,7 +14,8 @@ const {assert} = require('../assert');
 
 const npm = {
     EOL: require('os').EOL,
-    utils: require('../utils')
+    utils: require('../utils'),
+    inspect: require('util').inspect
 };
 
 /**
@@ -162,43 +163,26 @@ ParameterizedQuery.prototype.parse = function () {
     return _i.target;
 };
 
-/**
- * @method ParameterizedQuery#toString
- * @description
- * Creates a well-formatted multi-line string that represents the object's current state.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-ParameterizedQuery.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap = npm.utils.messageGap(level + 1);
+npm.utils.addInspection(ParameterizedQuery, function () {
     const pq = this.parse();
-    const lines = [
-        'ParameterizedQuery {'
-    ];
+    const obj = {};
     if (npm.utils.isText(pq.text)) {
-        lines.push(gap + 'text: "' + pq.text + '"');
+        obj.text = pq.text;
     }
     if (this.values !== undefined) {
-        lines.push(gap + 'values: ' + npm.utils.toJson(this.values));
+        obj.values = this.values;
     }
     if (this.binary !== undefined) {
-        lines.push(gap + 'binary: ' + npm.utils.toJson(this.binary));
+        obj.binary = this.binary;
     }
     if (this.rowMode !== undefined) {
-        lines.push(gap + 'rowMode: ' + npm.utils.toJson(this.rowMode));
+        obj.rowMode = this.rowMode;
     }
     if (this.error !== undefined) {
-        lines.push(gap + 'error: ' + this.error.toString(level + 1));
+        obj.error = this.error.message;
     }
-    lines.push(npm.utils.messageGap(level) + '}');
-    return lines.join(npm.EOL);
-};
+    return 'ParameterizedQuery ' + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
+});
 
 module.exports = {ParameterizedQuery};
 

package/lib/types/prepared-statement.js

@@ -14,7 +14,8 @@ const {assert} = require('../assert');
 
 const npm = {
     EOL: require('os').EOL,
-    utils: require('../utils')
+    utils: require('../utils'),
+    inspect: require('util').inspect
 };
 
 /**
@@ -206,47 +207,31 @@ PreparedStatement.prototype.parse = function () {
     return _i.target;
 };
 
-/**
- * @method PreparedStatement#toString
- * @description
- * Creates a well-formatted multi-line string that represents the object's current state.
- *
- * It is called automatically when writing the object into the console.
- *
- * @param {number} [level=0]
- * Nested output level, to provide visual offset.
- *
- * @returns {string}
- */
-PreparedStatement.prototype.toString = function (level) {
-    level = level > 0 ? parseInt(level) : 0;
-    const gap = npm.utils.messageGap(level + 1);
-    const ps = this.parse();
-    const lines = [
-        'PreparedStatement {',
-        gap + 'name: ' + npm.utils.toJson(this.name)
-    ];
-    if (npm.utils.isText(ps.text)) {
-        lines.push(gap + 'text: "' + ps.text + '"');
+npm.utils.addInspection(PreparedStatement, function () {
+    const pq = this.parse();
+    const obj = {
+        name: this.name
+    };
+    if (npm.utils.isText(pq.text)) {
+        obj.text = pq.text;
     }
     if (this.values !== undefined) {
-        lines.push(gap + 'values: ' + npm.utils.toJson(this.values));
+        obj.values = this.values;
     }
     if (this.binary !== undefined) {
-        lines.push(gap + 'binary: ' + npm.utils.toJson(this.binary));
+        obj.binary = this.binary;
     }
     if (this.rowMode !== undefined) {
-        lines.push(gap + 'rowMode: ' + npm.utils.toJson(this.rowMode));
+        obj.rowMode = this.rowMode;
     }
     if (this.rows !== undefined) {
-        lines.push(gap + 'rows: ' + npm.utils.toJson(this.rows));
+        obj.rows = this.rows;
     }
-    if (this.error) {
-        lines.push(gap + 'error: ' + this.error.toString(level + 1));
+    if (this.error !== undefined) {
+        obj.error = this.error.message;
     }
-    lines.push(npm.utils.messageGap(level) + '}');
-    return lines.join(npm.EOL);
-};
+    return 'PreparedStatement ' + npm.inspect(obj, {breakLength: 100, depth: 5, colors: true});
+});
 
 module.exports = {PreparedStatement};
 

package/lib/types/server-formatting.js

@@ -1,5 +1,4 @@
 const {InnerState} = require('../inner-state');
-const {addInspection} = require('../utils');
 const utils = require('../utils');
 
 /**
@@ -90,8 +89,4 @@ function setValues(v) {
     }
 }
 
-addInspection(ServerFormatting, function () {
-    return this.toString();
-});
-
 module.exports = {ServerFormatting};

package/lib/utils/index.js

@@ -73,12 +73,6 @@ function getSafeConnection(cn) {
     return maskPassword(cn);
 }
 
-///////////////////////////////////////////
-// Returns a space gap for console output;
-function messageGap(level) {
-    return ' '.repeat(level * 4);
-}
-
 /////////////////////////////////////////
 // Provides platform-neutral inheritance;
 function inherits(child, parent) {
@@ -193,7 +187,6 @@ const exp = {
     addReadProp,
     addReadProperties,
     getSafeConnection,
-    messageGap,
     inherits,
     isConnectivityError
 };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "pg-promise",
-  "version": "12.4.0",
+  "version": "12.6.0",
   "description": "PostgreSQL interface for Node.js",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",
   "scripts": {
     "spelling": "cspell --config=.cspell.json \"**/*.{md,ts,js}\" --no-progress",
-    "coverage": "istanbul cover ./node_modules/jasmine-node/bin/jasmine-node --captureExceptions test",
+    "coverage": "nyc --reporter=html --reporter=text ./node_modules/jasmine-node/bin/jasmine-node --captureExceptions test",
     "doc": "jsdoc -c ./jsdoc/jsdoc.js ./jsdoc/README.md -t ./jsdoc/templates/custom",
     "lint": "eslint ./lib ./test/*.js ./test/db",
     "lint:fix": "npm run lint -- --fix",
@@ -42,24 +42,24 @@
   },
   "dependencies": {
     "assert-options": "0.8.3",
-    "pg": "8.17.2",
+    "pg": "8.18.0",
     "pg-minify": "1.8.0",
     "spex": "4.1.0"
   },
   "peerDependencies": {
-    "pg-query-stream": "4.11.2"
+    "pg-query-stream": "4.12.0"
   },
   "devDependencies": {
     "@eslint/js": "9.39.2",
-    "@types/node": "25.1.0",
+    "@types/node": "25.2.0",
     "coveralls": "3.1.1",
-    "cspell": "9.6.2",
+    "cspell": "9.6.3",
     "eslint": "9.39.2",
-    "globals": "17.2.0",
-    "istanbul": "0.4.5",
+    "globals": "17.3.0",
     "jasmine-node": "3.0.0",
     "jsdoc": "4.0.5",
     "JSONStream": "1.3.5",
+    "nyc": "17.1.0",
     "typescript": "5.9.3"
   }
 }

package/typescript/pg-promise.d.ts

@@ -130,6 +130,7 @@ declare namespace pgPromise {
     interface IColumnSetOptions {
         table?: string | ITable | TableName
         inherit?: boolean
+        duplicate?: 'error' | 'skip' | 'replace'
     }
 
     interface ITable {
@@ -206,8 +207,12 @@ declare namespace pgPromise {
             skip?: string | string[] | ((c: Column<T>) => boolean)
         }): string
 
-        extend<K extends string>(columns: K[]): ColumnSet<T & Record<K, unknown>>
-        extend<S>(columns: Column<S> | ColumnSet<S> | Array<IColumnConfig<S> | Column<S>>): ColumnSet<T & S>
+        extend<K extends string>(columns: K[], opts?: {
+            skip?: boolean
+        }): ColumnSet<T & Record<K, unknown>>
+        extend<S>(columns: Column<S> | ColumnSet<S> | Array<IColumnConfig<S> | Column<S>>, opts?: {
+            skip?: boolean
+        }): ColumnSet<T & S>
 
         merge<K extends string>(columns: K[]): ColumnSet<T & Record<K, unknown>>
         merge<S>(columns: Column<S> | ColumnSet<S> | Array<IColumnConfig<S> | Column<S>>): ColumnSet<T & S>