pg-promise 11.4.0 → 11.4.2

package/lib/helpers/table-name.js

@@ -7,11 +7,11 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {assert} = require(`../assert`);
+const {assert} = require('../assert');
 
 const npm = {
-    utils: require(`../utils`),
-    format: require(`../formatting`).as // formatting namespace
+    utils: require('../utils'),
+    format: require('../formatting').as // formatting namespace
 };
 
 /**
@@ -62,21 +62,21 @@ const npm = {
 class TableName {
 
     constructor(table) {
-        if (typeof table === `string`) {
+        if (typeof table === 'string') {
             this.table = table;
         } else {
-            const config = assert(table, [`table`, `schema`]);
+            const config = assert(table, ['table', 'schema']);
             this.table = config.table;
             if (npm.utils.isText(config.schema)) {
                 this.schema = config.schema;
             }
         }
         if (!npm.utils.isText(this.table)) {
-            throw new TypeError(`Table name must be a non-empty text string.`);
+            throw new TypeError('Table name must be a non-empty text string.');
         }
         this.name = npm.format.name(this.table);
         if (this.schema) {
-            this.name = npm.format.name(this.schema) + `.` + this.name;
+            this.name = npm.format.name(this.schema) + '.' + this.name;
         }
         Object.freeze(this);
     }

package/lib/index.js

@@ -8,7 +8,7 @@
  */
 
 /* eslint no-var: off */
-var v = process.versions.node.split(`.`),
+var v = process.versions.node.split('.'),
     highVer = +v[0];
 
 // istanbul ignore next
@@ -22,7 +22,7 @@ if (highVer < 14) {
     // Node.js v4.5.0 was supported up to pg-promise v8.7.5
     // Node.js v0.10 was supported up to pg-promise v5.5.8
 
-    throw new Error(`Minimum Node.js version supported by pg-promise is 14.0.0`);
+    throw new Error('Minimum Node.js version supported by pg-promise is 14.0.0');
 }
 
-module.exports = require(`./main`);
+module.exports = require('./main');

package/lib/inner-state.js

@@ -1,4 +1,4 @@
-const {addReadProp} = require(`./utils`);
+const {addReadProp} = require('./utils');
 
 /**
  * @private
@@ -10,8 +10,8 @@ const {addReadProp} = require(`./utils`);
 class InnerState {
 
     constructor(initialState) {
-        addReadProp(this, `_inner`, {}, true);
-        if (initialState && typeof initialState === `object`) {
+        addReadProp(this, '_inner', {}, true);
+        if (initialState && typeof initialState === 'object') {
             this.extendState(initialState);
         }
     }

package/lib/main.js

@@ -7,26 +7,26 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {PromiseAdapter} = require(`./promise-adapter`);
-const {DatabasePool} = require(`./database-pool`);
-const {PreparedStatement, ParameterizedQuery} = require(`./types`);
-const {QueryFile} = require(`./query-file`);
-const {queryResult} = require(`./query-result`);
-const {parsePromise} = require(`./promise-parser`);
-const {assert} = require(`./assert`);
+const {PromiseAdapter} = require('./promise-adapter');
+const {DatabasePool} = require('./database-pool');
+const {PreparedStatement, ParameterizedQuery} = require('./types');
+const {QueryFile} = require('./query-file');
+const {queryResult} = require('./query-result');
+const {parsePromise} = require('./promise-parser');
+const {assert} = require('./assert');
 
 const npm = {
-    path: require(`path`),
-    pg: require(`pg`),
-    minify: require(`pg-minify`),
-    formatting: require(`./formatting`),
-    helpers: require(`./helpers`),
-    errors: require(`./errors`),
-    utils: require(`./utils`),
-    pubUtils: require(`./utils/public`),
-    mode: require(`./tx-mode`),
-    package: require(`../package.json`),
-    text: require(`./text`)
+    path: require('path'),
+    pg: require('pg'),
+    minify: require('pg-minify'),
+    formatting: require('./formatting'),
+    helpers: require('./helpers'),
+    errors: require('./errors'),
+    utils: require('./utils'),
+    pubUtils: require('./utils/public'),
+    mode: require('./tx-mode'),
+    package: require('../package.json'),
+    text: require('./text')
 };
 
 let originalClientConnect;
@@ -178,8 +178,8 @@ let originalClientConnect;
  */
 function $main(options) {
 
-    options = assert(options, [`pgFormatting`, `pgNative`, `promiseLib`, `capSQL`, `noWarnings`,
-        `connect`, `disconnect`, `query`, `receive`, `task`, `transact`, `error`, `extend`, `schema`]);
+    options = assert(options, ['pgFormatting', 'pgNative', 'promiseLib', 'capSQL', 'noWarnings',
+        'connect', 'disconnect', 'query', 'receive', 'task', 'transact', 'error', 'extend', 'schema']);
 
     let pg = npm.pg;
     const p = parsePromise(options.promiseLib);
@@ -190,11 +190,11 @@ function $main(options) {
         promise: p.promise
     };
 
-    npm.utils.addReadProp(config, `$npm`, {}, true);
+    npm.utils.addReadProp(config, '$npm', {}, true);
 
     // Locking properties that cannot be changed later:
-    npm.utils.addReadProp(options, `promiseLib`, options.promiseLib);
-    npm.utils.addReadProp(options, `pgNative`, !!options.pgNative);
+    npm.utils.addReadProp(options, 'promiseLib', options.promiseLib);
+    npm.utils.addReadProp(options, 'pgNative', !!options.pgNative);
 
     config.options = options;
 
@@ -210,24 +210,24 @@ function $main(options) {
             originalClientConnect = pg.Client.prototype.connect;
             pg.Client.prototype.connect = function () {
                 const handler = msg => {
-                    if (msg.parameterName === `server_version`) {
+                    if (msg.parameterName === 'server_version') {
                         this.serverVersion = msg.parameterValue;
-                        this.connection.removeListener(`parameterStatus`, handler);
+                        this.connection.removeListener('parameterStatus', handler);
                     }
                 };
-                this.connection.on(`parameterStatus`, handler);
+                this.connection.on('parameterStatus', handler);
                 return originalClientConnect.call(this, ...arguments);
             };
         }
     }
 
-    const Database = require(`./database`)(config);
+    const Database = require('./database')(config);
 
     const inst = (cn, dc) => {
-        if (npm.utils.isText(cn) || (cn && typeof cn === `object`)) {
+        if (npm.utils.isText(cn) || (cn && typeof cn === 'object')) {
             return new Database(cn, dc, config);
         }
-        throw new TypeError(`Invalid connection details: ` + npm.utils.toJson(cn));
+        throw new TypeError('Invalid connection details: ' + npm.utils.toJson(cn));
     };
 
     npm.utils.addReadProperties(inst, rootNameSpace);
@@ -258,7 +258,7 @@ function $main(options) {
      *
      * For more details see $[Library de-initialization].
      */
-    npm.utils.addReadProp(inst, `end`, () => {
+    npm.utils.addReadProp(inst, 'end', () => {
         DatabasePool.shutDown();
     });
 
@@ -272,7 +272,7 @@ function $main(options) {
      *
      * @see {@link helpers}.
      */
-    npm.utils.addReadProp(inst, `helpers`, npm.helpers(config));
+    npm.utils.addReadProp(inst, 'helpers', npm.helpers(config));
 
     /**
      * @member {external:spex} spex
@@ -287,7 +287,7 @@ function $main(options) {
      * {@link Task#page},
      * {@link Task#sequence}
      */
-    npm.utils.addReadProp(inst, `spex`, config.$npm.spex);
+    npm.utils.addReadProp(inst, 'spex', config.$npm.spex);
 
     config.pgp = inst;
 

package/lib/patterns.js

@@ -39,5 +39,5 @@ module.exports = {
     hasValidModifier: /\^|~|#|:raw|:alias|:name|:json|:csv|:list|:value/,
 
     // List of all supported formatting modifiers:
-    validModifiers: [`^`, `~`, `#`, `:raw`, `:alias`, `:name`, `:json`, `:csv`, `:list`, `:value`]
+    validModifiers: ['^', '~', '#', ':raw', ':alias', ':name', ':json', ':csv', ':list', ':value']
 };

package/lib/promise-adapter.js

@@ -7,7 +7,7 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {assert} = require(`./assert`);
+const {assert} = require('./assert');
 
 /**
  * @class PromiseAdapter
@@ -54,31 +54,31 @@ const {assert} = require(`./assert`);
 class PromiseAdapter {
     constructor(api) {
 
-        if (!api || typeof api !== `object`) {
-            throw new TypeError(`Adapter requires an api configuration object.`);
+        if (!api || typeof api !== 'object') {
+            throw new TypeError('Adapter requires an api configuration object.');
         }
 
-        api = assert(api, [`create`, `resolve`, `reject`, `all`]);
+        api = assert(api, ['create', 'resolve', 'reject', 'all']);
 
         this.create = api.create;
         this.resolve = api.resolve;
         this.reject = api.reject;
         this.all = api.all;
 
-        if (typeof this.create !== `function`) {
-            throw new TypeError(`Function 'create' must be specified.`);
+        if (typeof this.create !== 'function') {
+            throw new TypeError('Function \'create\' must be specified.');
         }
 
-        if (typeof this.resolve !== `function`) {
-            throw new TypeError(`Function 'resolve' must be specified.`);
+        if (typeof this.resolve !== 'function') {
+            throw new TypeError('Function \'resolve\' must be specified.');
         }
 
-        if (typeof this.reject !== `function`) {
-            throw new TypeError(`Function 'reject' must be specified.`);
+        if (typeof this.reject !== 'function') {
+            throw new TypeError('Function \'reject\' must be specified.');
         }
 
-        if (typeof this.all !== `function`) {
-            throw new TypeError(`Function 'all' must be specified.`);
+        if (typeof this.all !== 'function') {
+            throw new TypeError('Function \'all\' must be specified.');
         }
     }
 }

package/lib/promise-parser.js

@@ -7,7 +7,7 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {PromiseAdapter} = require(`./promise-adapter`);
+const {PromiseAdapter} = require('./promise-adapter');
 
 //////////////////////////////////////////
 // Parses and validates a promise library;
@@ -24,22 +24,22 @@ function parse(pl) {
         return promise;
     }
     const t = typeof pl;
-    if (t === `function` || t === `object`) {
-        const Root = typeof pl.Promise === `function` ? pl.Promise : pl;
+    if (t === 'function' || t === 'object') {
+        const Root = typeof pl.Promise === 'function' ? pl.Promise : pl;
         promise = function (func) {
             return new Root(func);
         };
         promise.resolve = Root.resolve;
         promise.reject = Root.reject;
         promise.all = Root.all;
-        if (typeof promise.resolve === `function` &&
-            typeof promise.reject === `function` &&
-            typeof promise.all === `function`) {
+        if (typeof promise.resolve === 'function' &&
+            typeof promise.reject === 'function' &&
+            typeof promise.all === 'function') {
             return promise;
         }
     }
 
-    throw new TypeError(`Invalid promise library specified.`);
+    throw new TypeError('Invalid promise library specified.');
 }
 
 function parsePromise(promiseLib) {

package/lib/query-file.js

@@ -7,21 +7,21 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {InnerState} = require(`./inner-state`);
-const {QueryFileError} = require(`./errors`);
-const {assert} = require(`./assert`);
-const {ColorConsole} = require(`./utils/color`);
+const {InnerState} = require('./inner-state');
+const {QueryFileError} = require('./errors');
+const {assert} = require('./assert');
+const {ColorConsole} = require('./utils/color');
 
 const npm = {
-    fs: require(`fs`),
-    os: require(`os`),
-    path: require(`path`),
-    minify: require(`pg-minify`),
-    utils: require(`./utils`),
-    formatting: require(`./formatting`)
+    fs: require('fs'),
+    os: require('os'),
+    path: require('path'),
+    minify: require('pg-minify'),
+    utils: require('./utils'),
+    formatting: require('./formatting')
 };
 
-const file$query = Symbol(`QueryFile.query`);
+const file$query = Symbol('QueryFile.query');
 
 /**
  * @class QueryFile
@@ -151,7 +151,7 @@ class QueryFile extends InnerState {
      * @return {{usedPath: {}}}
      */
     static get instance() {
-        const s = Symbol.for(`pgPromiseQueryFile`);
+        const s = Symbol.for('pgPromiseQueryFile');
         let scope = global[s];
         if (!scope) {
             scope = {
@@ -253,15 +253,15 @@ class QueryFile extends InnerState {
             return;
         }
         try {
-            i.sql = npm.fs.readFileSync(i.filePath, `utf8`);
+            i.sql = npm.fs.readFileSync(i.filePath, 'utf8');
             i.modTime = lastMod || npm.fs.statSync(i.filePath).mtime.getTime();
-            if (options.minify && options.minify !== `after`) {
+            if (options.minify && options.minify !== 'after') {
                 i.sql = npm.minify(i.sql, {compress: options.compress});
             }
             if (options.params !== undefined) {
                 i.sql = npm.formatting.as.format(i.sql, options.params, {partial: true});
             }
-            if (options.minify && options.minify === `after`) {
+            if (options.minify && options.minify === 'after') {
                 i.sql = npm.minify(i.sql, {compress: options.compress});
             }
             i.ready = true;
@@ -328,17 +328,17 @@ QueryFile.prototype.toString = function (level) {
     level = level > 0 ? parseInt(level) : 0;
     const gap = npm.utils.messageGap(level + 1);
     const lines = [
-        `QueryFile {`
+        'QueryFile {'
     ];
     this.prepare();
-    lines.push(gap + `file: "` + this.file + `"`);
-    lines.push(gap + `options: ` + npm.utils.toJson(this.options));
+    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));
+        lines.push(gap + 'error: ' + this.error.toString(level + 1));
     } else {
-        lines.push(gap + `query: "` + this[QueryFile.$query] + `"`);
+        lines.push(gap + 'query: "' + this[QueryFile.$query] + '"');
     }
-    lines.push(npm.utils.messageGap(level) + `}`);
+    lines.push(npm.utils.messageGap(level) + '}');
     return lines.join(npm.os.EOL);
 };
 

package/lib/query.js

@@ -7,19 +7,19 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {Events} = require(`./events`);
-const {QueryFile} = require(`./query-file`);
-const {ServerFormatting, PreparedStatement, ParameterizedQuery} = require(`./types`);
-const {SpecialQuery} = require(`./special-query`);
-const {queryResult} = require(`./query-result`);
+const {Events} = require('./events');
+const {QueryFile} = require('./query-file');
+const {ServerFormatting, PreparedStatement, ParameterizedQuery} = require('./types');
+const {SpecialQuery} = require('./special-query');
+const {queryResult} = require('./query-result');
 
 const npm = {
-    util: require(`util`),
-    utils: require(`./utils`),
-    formatting: require(`./formatting`),
-    errors: require(`./errors`),
-    stream: require(`./stream`),
-    text: require(`./text`)
+    util: require('util'),
+    utils: require('./utils'),
+    formatting: require('./formatting'),
+    errors: require('./errors'),
+    stream: require('./stream'),
+    text: require('./text')
 };
 
 const QueryResultError = npm.errors.QueryResultError,
@@ -46,7 +46,7 @@ function $query(ctx, query, values, qrm, config) {
         pgFormatting = opt.pgFormatting,
         params = pgFormatting ? values : undefined;
 
-    if (typeof query === `function`) {
+    if (typeof query === 'function') {
         try {
             query = npm.formatting.resolveFunc(query, values);
         } catch (e) {
@@ -60,7 +60,7 @@ function $query(ctx, query, values, qrm, config) {
         error = new TypeError(npm.text.invalidQuery);
     }
 
-    if (!error && typeof query === `object`) {
+    if (!error && typeof query === 'object') {
         if (query instanceof QueryFile) {
             query.prepare();
             if (query.error) {
@@ -70,18 +70,18 @@ function $query(ctx, query, values, qrm, config) {
                 query = query[QueryFile.$query];
             }
         } else {
-            if (`entity` in query) {
+            if ('entity' in query) {
                 entityType = query.type;
                 query = query.entity; // query is a function name;
             } else {
                 if (query instanceof ServerFormatting) {
                     pgFormatting = true;
                 } else {
-                    if (`name` in query) {
+                    if ('name' in query) {
                         query = new PreparedStatement(query);
                         pgFormatting = true;
                     } else {
-                        if (`text` in query) {
+                        if ('text' in query) {
                             query = new ParameterizedQuery(query);
                             pgFormatting = true;
                         }
@@ -96,7 +96,7 @@ function $query(ctx, query, values, qrm, config) {
 
     if (!error) {
         if (!pgFormatting && !npm.utils.isText(query)) {
-            const errTxt = entityType ? (entityType === `func` ? npm.text.invalidFunction : npm.text.invalidProc) : npm.text.invalidQuery;
+            const errTxt = entityType ? (entityType === 'func' ? npm.text.invalidFunction : npm.text.invalidProc) : npm.text.invalidQuery;
             error = new TypeError(errTxt);
         }
         if (query instanceof ServerFormatting) {
@@ -130,11 +130,11 @@ function $query(ctx, query, values, qrm, config) {
             }
         } catch (e) {
             if (entityType) {
-                let prefix = entityType === `func` ? `select * from` : `call`;
+                let prefix = entityType === 'func' ? 'select * from' : 'call';
                 if (capSQL) {
                     prefix = prefix.toUpperCase();
                 }
-                query = prefix + ` ` + query + `(...)`;
+                query = prefix + ' ' + query + '(...)';
             } else {
                 params = values;
             }

package/lib/stream.js

@@ -7,11 +7,11 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {Events} = require(`./events`);
+const {Events} = require('./events');
 
 const npm = {
-    utils: require(`./utils`),
-    text: require(`./text`)
+    utils: require('./utils'),
+    text: require('./text')
 };
 
 ////////////////////////////////////////////
@@ -28,7 +28,7 @@ function $stream(ctx, qs, initCB, config) {
     }
     // Stream class was renamed again, see the following issue:
     // https://github.com/brianc/node-postgres/issues/2412
-    if (!qs || !qs.constructor || qs.constructor.name !== `QueryStream`) {
+    if (!qs || !qs.constructor || qs.constructor.name !== 'QueryStream') {
         // invalid or missing stream object;
         return $p.reject(new TypeError(npm.text.invalidStream));
     }
@@ -36,7 +36,7 @@ function $stream(ctx, qs, initCB, config) {
         // stream object is in the wrong state;
         return $p.reject(new Error(npm.text.invalidStreamState));
     }
-    if (typeof initCB !== `function`) {
+    if (typeof initCB !== 'function') {
         // parameter `initCB` must be passed as the initialization callback;
         return $p.reject(new TypeError(npm.text.invalidStreamCB));
     }
@@ -51,9 +51,9 @@ function $stream(ctx, qs, initCB, config) {
 
     const stream = ctx.db.client.query(qs);
 
-    stream.on(`data`, onData);
-    stream.on(`error`, onError);
-    stream.on(`end`, onEnd);
+    stream.on('data', onData);
+    stream.on('error', onError);
+    stream.on('end', onEnd);
 
     try {
         initCB.call(this, stream); // the stream must be initialized during the call;
@@ -92,9 +92,9 @@ function $stream(ctx, qs, initCB, config) {
     }
 
     function release() {
-        stream.removeListener(`data`, onData);
-        stream.removeListener(`error`, onError);
-        stream.removeListener(`end`, onEnd);
+        stream.removeListener('data', onData);
+        stream.removeListener('error', onError);
+        stream.removeListener('end', onEnd);
     }
 
     function getError(e) {

package/lib/task.js

@@ -7,14 +7,14 @@
  * Removal or modification of this copyright notice is prohibited.
  */
 
-const {Events} = require(`./events`);
+const {Events} = require('./events');
 
 const npm = {
-    spex: require(`spex`),
-    utils: require(`./utils`),
-    mode: require(`./tx-mode`),
-    query: require(`./query`),
-    text: require(`./text`)
+    spex: require('spex'),
+    utils: require('./utils'),
+    mode: require('./tx-mode'),
+    query: require('./query'),
+    text: require('./text')
 };
 
 /**
@@ -91,23 +91,23 @@ function Task(ctx, tag, isTX, config) {
      */
     this.ctx = ctx.ctx = {}; // task context object;
 
-    npm.utils.addReadProp(this.ctx, `isTX`, isTX);
+    npm.utils.addReadProp(this.ctx, 'isTX', isTX);
 
-    if (`context` in ctx) {
-        npm.utils.addReadProp(this.ctx, `context`, ctx.context);
+    if ('context' in ctx) {
+        npm.utils.addReadProp(this.ctx, 'context', ctx.context);
     }
 
-    npm.utils.addReadProp(this.ctx, `connected`, !ctx.db);
-    npm.utils.addReadProp(this.ctx, `tag`, tag);
-    npm.utils.addReadProp(this.ctx, `dc`, ctx.dc);
-    npm.utils.addReadProp(this.ctx, `level`, ctx.level);
-    npm.utils.addReadProp(this.ctx, `inTransaction`, ctx.inTransaction);
+    npm.utils.addReadProp(this.ctx, 'connected', !ctx.db);
+    npm.utils.addReadProp(this.ctx, 'tag', tag);
+    npm.utils.addReadProp(this.ctx, 'dc', ctx.dc);
+    npm.utils.addReadProp(this.ctx, 'level', ctx.level);
+    npm.utils.addReadProp(this.ctx, 'inTransaction', ctx.inTransaction);
 
     if (isTX) {
-        npm.utils.addReadProp(this.ctx, `txLevel`, ctx.txLevel);
+        npm.utils.addReadProp(this.ctx, 'txLevel', ctx.txLevel);
     }
 
-    npm.utils.addReadProp(this.ctx, `parent`, ctx.parentCtx);
+    npm.utils.addReadProp(this.ctx, 'parent', ctx.parentCtx);
 
     // generic query method;
     this.query = function (query, values, qrm) {
@@ -193,10 +193,10 @@ const callback = (ctx, obj, cb, config) => {
     let result;
 
     try {
-        if (cb.constructor.name === `GeneratorFunction`) {
+        if (cb.constructor.name === 'GeneratorFunction') {
             // v9.0 dropped all support for ES6 generator functions;
             // Clients should use the new ES7 async/await syntax.
-            throw new TypeError(`ES6 generator functions are no longer supported!`);
+            throw new TypeError('ES6 generator functions are no longer supported!');
         }
         result = cb.call(obj, obj); // invoking the callback function;
     } catch (err) {
@@ -207,7 +207,7 @@ const callback = (ctx, obj, cb, config) => {
         });
         return $p.reject(err); // reject with the error;
     }
-    if (result && typeof result.then === `function`) {
+    if (result && typeof result.then === 'function') {
         return result; // result is a valid promise object;
     }
     return $p.resolve(result);
@@ -232,7 +232,7 @@ const execute = (ctx, obj, isTX, config) => {
     function update(start, success, result) {
         const c = ctx.ctx;
         if (start) {
-            npm.utils.addReadProp(c, `start`, new Date());
+            npm.utils.addReadProp(c, 'start', new Date());
         } else {
             c.finish = new Date();
             c.success = success;
@@ -294,22 +294,22 @@ const execute = (ctx, obj, isTX, config) => {
 
     function begin() {
         if (!ctx.txLevel && ctx.mode instanceof npm.mode.TransactionMode) {
-            return exec(ctx.mode.begin(capSQL), `savepoint`);
+            return exec(ctx.mode.begin(capSQL), 'savepoint');
         }
-        return exec(`begin`, `savepoint`);
+        return exec('begin', 'savepoint');
     }
 
     function commit() {
-        return exec(`commit`, `release savepoint`);
+        return exec('commit', 'release savepoint');
     }
 
     function rollback() {
-        return exec(`rollback`, `rollback to savepoint`);
+        return exec('rollback', 'rollback to savepoint');
     }
 
     function exec(top, nested) {
         if (ctx.txLevel) {
-            return obj.none((capSQL ? nested.toUpperCase() : nested) + ` ` + spName);
+            return obj.none((capSQL ? nested.toUpperCase() : nested) + ' ' + spName);
         }
         return obj.none(capSQL ? top.toUpperCase() : top);
     }