Skip to content

Commit b829b96

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fixSelectExclude
2 parents bdd1af6 + 36de1db commit b829b96

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
MONGODB_VERSION: 4.4.4
9797
MONGODB_TOPOLOGY: standalone
9898
MONGODB_STORAGE_ENGINE: wiredTiger
99-
NODE_VERSION: 15.11.0
99+
NODE_VERSION: 15.12.0
100100
fail-fast: false
101101
name: ${{ matrix.name }}
102102
timeout-minutes: 15

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Parse Server is continuously tested with the most recent releases of Node.js to
115115
| Node.js 10 | 10.24.0 | April 2021 | ✅ Fully compatible |
116116
| Node.js 12 | 12.21.0 | April 2022 | ✅ Fully compatible |
117117
| Node.js 14 | 14.16.0 | April 2023 | ✅ Fully compatible |
118-
| Node.js 15 | 15.11.0 | June 2021 | ✅ Fully compatible |
118+
| Node.js 15 | 15.12.0 | June 2021 | ✅ Fully compatible |
119119

120120
#### MongoDB
121121
Parse Server is continuously tested with the most recent releases of MongoDB to ensure compatibility. We follow the [MongoDB support schedule](https://www.mongodb.com/support-policy) and only test against versions that are officially supported and have not reached their end-of-life date.

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"graphql": "15.5.0",
3939
"graphql-list-fields": "2.0.2",
4040
"graphql-relay": "0.6.0",
41-
"graphql-tag": "2.12.0",
41+
"graphql-tag": "2.12.1",
4242
"graphql-upload": "11.0.0",
4343
"intersect": "1.0.1",
4444
"jsonwebtoken": "8.5.1",

src/Adapters/Storage/Postgres/PostgresClient.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ export function createClient(uri, databaseOptions) {
2020

2121
if (process.env.PARSE_SERVER_LOG_LEVEL === 'debug') {
2222
const monitor = require('pg-monitor');
23-
try {
24-
monitor.attach(initOptions);
25-
} catch (e) {
23+
if(monitor.isAttached()) {
2624
monitor.detach();
27-
monitor.attach(initOptions);
2825
}
26+
monitor.attach(initOptions);
2927
}
3028

3129
if (dbOptions.pgOptions) {

0 commit comments

Comments
 (0)