.travis.yml

@@ -1,50 +1,47 @@
 language: node_js
-sudo: true
-dist: trusty
+dist: bionic
 
 before_script:
-  - node script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres
-
-before_install:
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then
-      if [[ $(node -v) =~ v[1-9][0-9] ]]; then
-        source ./ci_scripts/build.sh;
-      fi
-    fi
-
+  - node packages/pg/script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres
+
 env:
   - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres
 
+node_js:
+  - lts/dubnium
+  - lts/erbium
+  - 13
+
+addons:
+  postgresql: "10"
+
 matrix:
   include:
-    - node_js: "lts/boron"
-      addons:
-        postgresql: "9.6"
-    - node_js: "lts/argon"
-      addons:
-        postgresql: "9.6"
-    - node_js: "10"
-      addons:
-        postgresql: "9.6"
-    - node_js: "12"
+    - node_js: lts/carbon
       addons:
-        postgresql: "9.6"
-    - node_js: "lts/carbon"
-      addons:
-        postgresql: "9.1"
+        postgresql: "9.5"
       dist: precise
-    - node_js: "lts/carbon"
-      addons:
-        postgresql: "9.2"
-    - node_js: "lts/carbon"
+
+    # different PostgreSQL versions on Node LTS
+    - node_js: lts/erbium
       addons:
         postgresql: "9.3"
-    - node_js: "lts/carbon"
+    - node_js: lts/erbium
       addons:
         postgresql: "9.4"
-    - node_js: "lts/carbon"
+    - node_js: lts/erbium
       addons:
         postgresql: "9.5"
-    - node_js: "lts/carbon"
+    - node_js: lts/erbium
       addons:
         postgresql: "9.6"
+
+    # PostgreSQL 9.1 and 9.2 only work on precise
+    - node_js: lts/carbon
+      addons:
+        postgresql: "9.1"
+      dist: precise
+    - node_js: lts/carbon
+      addons:
+        postgresql: "9.2"
+      dist: precise

CHANGELOG.md

@@ -4,6 +4,11 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### 7.15.0
+
+- Change repository structure to support lerna & future monorepo [development](https://github.com/brianc/node-postgres/pull/2014).
+- [Warn about deprecation](https://github.com/brianc/node-postgres/pull/2021) for calling constructors without `new`.
+
 ### 7.14.0
 
 - Reverts 7.13.0 as it contained [an accidental breaking change](https://github.com/brianc/node-postgres/pull/2010) for self-signed SSL cert verification. 7.14.0 is identical to 7.12.1.

lerna.json

@@ -0,0 +1,8 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "npmClient": "yarn",
+  "useWorkspaces": true,
+  "version": "independent"
+}

package.json

@@ -1,54 +1,18 @@
 {
-  "name": "pg",
-  "version": "7.14.0",
-  "description": "PostgreSQL client - pure javascript & libpq with the same API",
-  "keywords": [
-    "database",
-    "libpq",
-    "pg",
-    "postgre",
-    "postgres",
-    "postgresql",
-    "rdbms"
+  "name": "node-postgres",
+  "description": "node postgres monorepo",
+  "main": "index.js",
+  "private": true,
+  "repository": "git@github.com:brianc/node-postgres.git",
+  "author": "Brian M. Carlson <brian.m.carlson@gmail.com>",
+  "license": "MIT",
+  "workspaces": [
+    "packages/*"
   ],
-  "homepage": "http://github.com/brianc/node-postgres",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/brianc/node-postgres.git"
-  },
-  "author": "Brian Carlson <brian.m.carlson@gmail.com>",
-  "main": "./lib",
-  "dependencies": {
-    "buffer-writer": "2.0.0",
-    "packet-reader": "1.0.0",
-    "pg-connection-string": "0.1.3",
-    "pg-pool": "^2.0.7",
-    "pg-types": "^2.1.0",
-    "pgpass": "1.x",
-    "semver": "4.3.2"
-  },
-  "devDependencies": {
-    "async": "0.9.0",
-    "bluebird": "3.5.2",
-    "co": "4.6.0",
-    "eslint": "^6.0.1",
-    "eslint-config-standard": "^13.0.1",
-    "eslint-plugin-import": "^2.18.1",
-    "eslint-plugin-node": "^9.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.0",
-    "pg-copy-streams": "0.3.0"
-  },
-  "minNativeVersion": "2.0.0",
   "scripts": {
-    "test": "make test-all"
+    "test": "yarn lerna exec --parallel yarn test"
   },
-  "files": [
-    "lib",
-    "SPONSORS.md"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">= 4.5.0"
+  "devDependencies": {
+    "lerna": "^3.19.0"
   }
 }

lib/client.js → packages/pg/lib/client.js

@@ -251,6 +251,7 @@ Client.prototype._connect = function (callback) {
       ? new Error('Connection terminated')
       : new Error('Connection terminated unexpectedly')
 
+    clearTimeout(connectionTimeoutHandle)
     this._errorAllQueries(error)
 
     if (!this._ending) {

packages/pg/lib/compat/check-constructor.js

@@ -0,0 +1,22 @@
+'use strict'
+
+const warnDeprecation = require('./warn-deprecation')
+
+// Node 4 doesn’t support new.target.
+let hasNewTarget
+
+try {
+  // eslint-disable-next-line no-eval
+  eval('(function () { new.target })')
+  hasNewTarget = true
+} catch (error) {
+  hasNewTarget = false
+}
+
+const checkConstructor = (name, code, getNewTarget) => {
+  if (hasNewTarget && getNewTarget() === undefined) {
+    warnDeprecation(`Constructing a ${name} without new is deprecated and will stop working in pg 8.`, code)
+  }
+}
+
+module.exports = checkConstructor

packages/pg/lib/compat/warn-deprecation.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const util = require('util')
+
+const dummyFunctions = new Map()
+
+// Node 4 doesn’t support process.emitWarning(message, 'DeprecationWarning', code).
+const emitDeprecationWarning = (message, code) => {
+  let dummy = dummyFunctions.get(code)
+
+  if (dummy === undefined) {
+    dummy = util.deprecate(() => {}, message)
+    dummyFunctions.set(code, dummy)
+  }
+
+  dummy()
+}
+
+module.exports = emitDeprecationWarning

lib/connection.js → packages/pg/lib/connection.js

@@ -594,27 +594,19 @@ Connection.prototype._readValue = function (buffer) {
 // parses error
 Connection.prototype.parseE = function (buffer, length) {
   var fields = {}
-  var msg, item
-  var input = new Message('error', length)
   var fieldType = this.readString(buffer, 1)
   while (fieldType !== '\0') {
     fields[fieldType] = this.parseCString(buffer)
     fieldType = this.readString(buffer, 1)
   }
-  if (input.name === 'error') {
-    // the msg is an Error instance
-    msg = new Error(fields.M)
-    for (item in input) {
-      // copy input properties to the error
-      if (Object.prototype.hasOwnProperty.call(input, item)) {
-        msg[item] = input[item]
-      }
-    }
-  } else {
-    // the msg is an object literal
-    msg = input
-    msg.message = fields.M
-  }
+
+  // the msg is an Error instance
+  var msg = new Error(fields.M)
+
+  // for compatibility with Message
+  msg.name = 'error'
+  msg.length = length
+
   msg.severity = fields.S
   msg.code = fields.C
   msg.detail = fields.D

lib/index.js → packages/pg/lib/index.js

@@ -12,9 +12,13 @@ var Client = require('./client')
 var defaults = require('./defaults')
 var Connection = require('./connection')
 var Pool = require('pg-pool')
+const checkConstructor = require('./compat/check-constructor')
 
 const poolFactory = (Client) => {
   var BoundPool = function (options) {
+    // eslint-disable-next-line no-eval
+    checkConstructor('pg.Pool', 'PG-POOL-NEW', () => eval('new.target'))
+
     var config = Object.assign({ Client: Client }, options)
     return new Pool(config)
   }

lib/query.js → packages/pg/lib/query.js

@@ -9,12 +9,15 @@
 
 var EventEmitter = require('events').EventEmitter
 var util = require('util')
+const checkConstructor = require('./compat/check-constructor')
 
 var Result = require('./result')
 var utils = require('./utils')
 
 var Query = function (config, values, callback) {
-  // use of "new" optional
+  // use of "new" optional in pg 7
+  // eslint-disable-next-line no-eval
+  checkConstructor('Query', 'PG-QUERY-NEW', () => eval('new.target'))
   if (!(this instanceof Query)) { return new Query(config, values, callback) }
 
   config = utils.normalizeQueryConfig(config, values, callback)