first fixes

Author: nirdshabo1988

package.json

@@ -3,7 +3,7 @@
   "description": "node postgres monorepo",
   "main": "index.js",
   "private": true,
-  "repository": "[email protected]:brianc/node-postgres.git",
+  "repository": "[email protected]:MedFlyt/node-postgres.git",
   "author": "Brian M. Carlson <[email protected]>",
   "license": "MIT",
   "workspaces": [
@@ -18,6 +18,7 @@
     "lint": "eslint '*/**/*.{js,ts,tsx}'"
   },
   "devDependencies": {
+    "@types/node": "^17.0.36",
     "@typescript-eslint/eslint-plugin": "^4.4.0",
     "@typescript-eslint/parser": "^4.4.0",
     "eslint": "^7.11.0",

packages/pg-pool/test/idle-timeout-exit.js

@@ -3,7 +3,11 @@ if (module === require.main) {
   const allowExitOnIdle = process.env.ALLOW_EXIT_ON_IDLE === '1'
   const Pool = require('../index')
 
-  const pool = new Pool({ maxLifetimeSeconds: 2, idleTimeoutMillis: 200, ...(allowExitOnIdle ? { allowExitOnIdle: true } : {}) })
+  const pool = new Pool({
+    maxLifetimeSeconds: 2,
+    idleTimeoutMillis: 200,
+    ...(allowExitOnIdle ? { allowExitOnIdle: true } : {}),
+  })
   pool.query('SELECT NOW()', (err, res) => console.log('completed first'))
   pool.on('remove', () => {
     console.log('removed')

packages/pg/lib/client.js

@@ -190,6 +190,8 @@ class Client extends EventEmitter {
     con.on('rowDescription', this._handleRowDescription.bind(this))
     con.on('dataRow', this._handleDataRow.bind(this))
     con.on('portalSuspended', this._handlePortalSuspended.bind(this))
+    // delegate paramDescription to active query
+    con.on('paramDescription', this.activeQuery.handleParamDescription(this, con))
     con.on('emptyQuery', this._handleEmptyQuery.bind(this))
     con.on('commandComplete', this._handleCommandComplete.bind(this))
     con.on('parseComplete', this._handleParseComplete.bind(this))

packages/pg/lib/query.js

@@ -17,6 +17,7 @@ class Query extends EventEmitter {
     this.types = config.types
     this.name = config.name
     this.binary = config.binary
+    this.describe = config.describe
     // use unique portal name each time
     this.portal = config.portal || ''
     this.callback = config.callback
@@ -38,6 +39,10 @@ class Query extends EventEmitter {
     if (this.name) {
       return true
     }
+    // always prepare if describing a query
+    if (this.describe) {
+      return true
+    }
     // always prepare if there are max number of rows expected per
     // portal execution
     if (this.rows) {
@@ -159,6 +164,10 @@ class Query extends EventEmitter {
     return null
   }
 
+  handleParamDescription(msg, con) {
+    this._result.addParams(msg.params)
+    con.sync()
+  }
   hasBeenParsed(connection) {
     return this.name && connection.parsedStatements[this.name]
   }
@@ -197,6 +206,15 @@ class Query extends EventEmitter {
       })
     }
 
+    if (this.describe) {
+      // if describe is set, the query is not executed
+      connection.describe({
+        type: 'S',
+        name: this.name,
+      })
+      connection.flush()
+      return
+    }
     // because we're mapping user supplied values to
     // postgres wire protocol compatible values it could
     // throw an exception, so try/catch this section

packages/pg/lib/result.js

@@ -14,6 +14,7 @@ class Result {
     this.oid = null
     this.rows = []
     this.fields = []
+    this.params = []
     this._parsers = undefined
     this._types = types
     this.RowCtor = null
@@ -95,6 +96,15 @@ class Result {
       }
     }
   }
-}
 
+  addParams(paramDescription) {
+    if (this.params.length) {
+      this.params = []
+    }
+    for (var i = 0; i < paramDescriptions.length; i++) {
+      var desc = paramDescriptions[i]
+      this.params.push(desc)
+    }
+  }
+}
 module.exports = Result

packages/pg/test/integration/client/prepared-statement-tests.js

@@ -186,3 +186,32 @@ var suite = new helper.Suite()
 
   suite.test('cleanup', () => client.end())
 })()
+;(function () {
+  var client = helper.client()
+  client.on('drain', client.end.bind(client))
+
+  suite.test('describe', function (done) {
+    client.query(
+      new Query(
+        {
+          text: 'SELECT id, name, age FROM person WHERE age > $1',
+          describe: true,
+        },
+        (res) => {
+          assert.deepEqual(res.params, [23])
+          assert.deepEqual(
+            res.fields.map((field) => ({ name: field.name, type: field.dataTypeID })),
+            [
+              { name: 'id', type: 23 },
+              { name: 'name', type: 1043 },
+              { name: 'age', type: 23 },
+            ]
+          )
+          done()
+        }
+      )
+    )
+  })
+
+  suite.test('cleanup', () => client.end())
+})()

packages/pg/test/unit/client/prepared-statement-tests.js

@@ -155,3 +155,55 @@ test('prepared statement with explicit portal', function () {
     })
   })
 })
+var describeClient = helper.client()
+var describeCon = describeClient.connection
+describeCon.parse = function (arg) {
+  process.nextTick(function () {
+    describeCon.emit('parseComplete')
+  })
+}
+var describeDescribeArg = null
+describeCon.describe = function (arg) {
+  describeDescribeArg = arg
+}
+
+var describeFlushCalled = false
+describeCon.flush = function () {
+  describeFlushCalled = true
+  process.nextTick(function () {
+    describeCon.emit('paramDescription', { params: [] })
+    describeCon.emit('rowDescription', { fields: [] })
+  })
+}
+
+var describeSyncCalled = false
+describeCon.sync = function () {
+  process.nextTick(function () {
+    describeSyncCalled = true
+    describeCon.emit('readyForQuery')
+  })
+}
+
+test('describe prepared statement', function () {
+  assert.ok(describeClient.connection.emit('readyForQuery'))
+
+  var query = describeClient.query(
+    new Query({
+      text: 'select * from X where name = $1',
+      describe: true,
+    })
+  )
+
+  assert.emits(query, 'end', function () {
+    test('describe argument', function () {
+      assert.equal(describeDescribeArg.type, 'S')
+      assert.equal(describeDescribeArg.name, undefined)
+    })
+    test('flush called', function () {
+      assert.ok(describeFlushCalled)
+    })
+    test('sync called', function () {
+      assert.ok(describeSyncCalled)
+    })
+  })
+})

packages/pg/test/unit/client/result-metadata-tests.js

@@ -32,11 +32,14 @@ var check = function (oid, rowCount, command) {
     assert.equal(result.command, command)
   }
 }
-
-testForTag('INSERT 0 3', check(0, 3, 'INSERT'))
-testForTag('INSERT 841 1', check(841, 1, 'INSERT'))
-testForTag('DELETE 10', check(null, 10, 'DELETE'))
-testForTag('UPDATE 11', check(null, 11, 'UPDATE'))
-testForTag('SELECT 20', check(null, 20, 'SELECT'))
-testForTag('COPY', check(null, null, 'COPY'))
-testForTag('COPY 12345', check(null, 12345, 'COPY'))
+try {
+  testForTag('INSERT 0 3', check(0, 3, 'INSERT'))
+  testForTag('INSERT 841 1', check(841, 1, 'INSERT'))
+  testForTag('DELETE 10', check(null, 10, 'DELETE'))
+  testForTag('UPDATE 11', check(null, 11, 'UPDATE'))
+  testForTag('SELECT 20', check(null, 20, 'SELECT'))
+  testForTag('COPY', check(null, null, 'COPY'))
+  testForTag('COPY 12345', check(null, 12345, 'COPY'))
+} catch (error) {
+  console.log(error)
+}