Merge remote-tracking branch 'upstream/master' into fix-startup-error

porsager · Nov 18, 2024 · 39aa033 · 39aa033
2 parents 4e583e8 + a2c7de1
commit 39aa033
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['12', '14', '16', '18', '20', '21']
-        postgres: ['12', '13', '14', '15', '16']
+        node: ['12', '14', '16', '18', '20', '21', '22']
+        postgres: ['12', '13', '14', '15', '16', '17']
     runs-on: ubuntu-latest
     services:
       postgres:

diff --git a/README.md b/README.md
@@ -537,7 +537,7 @@ for await (const chunk of readableStream) {
 }
 ```
 
-> **NOTE** This is a low-level API which does not provide any type safety. To make this work, you must match your [`copy query` parameters](https://www.postgresql.org/docs/14/sql-copy.html) correctly to your [Node.js stream read or write](https://nodejs.org/api/stream.html) code. Ensure [Node.js stream backpressure](https://nodejs.org/en/docs/guides/backpressuring-in-streams/) is handled correctly to avoid memory exhaustion.
+> **NOTE** This is a low-level API which does not provide any type safety. To make this work, you must match your [`copy query` parameters](https://www.postgresql.org/docs/14/sql-copy.html) correctly to your [Node.js stream read or write](https://nodejs.org/api/stream.html) code. Ensure [Node.js stream backpressure](https://nodejs.org/en/learn/modules/backpressuring-in-streams) is handled correctly to avoid memory exhaustion.
 
 ### Canceling Queries in Progress
 
@@ -1125,15 +1125,16 @@ It is also possible to connect to the database without a connection string or an
 const sql = postgres()
 ```
 
-| Option            | Environment Variables    |
-| ----------------- | ------------------------ |
-| `host`            | `PGHOST`                 |
-| `port`            | `PGPORT`                 |
-| `database`        | `PGDATABASE`             |
-| `username`        | `PGUSERNAME` or `PGUSER` |
-| `password`        | `PGPASSWORD`             |
-| `idle_timeout`    | `PGIDLE_TIMEOUT`         |
-| `connect_timeout` | `PGCONNECT_TIMEOUT`      |
+| Option             | Environment Variables    |
+| ------------------ | ------------------------ |
+| `host`             | `PGHOST`                 |
+| `port`             | `PGPORT`                 |
+| `database`         | `PGDATABASE`             |
+| `username`         | `PGUSERNAME` or `PGUSER` |
+| `password`         | `PGPASSWORD`             |
+| `application_name` | `PGAPPNAME`              |
+| `idle_timeout`     | `PGIDLE_TIMEOUT`         |
+| `connect_timeout`  | `PGCONNECT_TIMEOUT`      |
 
 ### Prepared statements
 

diff --git a/cf/src/connection.js b/cf/src/connection.js
@@ -387,7 +387,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   }
 
   function queryError(query, err) {
-    Object.defineProperties(err, {
+    'query' in err || 'parameters' in err || Object.defineProperties(err, {
       stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
       query: { value: query.string, enumerable: options.debug },
       parameters: { value: query.parameters, enumerable: options.debug },

diff --git a/cjs/src/connection.js b/cjs/src/connection.js
@@ -385,7 +385,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   }
 
   function queryError(query, err) {
-    'parameters' in err || Object.defineProperties(err, {
+    'query' in err || 'parameters' in err || Object.defineProperties(err, {
       stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
       query: { value: query.string, enumerable: options.debug },
       parameters: { value: query.parameters, enumerable: options.debug },

diff --git a/deno/README.md b/deno/README.md
@@ -533,7 +533,7 @@ for await (const chunk of readableStream) {
 }
 ```
 
-> **NOTE** This is a low-level API which does not provide any type safety. To make this work, you must match your [`copy query` parameters](https://www.postgresql.org/docs/14/sql-copy.html) correctly to your [Node.js stream read or write](https://nodejs.org/api/stream.html) code. Ensure [Node.js stream backpressure](https://nodejs.org/en/docs/guides/backpressuring-in-streams/) is handled correctly to avoid memory exhaustion.
+> **NOTE** This is a low-level API which does not provide any type safety. To make this work, you must match your [`copy query` parameters](https://www.postgresql.org/docs/14/sql-copy.html) correctly to your [Node.js stream read or write](https://nodejs.org/api/stream.html) code. Ensure [Node.js stream backpressure](https://nodejs.org/en/learn/modules/backpressuring-in-streams) is handled correctly to avoid memory exhaustion.
 
 ### Canceling Queries in Progress
 

diff --git a/deno/src/connection.js b/deno/src/connection.js
@@ -388,7 +388,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   }
 
   function queryError(query, err) {
-    Object.defineProperties(err, {
+    'query' in err || 'parameters' in err || Object.defineProperties(err, {
       stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
       query: { value: query.string, enumerable: options.debug },
       parameters: { value: query.parameters, enumerable: options.debug },

diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -2583,4 +2583,4 @@ t('arrays in reserved connection', async() => {
   ]
 })
 
-;window.addEventListener("unload", () => Deno.exit(process.exitCode))
+;globalThis.addEventListener("unload", () => Deno.exit(process.exitCode))
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postgres",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "description": "Fastest full featured PostgreSQL client for Node.js",
   "type": "module",
   "module": "src/index.js",

diff --git a/src/index.js b/src/index.js
@@ -480,7 +480,7 @@ function parseOptions(a, b) {
       {}
     ),
     connection      : {
-      application_name: 'postgres.js',
+      application_name: env.PGAPPNAME || 'postgres.js',
       ...o.connection,
       ...Object.entries(query).reduce((acc, [k, v]) => (k in defaults || (acc[k] = v), acc), {})
     },

diff --git a/transpile.deno.js b/transpile.deno.js
@@ -55,7 +55,7 @@ function transpile(x, name, folder) {
            .replace('{ spawnSync }', '{ spawn }')
     }
     if (name === 'index.js')
-      x += '\n;window.addEventListener("unload", () => Deno.exit(process.exitCode))'
+      x += '\n;globalThis.addEventListener("unload", () => Deno.exit(process.exitCode))'
   }
 
   const buffer = x.includes('Buffer')