Changes for websockets and cursors

package.json

@@ -24,7 +24,7 @@
     "eslint-config-prettier": "^6.12.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
-    "lerna": "^3.19.0",
+    "lerna": "^4.0.0",
     "prettier": "2.1.2",
     "typescript": "^4.0.3"
   },

packages/pg-connection-string/package.json

@@ -30,7 +30,7 @@
     "chai": "^4.1.1",
     "coveralls": "^3.0.4",
     "istanbul": "^0.4.5",
-    "mocha": "^7.1.2"
+    "mocha": "^9.2.0"
   },
   "files": [
     "index.js",

packages/pg-cursor/index.js

@@ -23,6 +23,7 @@ class Cursor extends EventEmitter {
     this._portal = null
     this._ifNoData = this._ifNoData.bind(this)
     this._rowDescription = this._rowDescription.bind(this)
+    this.moveAllAndClosing = false
   }
 
   _ifNoData() {
@@ -42,7 +43,8 @@ class Cursor extends EventEmitter {
   submit(connection) {
     this.state = 'submitted'
     this.connection = connection
-    this._portal = 'C_' + nextUniqueID++
+    // the portal name must start with a lowercase c, for some reason
+    this._portal = 'c_' + nextUniqueID++
 
     const con = connection
 
@@ -86,6 +88,8 @@ class Cursor extends EventEmitter {
   }
 
   _closePortal() {
+    if (this.state === 'done') return
+
     // because we opened a named portal to stream results
     // we need to close the same named portal.  Leaving a named portal
     // open can lock tables for modification if inside a transaction.
@@ -97,6 +101,8 @@ class Cursor extends EventEmitter {
     if (this.state !== 'error') {
       this.connection.sync()
     }
+
+    this.state = 'done'
   }
 
   handleRowDescription(msg) {
@@ -129,7 +135,9 @@ class Cursor extends EventEmitter {
 
   handleCommandComplete(msg) {
     this._result.addCommandComplete(msg)
-    this._closePortal()
+    if (!this.moveAllAndClosing) {
+      this._closePortal()
+    }
   }
 
   handlePortalSuspended() {
@@ -198,6 +206,49 @@ class Cursor extends EventEmitter {
     this.connection.end()
   }
 
+  _promisifiedQuery(text) {
+    return new Promise((resolve, reject) => {
+      try {
+        var res = this.connection.query(text)
+        resolve(res)
+      } catch (e) {
+        reject(e)
+      }
+    })
+  }
+
+  moveAllAndClose(cb) {
+    this.moveAllAndClosing = true
+    if (this.state === 'done' || this.state == 'error') {
+      return this.close(cb)
+    }
+    return this._promisifiedQuery("MOVE ALL FROM " + this._portal).then(() => {
+      this._close_checkFinished(cb)
+    })
+  }
+
+  _close_checkFinished(cb) {
+    this._closePortal()
+    // try to delay the callback until portal is finished closing
+    // (this means a closeComplete followed by a readyForQuery)
+    // (it's possible to have a readyForQuery without a closeComplete if called from moveAllAndClose)
+    var finishedClosing = false
+    this.connection.once('closeComplete', function () {
+      finishedClosing = true
+    })
+
+    const _handleReadyForQueryInClose = () => {
+      if (finishedClosing) {
+        cb()
+        this.moveAllAndClosing = false
+        this.connection.removeListener('readyForQuery', _handleReadyForQueryInClose)
+      } 
+    }
+
+    this.connection.on('readyForQuery', _handleReadyForQueryInClose)
+    return
+  }
+
   close(cb) {
     let promise
 
@@ -213,7 +264,6 @@ class Cursor extends EventEmitter {
     }
 
     this._closePortal()
-    this.state = 'done'
     this.connection.once('readyForQuery', function () {
       cb()
     })

packages/pg-cursor/package.json

@@ -17,7 +17,7 @@
   "author": "Brian M. Carlson",
   "license": "MIT",
   "devDependencies": {
-    "mocha": "^7.1.2",
+    "mocha": "^9.2.0",
     "pg": "^8.7.1"
   },
   "peerDependencies": {

packages/pg-pool/index.js

@@ -85,7 +85,7 @@ class Pool extends EventEmitter {
     this.options.maxUses = this.options.maxUses || Infinity
     this.options.allowExitOnIdle = this.options.allowExitOnIdle || false
     this.log = this.options.log || function () {}
-    this.Client = this.options.Client || Client || require('pg').Client
+    this.Client = this.options.Client || Client || require('../pg/lib/index.js').Client
     this.Promise = this.options.Promise || global.Promise
 
     if (typeof this.options.idleTimeoutMillis === 'undefined') {

packages/pg-pool/package.json

@@ -31,7 +31,7 @@
     "co": "4.6.0",
     "expect.js": "0.3.1",
     "lodash": "^4.17.11",
-    "mocha": "^7.1.2",
+    "mocha": "^9.2.0",
     "pg-cursor": "^1.3.0"
   },
   "peerDependencies": {

packages/pg-protocol/package.json

@@ -11,7 +11,7 @@
     "@types/node": "^12.12.21",
     "chai": "^4.2.0",
     "chunky": "^0.0.0",
-    "mocha": "^7.1.2",
+    "mocha": "^9.2.0",
     "ts-node": "^8.5.4",
     "typescript": "^4.0.3"
   },

packages/pg-query-stream/package.json

@@ -33,10 +33,10 @@
     "@types/mocha": "^8.0.3",
     "@types/node": "^14.0.0",
     "@types/pg": "^7.14.5",
-    "JSONStream": "~0.7.1",
     "concat-stream": "~1.0.1",
     "eslint-plugin-promise": "^3.5.0",
-    "mocha": "^7.1.2",
+    "JSONStream": "~0.7.1",
+    "mocha": "^9.2.0",
     "pg": "^8.7.1",
     "stream-spec": "~0.3.5",
     "stream-tester": "0.0.5",

packages/pg/Makefile

@@ -33,6 +33,9 @@ test-connection:
 	@echo "***Testing connection***"
 	@node script/create-test-tables.js $(params)
 
+test-unit-connection: test-connection
+	@find test/unit/connection -name "*-tests.js" | $(node-command)
+
 test-missing-native:
 	@echo "***Testing optional native install***"
 	@rm -rf node_modules/pg-native
@@ -53,6 +56,26 @@ test-integration: test-connection
 	@echo "***Testing Pure Javascript***"
 	@find test/integration -name "*-tests.js" | $(node-command)
 
+test-integration-client: test-connection
+	@echo "***Testing integration for client***"
+	@find test/integration/client -name "*-tests.js" | $(node-command)
+
+test-integration-connection: test-connection
+	@echo "***Testing integration for connection***"
+	@find test/integration/connection -name "*-tests.js" | $(node-command)
+
+test-integration-connection-pool: test-connection
+	@echo "***Testing integration for connection***"
+	@find test/integration/connection-pool -name "*-tests.js" | $(node-command)
+
+test-gh-issues: test-connection
+	@echo "***Testing gh-issues***"
+	@find test/integration/gh-issues -name "*-tests.js" | $(node-command)
+
+test-unit-client: test-connection
+	@echo "***Testing integration for client***"
+	@find test/unit/client -name "*-tests.js" | $(node-command)
+
 test-binary: test-connection
 	@echo "***Testing Pure Javascript (binary)***"
 	@find test/integration -name "*-tests.js" | $(node-command) binary