postgrejs 2.12.0 → 2.15.0

package/README.md

@@ -1,4 +1,4 @@
-## postgresql-client
+## postgrejs
   
 [![NPM Version][npm-image]][npm-url]
 [![NPM Downloads][downloads-image]][downloads-url]
@@ -36,7 +36,7 @@ Enterprise level PostgreSQL client for NodeJs
 ## Installation
 
 ```bash
-$ npm install postgresql-client --save
+$ npm install postgrejs --save
 ```
 
 ## Documentation
@@ -47,7 +47,7 @@ Please read :small_orange_diamond: [DOCUMENTATION](DOCUMENTATION.md) :small_oran
 ### Establish a single connection, execute a simple query
 
 ```ts
-import {Connection} from 'postgresql-client';
+import {Connection} from 'postgrejs';
 // Create connection
 const connection = new Connection('postgres://localhost');
 // Connect to database server
@@ -66,7 +66,7 @@ await connection.close();
 
 ### Establish a pooled connection, create a cursor
 ```ts
-import {Pool} from 'postgresql-client';
+import {Pool} from 'postgrejs';
 
 // Create connection pool
 const db = new Pool({
@@ -98,7 +98,7 @@ await db.close();
 
 ### Using prepared statements
 ```ts
-import {DataTypeOIDs} from 'postgresql-client'; 
+import {DataTypeOIDs} from 'postgrejs'; 
 
 // .....
 const statement = await connection.prepare( 
@@ -172,29 +172,29 @@ The table below lists builtin data type mappings.
 
 
 ## Support
-You can report bugs and discuss features on the [GitHub issues](https://github.com/panates/postgresql-client/issues) page
+You can report bugs and discuss features on the [GitHub issues](https://github.com/panates/postgrejs/issues) page
 When you open an issue please provide version of NodeJS and PostgreSQL server.
 
 ## Node Compatibility
-- node >= 14.x
+- node >= 16.x
  
   
 ## License
-postgresql-client is available under [MIT](LICENSE) license.
-
-[npm-image]: https://img.shields.io/npm/v/postgresql-client
-[npm-url]: https://npmjs.org/package/postgresql-client
-[circleci-image]: https://circleci.com/gh/panates/postgresql-client/tree/master.svg?style=shield
-[circleci-url]: https://circleci.com/gh/panates/postgresql-client/tree/master
-[coveralls-image]: https://img.shields.io/coveralls/panates/postgresql-client/master.svg
-[coveralls-url]: https://coveralls.io/r/panates/postgresql-client
-[downloads-image]: https://img.shields.io/npm/dm/postgresql-client.svg
-[downloads-url]: https://npmjs.org/package/postgresql-client
-[gitter-image]: https://badges.gitter.im/panates/postgresql-client.svg
-[gitter-url]: https://gitter.im/panates/postgresql-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-[dependencies-image]: https://david-dm.org/panates/postgresql-client/status.svg
-[dependencies-url]:https://david-dm.org/panates/postgresql-client
-[devdependencies-image]: https://david-dm.org/panates/postgresql-client/dev-status.svg
-[devdependencies-url]:https://david-dm.org/panates/postgresql-client?type=dev
-[quality-image]: http://npm.packagequality.com/shield/postgresql-client.png
-[quality-url]: http://packagequality.com/#?package=postgresql-client
+postgrejs is available under [MIT](LICENSE) license.
+
+[npm-image]: https://img.shields.io/npm/v/postgrejs
+[npm-url]: https://npmjs.org/package/postgrejs
+[circleci-image]: https://circleci.com/gh/panates/postgrejs/tree/master.svg?style=shield
+[circleci-url]: https://circleci.com/gh/panates/postgrejs/tree/master
+[coveralls-image]: https://img.shields.io/coveralls/panates/postgrejs/master.svg
+[coveralls-url]: https://coveralls.io/r/panates/postgrejs
+[downloads-image]: https://img.shields.io/npm/dm/postgrejs.svg
+[downloads-url]: https://npmjs.org/package/postgrejs
+[gitter-image]: https://badges.gitter.im/panates/postgrejs.svg
+[gitter-url]: https://gitter.im/panates/postgrejs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[dependencies-image]: https://david-dm.org/panates/postgrejs/status.svg
+[dependencies-url]:https://david-dm.org/panates/postgrejs
+[devdependencies-image]: https://david-dm.org/panates/postgrejs/dev-status.svg
+[devdependencies-url]:https://david-dm.org/panates/postgrejs?type=dev
+[quality-image]: http://npm.packagequality.com/shield/postgrejs.png
+[quality-url]: http://packagequality.com/#?package=postgrejs

package/cjs/connection/connection.js

@@ -86,34 +86,37 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
         if (this.state === constants_js_1.ConnectionState.CLOSED || this._closing)
             return;
         /* istanbul ignore next */
-        if (this.listenerCount('debug'))
+        if (this.listenerCount('debug')) {
             this.emit('debug', {
                 location: 'Connection.close',
                 connection: this,
                 message: `[${this.processID}] closing`,
             });
+        }
         this._closing = true;
         if (this._intlCon.refCount > 0 && typeof terminateWait === 'number' && terminateWait > 0) {
             const startTime = Date.now();
             return this._captureErrorStack(new Promise((resolve, reject) => {
                 /* istanbul ignore next */
-                if (this.listenerCount('debug'))
+                if (this.listenerCount('debug')) {
                     this.emit('debug', {
                         location: 'Connection.close',
                         connection: this,
                         message: `[${this.processID}] waiting active queries`,
                     });
+                }
                 const timer = setInterval(() => {
                     if (this._intlCon.refCount <= 0 || Date.now() > startTime + terminateWait) {
                         clearInterval(timer);
                         if (this._intlCon.refCount > 0) {
                             /* istanbul ignore next */
-                            if (this.listenerCount('debug'))
+                            if (this.listenerCount('debug')) {
                                 this.emit('debug', {
                                     location: 'Connection.close',
                                     connection: this,
                                     message: `[${this.processID}] terminate`,
                                 });
+                            }
                             this.emit('terminate');
                         }
                         this._close().then(resolve).catch(reject);
@@ -137,13 +140,14 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
     async query(sql, options) {
         this._intlCon.assertConnected();
         /* istanbul ignore next */
-        if (this.listenerCount('debug'))
+        if (this.listenerCount('debug')) {
             this.emit('debug', {
                 location: 'Connection.query',
                 connection: this,
                 message: `[${this.processID}] query | ${sql}`,
                 sql,
             });
+        }
         const typeMap = options?.typeMap || data_type_map_js_1.GlobalTypeMap;
         const paramTypes = options?.params?.map(prm => prm instanceof bind_param_js_1.BindParam ? prm.oid : typeMap.determine(prm));
         const statement = await this.prepare(sql, { paramTypes, typeMap }).catch((e) => {
@@ -164,13 +168,14 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
      */
     async prepare(sql, options) {
         /* istanbul ignore next */
-        if (this.listenerCount('debug'))
+        if (this.listenerCount('debug')) {
             this.emit('debug', {
                 location: 'Connection.prepare',
                 connection: this,
                 message: `[${this.processID}] prepare | ${sql}`,
                 sql,
             });
+        }
         return await this._captureErrorStack(prepared_statement_js_1.PreparedStatement.prepare(this, sql, options));
     }
     /**

package/cjs/connection/cursor.js

@@ -1,10 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cursor = void 0;
-const doublylinked_1 = __importDefault(require("doublylinked"));
+const tslib_1 = require("tslib");
+const doublylinked_1 = tslib_1.__importDefault(require("doublylinked"));
 const power_tasks_1 = require("power-tasks");
 const safe_event_emitter_js_1 = require("../safe-event-emitter.js");
 const convert_row_to_object_js_1 = require("../util/convert-row-to-object.js");

package/cjs/connection/intl-connection.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIntlConnection = exports.IntlConnection = void 0;
+exports.IntlConnection = void 0;
+exports.getIntlConnection = getIntlConnection;
 const power_tasks_1 = require("power-tasks");
 const putil_varhelpers_1 = require("putil-varhelpers");
 const constants_js_1 = require("../constants.js");
@@ -112,8 +113,9 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
                 const result = await this._execute(sql, options, cb);
                 if (commitLast)
                     await this._execute('COMMIT');
-                else if (this.inTransaction && rollbackOnError)
+                else if (this.inTransaction && rollbackOnError) {
                     await this._execute('RELEASE ' + this._onErrorSavePoint + ';');
+                }
                 return result;
             }
             catch (e) {
@@ -194,20 +196,23 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
                         current.rows = [];
                         break;
                     case protocol_js_1.Protocol.BackendMessageCode.DataRow:
-                        let row = msg.columns.map((x) => x.toString('utf8'));
-                        (0, parse_row_js_1.parseRow)(parsers, row, opts);
-                        if (opts.objectRows && current.fields)
-                            row = (0, convert_row_to_object_js_1.convertRowToObject)(current.fields, row);
-                        if (cb)
-                            cb('row', row);
-                        current.rows = current.rows || [];
-                        current.rows.push(row);
+                        {
+                            let row = msg.columns.map((x) => x.toString('utf8'));
+                            (0, parse_row_js_1.parseRow)(parsers, row, opts);
+                            if (opts.objectRows && current.fields)
+                                row = (0, convert_row_to_object_js_1.convertRowToObject)(current.fields, row);
+                            if (cb)
+                                cb('row', row);
+                            current.rows = current.rows || [];
+                            current.rows.push(row);
+                        }
                         break;
                     case protocol_js_1.Protocol.BackendMessageCode.CommandComplete:
                         // Ignore BEGIN command that we added to sql
                         current.command = msg.command;
-                        if (current.command === 'DELETE' || current.command === 'INSERT' || current.command === 'UPDATE')
+                        if (current.command === 'DELETE' || current.command === 'INSERT' || current.command === 'UPDATE') {
                             current.rowsAffected = msg.rowCount;
+                        }
                         current.executeTime = Date.now() - currentStart;
                         if (current.rows)
                             current.rowType = opts.objectRows && current.fields ? 'object' : 'array';
@@ -223,6 +228,9 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
                         // Ignore COMMIT command that we added to sql
                         result.totalCommands = result.results.length;
                         done(undefined, result);
+                        break;
+                    default:
+                        break;
                 }
             });
         }
@@ -240,4 +248,3 @@ exports.IntlConnection = IntlConnection;
 function getIntlConnection(connection) {
     return connection._intlCon;
 }
-exports.getIntlConnection = getIntlConnection;

package/cjs/connection/pool.js

@@ -28,42 +28,46 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
         const poolFactory = {
             create: async () => {
                 /* istanbul ignore next */
-                if (this.listenerCount('debug'))
+                if (this.listenerCount('debug')) {
                     this.emit('debug', {
                         location: 'Pool.factory.create',
                         pool: this,
                         message: `new connection creating`,
                     });
+                }
                 const intlCon = new intl_connection_js_1.IntlConnection(cfg);
                 await intlCon.connect();
                 intlCon.on('close', () => this._pool.destroy(intlCon));
                 /* istanbul ignore next */
-                if (this.listenerCount('debug'))
+                if (this.listenerCount('debug')) {
                     this.emit('debug', {
                         location: 'Pool.factory.create',
                         pool: this,
                         message: `[${intlCon.processID}] connection created`,
                     });
+                }
                 return intlCon;
             },
             destroy: intlCon => {
                 /* istanbul ignore next */
-                if (this.listenerCount('debug'))
+                if (this.listenerCount('debug')) {
                     this.emit('debug', {
                         location: 'Pool.factory.destroy',
                         pool: this,
                         message: `[${intlCon.processID}] connection destroy`,
                     });
+                }
                 return intlCon.close();
             },
             reset: async (intlCon) => {
                 /* istanbul ignore next */
-                if (this.listenerCount('debug'))
+                if (this.listenerCount('debug')) {
                     this.emit('debug', {
                         location: 'Pool.factory.reset',
                         pool: this,
                         message: `[${intlCon.processID}] connection reset`,
                     });
+                }
                 try {
                     if (intlCon.state === constants_js_1.ConnectionState.READY) {
                         await intlCon.execute('ROLLBACK;UNLISTEN *');
@@ -77,12 +81,13 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
             },
             validate: async (intlCon) => {
                 /* istanbul ignore next */
-                if (this.listenerCount('debug'))
+                if (this.listenerCount('debug')) {
                     this.emit('debug', {
                         location: 'Pool.factory.validate',
                         pool: this,
                         message: `[${intlCon.processID}] connection validate`,
                     });
+                }
                 if (intlCon.state !== constants_js_1.ConnectionState.READY)
                     throw new Error('Connection is not active');
                 await intlCon.execute('select 1;');
@@ -119,12 +124,13 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
     async acquire() {
         const intlCon = await this._pool.acquire();
         /* istanbul ignore next */
-        if (this.listenerCount('debug'))
+        if (this.listenerCount('debug')) {
             this.emit('debug', {
                 location: 'Pool.acquire',
                 pool: this,
                 message: `[${intlCon.processID}] acquired`,
             });
+        }
         const connection = new connection_js_1.Connection(this, intlCon);
         /* istanbul ignore next */
         if (this.listenerCount('debug'))

package/cjs/connection/prepared-statement.js

@@ -103,13 +103,15 @@ class PreparedStatement extends safe_event_emitter_js_1.SafeEventEmitter {
             const result = await intlCon.statementQueue.enqueue(() => this._execute(options)).toPromise();
             if (commitLast)
                 await intlCon.execute('COMMIT');
-            else if (intlCon.inTransaction && rollbackOnError)
+            else if (intlCon.inTransaction && rollbackOnError) {
                 await intlCon.execute('RELEASE ' + this._onErrorSavePoint + ';');
+            }
             return result;
         }
         catch (e) {
-            if (intlCon.inTransaction && rollbackOnError)
+            if (intlCon.inTransaction && rollbackOnError) {
                 await intlCon.execute('ROLLBACK TO ' + this._onErrorSavePoint + ';');
+            }
             throw e;
         }
     }
@@ -169,8 +171,9 @@ class PreparedStatement extends safe_event_emitter_js_1.SafeEventEmitter {
                     }
                 }
             }
-            if (result.command === 'DELETE' || result.command === 'INSERT' || result.command === 'UPDATE')
+            if (result.command === 'DELETE' || result.command === 'INSERT' || result.command === 'UPDATE') {
                 result.rowsAffected = executeResult.rowCount;
+            }
             result.executeTime = Date.now() - startTime;
             return result;
         }

package/cjs/data-types/bytea-type.js

@@ -1,10 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArrayByteaType = exports.ByteaType = void 0;
-const postgres_bytea_1 = __importDefault(require("postgres-bytea"));
+const tslib_1 = require("tslib");
+const postgres_bytea_1 = tslib_1.__importDefault(require("postgres-bytea"));
 const constants_js_1 = require("../constants.js");
 exports.ByteaType = {
     name: 'bytea',

package/cjs/data-types/numeric-type.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.numberBytesToString = exports.ArrayNumericType = exports.NumericType = void 0;
+exports.ArrayNumericType = exports.NumericType = void 0;
+exports.numberBytesToString = numberBytesToString;
 const constants_js_1 = require("../constants.js");
 const NUMERIC_NEG = 0x4000;
 const NUMERIC_NAN = 0xc000;
@@ -93,7 +94,6 @@ function numberBytesToString(digits, scale, weight, sign) {
     const extra = (i - scale) % DEC_DIGITS;
     return out.substr(0, out.length - extra);
 }
-exports.numberBytesToString = numberBytesToString;
 /* https://github.com/pgjdbc/pgjdbc/blob/3eca3a76aa4a04cb28cb960ed674cb67db30b5e3/pgjdbc/src/main/java/org/postgresql/util/ByteConverter.java */
 /**
  * Convert a number from binary representation to text representation.

package/cjs/data-types/time-type.js

@@ -13,8 +13,9 @@ exports.TimeType = {
         const hi = v.readInt32BE();
         const lo = v.readUInt32BE(4);
         let d = new Date((lo + hi * timeMul) / 1000);
-        if (fetchAsString || !options.utcDates)
+        if (fetchAsString || !options.utcDates) {
             d = new Date(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), d.getUTCMilliseconds());
+        }
         return fetchAsString ? dateToTimeString(d) : d;
     },
     encodeBinary(buf, v, options) {

package/cjs/data-types/timestamp-type.js

@@ -19,8 +19,9 @@ exports.TimestampType = {
             return fetchAsString ? '-infinity' : -Infinity;
         // Shift from 2000 to 1970
         let d = new Date((lo + hi * timeMul) / 1000 + timeShift);
-        if (fetchAsString || !options.utcDates)
+        if (fetchAsString || !options.utcDates) {
             d = new Date(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(), d.getUTCMilliseconds());
+        }
         return fetchAsString ? dateToTimestampString(d) : d;
     },
     encodeBinary(buf, v, options) {

package/cjs/data-types/timestamptz-type.js

@@ -19,8 +19,9 @@ exports.TimestamptzType = {
             return fetchAsString ? '-infinity' : -Infinity;
         // Shift from 2000 to 1970
         let d = new Date((lo + hi * timeMul) / 1000 + timeShift);
-        if (fetchAsString || !options.utcDates)
+        if (fetchAsString || !options.utcDates) {
             d = new Date(d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds(), d.getMilliseconds());
+        }
         return fetchAsString ? dateToTimestamptzString(d) : d;
     },
     encodeBinary(buf, v, options) {

package/cjs/index.js

@@ -1,41 +1,28 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./constants.js"), exports);
-__exportStar(require("./data-type-map.js"), exports);
-__exportStar(require("./types.js"), exports);
-__exportStar(require("./connection/bind-param.js"), exports);
-__exportStar(require("./connection/connection.js"), exports);
-__exportStar(require("./connection/cursor.js"), exports);
-__exportStar(require("./connection/pool.js"), exports);
-__exportStar(require("./connection/prepared-statement.js"), exports);
-__exportStar(require("./interfaces/command-result.js"), exports);
-__exportStar(require("./interfaces/data-mapping-options.js"), exports);
-__exportStar(require("./interfaces/data-type.js"), exports);
-__exportStar(require("./interfaces/database-connection-params.js"), exports);
-__exportStar(require("./interfaces/field-info.js"), exports);
-__exportStar(require("./interfaces/query-options.js"), exports);
-__exportStar(require("./interfaces/query-result.js"), exports);
-__exportStar(require("./interfaces/script-execute-options.js"), exports);
-__exportStar(require("./interfaces/script-result.js"), exports);
-__exportStar(require("./interfaces/statement-prepare-options.js"), exports);
-__exportStar(require("./util/connection-config.js"), exports);
-__exportStar(require("./util/escape-literal.js"), exports);
-__exportStar(require("./util/parse-datetime.js"), exports);
-__exportStar(require("./util/stringify-arrayliteral.js"), exports);
-__exportStar(require("./util/stringify-for-sql.js"), exports);
-__exportStar(require("./protocol/smart-buffer.js"), exports);
-__exportStar(require("./protocol/database-error.js"), exports);
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./connection/bind-param.js"), exports);
+tslib_1.__exportStar(require("./connection/connection.js"), exports);
+tslib_1.__exportStar(require("./connection/cursor.js"), exports);
+tslib_1.__exportStar(require("./connection/pool.js"), exports);
+tslib_1.__exportStar(require("./connection/prepared-statement.js"), exports);
+tslib_1.__exportStar(require("./constants.js"), exports);
+tslib_1.__exportStar(require("./data-type-map.js"), exports);
+tslib_1.__exportStar(require("./interfaces/command-result.js"), exports);
+tslib_1.__exportStar(require("./interfaces/data-mapping-options.js"), exports);
+tslib_1.__exportStar(require("./interfaces/data-type.js"), exports);
+tslib_1.__exportStar(require("./interfaces/database-connection-params.js"), exports);
+tslib_1.__exportStar(require("./interfaces/field-info.js"), exports);
+tslib_1.__exportStar(require("./interfaces/query-options.js"), exports);
+tslib_1.__exportStar(require("./interfaces/query-result.js"), exports);
+tslib_1.__exportStar(require("./interfaces/script-execute-options.js"), exports);
+tslib_1.__exportStar(require("./interfaces/script-result.js"), exports);
+tslib_1.__exportStar(require("./interfaces/statement-prepare-options.js"), exports);
+tslib_1.__exportStar(require("./protocol/database-error.js"), exports);
+tslib_1.__exportStar(require("./protocol/smart-buffer.js"), exports);
+tslib_1.__exportStar(require("./types.js"), exports);
+tslib_1.__exportStar(require("./util/connection-config.js"), exports);
+tslib_1.__exportStar(require("./util/escape-literal.js"), exports);
+tslib_1.__exportStar(require("./util/parse-datetime.js"), exports);
+tslib_1.__exportStar(require("./util/stringify-arrayliteral.js"), exports);
+tslib_1.__exportStar(require("./util/stringify-for-sql.js"), exports);

package/cjs/protocol/frontend.js

@@ -161,8 +161,9 @@ class Frontend {
         return setLengthAndFlush(io, 1);
     }
     getDescribeMessage(args) {
-        if (args.name && args.name.length > 63)
-            throw new Error(args.type === 'P' ? 'Portal' : 'Statement' + 'name length must be lower than 63');
+        if (args.name && args.name.length > 63) {
+            throw new Error(args.type === 'P' ? 'Portal' : 'Statement name length must be lower than 63');
+        }
         const io = this._io
             .start()
             .writeInt8(protocol_js_1.Protocol.FrontendMessageCode.Describe)
@@ -172,8 +173,9 @@ class Frontend {
         return setLengthAndFlush(io, 1);
     }
     getExecuteMessage(args) {
-        if (args.fetchCount && (args.fetchCount < 0 || args.fetchCount > 4294967295))
+        if (args.fetchCount && (args.fetchCount < 0 || args.fetchCount > 4294967295)) {
             throw new Error('fetchCount can be between 0 and 4294967295');
+        }
         const io = this._io
             .start()
             .writeInt8(protocol_js_1.Protocol.FrontendMessageCode.Execute)
@@ -183,8 +185,9 @@ class Frontend {
         return setLengthAndFlush(io, 1);
     }
     getCloseMessage(args) {
-        if (args.name && args.name.length > 63)
-            throw new Error(args.type === 'P' ? 'Portal' : 'Statement' + 'name length must be lower than 63');
+        if (args.name && args.name.length > 63) {
+            throw new Error(args.type === 'P' ? 'Portal' : 'Statement name length must be lower than 63');
+        }
         const io = this._io
             .start()
             .writeInt8(protocol_js_1.Protocol.FrontendMessageCode.Close)

package/cjs/protocol/pg-socket.js

@@ -1,13 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgSocket = void 0;
-const crypto_1 = __importDefault(require("crypto"));
-const net_1 = __importDefault(require("net"));
-const putil_promisify_1 = __importDefault(require("putil-promisify"));
-const tls_1 = __importDefault(require("tls"));
+const tslib_1 = require("tslib");
+const crypto_1 = tslib_1.__importDefault(require("crypto"));
+const net_1 = tslib_1.__importDefault(require("net"));
+const putil_promisify_1 = tslib_1.__importDefault(require("putil-promisify"));
+const tls_1 = tslib_1.__importDefault(require("tls"));
 const constants_js_1 = require("../constants.js");
 const safe_event_emitter_js_1 = require("../safe-event-emitter.js");
 const backend_js_1 = require("./backend.js");
@@ -59,30 +57,31 @@ class PgSocket extends safe_event_emitter_js_1.SafeEventEmitter {
             socket.setTimeout(0);
             if (this.options.keepAlive || this.options.keepAlive == null)
                 socket.setKeepAlive(true);
-            if (options.ssl) {
-                socket.write(this._frontend.getSSLRequestMessage());
-                socket.once('data', x => {
-                    this._removeListeners();
-                    if (x.toString() === 'S') {
-                        const tslOptions = { ...options.ssl, socket };
-                        if (options.host && net_1.default.isIP(options.host) === 0)
-                            tslOptions.servername = options.host;
-                        const tlsSocket = (this._socket = tls_1.default.connect(tslOptions));
-                        tlsSocket.once('error', errorHandler);
-                        tlsSocket.once('secureConnect', () => {
-                            this._removeListeners();
-                            this._handleConnect();
-                        });
-                        return;
-                    }
-                    if (x.toString() === 'N')
+            socket.write(this._frontend.getSSLRequestMessage());
+            socket.once('data', x => {
+                this._removeListeners();
+                if (x.toString() === 'S') {
+                    const tslOptions = { ...options.ssl, socket };
+                    if (options.host && net_1.default.isIP(options.host) === 0)
+                        tslOptions.servername = options.host;
+                    const tlsSocket = (this._socket = tls_1.default.connect(tslOptions));
+                    tlsSocket.once('error', errorHandler);
+                    tlsSocket.once('secureConnect', () => {
+                        this._removeListeners();
+                        this._handleConnect();
+                    });
+                    return;
+                }
+                if (x.toString() === 'N') {
+                    if (options.requireSSL) {
                         return errorHandler(new Error('Server does not support SSL connections'));
-                    return errorHandler(new Error('There was an error establishing an SSL connection'));
-                });
-            }
-            else {
-                this._handleConnect();
-            }
+                    }
+                    this._removeListeners();
+                    this._handleConnect();
+                    return;
+                }
+                return errorHandler(new Error('There was an error establishing an SSL connection'));
+            });
         };
         socket.setNoDelay(true);
         socket.setTimeout(options.connectTimeoutMs || 30000, () => errorHandler(new Error('Connection timed out')));
@@ -289,8 +288,9 @@ class PgSocket extends safe_event_emitter_js_1.SafeEventEmitter {
                 });
                 break;
             case protocol_js_1.Protocol.AuthenticationMessageKind.SASL: {
-                if (!msg.mechanisms.includes('SCRAM-SHA-256'))
+                if (!msg.mechanisms.includes('SCRAM-SHA-256')) {
                     throw new Error('SASL: Only mechanism SCRAM-SHA-256 is currently supported');
+                }
                 const saslSession = (this._saslSession = sasl_js_1.SASL.createSession(this.options.user || '', 'SCRAM-SHA-256'));
                 this._send(this._frontend.getSASLMessage(saslSession));
                 break;
@@ -314,6 +314,8 @@ class PgSocket extends safe_event_emitter_js_1.SafeEventEmitter {
                 this._saslSession = undefined;
                 break;
             }
+            default:
+                break;
         }
     }
     _handleParameterStatus(msg) {