Skip to content

Commit 0f657ab

Browse files
author
alxndrsn
committed
Merge branch 'master' into eslint-no-unreachable
2 parents e1b9fe6 + a9fd34f commit 0f657ab

23 files changed

Lines changed: 411 additions & 61 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ For richer information consult the commit log on github with referenced pull req
44

55
We do not include break-fix version release in this file.
66

7+
## pg@8.14.0
8+
9+
- Add support from SCRAM-SAH-256-PLUS i.e. [channel binding](https://github.com/brianc/node-postgres/pull/3356).
10+
711
## pg@8.13.0
812

913
- Add ability to specify query timeout on [per-query basis](https://github.com/brianc/node-postgres/pull/3074).

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ This repo is a monorepo which contains the core [pg](https://github.com/brianc/n
1919
- [pg-protocol](https://github.com/brianc/node-postgres/tree/master/packages/pg-protocol)
2020

2121
## Install
22+
2223
```
2324
npm install pg
2425
```
@@ -65,6 +66,12 @@ node-postgres's continued development has been made possible in part by generous
6566

6667
If you or your company are benefiting from node-postgres and would like to help keep the project financially sustainable [please consider supporting](https://github.com/sponsors/brianc) its development.
6768

69+
### Featured sponsor
70+
71+
Special thanks to [medplum](https://medplum.com) for their generous and thoughtful support of node-postgres!
72+
73+
![medplum](https://raw.githubusercontent.com/medplum/medplum-logo/refs/heads/main/medplum-logo.png)
74+
6875
## Contributing
6976

7077
**:heart: contributions!**

SPONSORS.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ node-postgres is made possible by the helpful contributors from the community as
1515
- [mpirik](https://github.com/mpirik)
1616
- [@BLUE-DEVIL1134](https://github.com/BLUE-DEVIL1134)
1717
- [bubble.io](https://bubble.io/)
18-
- GitHub[https://github.com/github]
19-
- loveland [https://github.com/loveland]
18+
- [GitHub](https://github.com/github)
19+
- [n8n](https://n8n.io/)
20+
- [loveland](https://github.com/loveland)
21+
- [gajus](https://github.com/gajus)
22+
- [thirdiron](https://github.com/thirdiron)
2023

2124
# Supporters
2225

@@ -50,3 +53,4 @@ node-postgres is made possible by the helpful contributors from the community as
5053
- [Sideline Sports](https://github.com/SidelineSports)
5154
- [Gadget](https://github.com/gadget-inc)
5255
- [Sentry](https://sentry.io/welcome/)
56+
- [devlikeapro](https://github.com/devlikepro)

docs/pages/features/ssl.mdx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,17 @@ const config = {
5151
},
5252
}
5353
```
54+
55+
## Channel binding
56+
57+
If the PostgreSQL server offers SCRAM-SHA-256-PLUS (i.e. channel binding) for TLS/SSL connections, you can enable this as follows:
58+
59+
```js
60+
const client = new Client({ ...config, enableChannelBinding: true})
61+
```
62+
63+
or
64+
65+
```js
66+
const pool = new Pool({ ...config, enableChannelBinding: true})
67+
```

packages/pg-cursor/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pg-cursor",
3-
"version": "2.12.3",
3+
"version": "2.13.1",
44
"description": "Query cursor extension for node-postgres",
55
"main": "index.js",
66
"directories": {
@@ -18,7 +18,7 @@
1818
"license": "MIT",
1919
"devDependencies": {
2020
"mocha": "^10.5.2",
21-
"pg": "^8.13.3"
21+
"pg": "^8.14.1"
2222
},
2323
"peerDependencies": {
2424
"pg": "^8"

packages/pg-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pg-native",
3-
"version": "3.2.2",
3+
"version": "3.3.0",
44
"description": "A slightly nicer interface to Postgres over node-libpq",
55
"main": "index.js",
66
"scripts": {

packages/pg-pool/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ class Pool extends EventEmitter {
205205
response.callback(new Error('timeout exceeded when trying to connect'))
206206
}, this.options.connectionTimeoutMillis)
207207

208+
if (tid.unref) {
209+
tid.unref()
210+
}
211+
208212
this._pendingQueue.push(pendingItem)
209213
return result
210214
}

packages/pg-pool/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pg-pool",
3-
"version": "3.7.1",
3+
"version": "3.8.0",
44
"description": "Connection pool for node-postgres",
55
"main": "index.js",
66
"directories": {

packages/pg-protocol/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pg-protocol",
3-
"version": "1.7.1",
3+
"version": "1.8.0",
44
"description": "The postgres client/server binary protocol, implemented in TypeScript",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

packages/pg-query-stream/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pg-query-stream",
3-
"version": "4.7.3",
3+
"version": "4.8.1",
44
"description": "Postgres query result returned as readable stream",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -37,7 +37,7 @@
3737
"concat-stream": "~1.0.1",
3838
"eslint-plugin-promise": "^6.0.1",
3939
"mocha": "^10.5.2",
40-
"pg": "^8.13.3",
40+
"pg": "^8.14.1",
4141
"stream-spec": "~0.3.5",
4242
"ts-node": "^8.5.4",
4343
"typescript": "^4.0.3"
@@ -46,6 +46,6 @@
4646
"pg": "^8"
4747
},
4848
"dependencies": {
49-
"pg-cursor": "^2.12.3"
49+
"pg-cursor": "^2.13.1"
5050
}
5151
}

0 commit comments

Comments
 (0)