Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Release #8526

Merged
merged 40 commits into from
May 1, 2023
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
70e6914
ci: Fix CI not running for certain branches (#8417)
mtrezza Jan 31, 2023
8414ad3
chore(release): 6.0.0-alpha.31 [skip ci]
semantic-release-bot Jan 31, 2023
46e2760
refactor: Bump http-cache-semantics from 4.1.0 to 4.1.1 (#8422)
dependabot[bot] Feb 3, 2023
4450ecb
docs: Add issue scope to contribution guide (#8423)
mtrezza Feb 4, 2023
f5bfe45
fix: Security upgrade jsonwebtoken to 9.0.0 (#8420)
dblythy Feb 7, 2023
e76123b
chore(release): 6.0.0-alpha.32 [skip ci]
semantic-release-bot Feb 7, 2023
992b3c7
refactor: Bump cacheable-request and all-node-versions (#8430)
dependabot[bot] Feb 13, 2023
a49e323
feat: Deprecate LiveQuery `fields` option in favor of `keys` for sema…
dblythy Feb 17, 2023
5477848
chore(release): 6.0.0-alpha.33 [skip ci]
semantic-release-bot Feb 17, 2023
e5d610e
feat: Add Parse Server option `resetPasswordSuccessOnInvalidEmail` to…
dblythy Feb 24, 2023
bdca9f4
chore(release): 6.0.0-alpha.34 [skip ci]
semantic-release-bot Feb 24, 2023
b3b76de
feat: Add option `schemaCacheTtl` for schema cache pulling as alterna…
dblythy Feb 27, 2023
e9ab6b0
chore(release): 6.0.0-alpha.35 [skip ci]
semantic-release-bot Feb 27, 2023
a74b7c2
ci: Remove release-automated-scheduler (#8450)
mtrezza Mar 1, 2023
33358a6
Merge branch 'beta' into build
mtrezza Mar 2, 2023
29044aa
build: Release beta (#8452)
mtrezza Mar 2, 2023
656bca6
chore(release): 6.1.0-beta.1 [skip ci]
semantic-release-bot Mar 2, 2023
40c1961
feat: Export `AuthAdapter` to make it available for extension with cu…
dblythy Mar 3, 2023
3f5b290
chore(release): 6.1.0-alpha.1 [skip ci]
semantic-release-bot Mar 3, 2023
22d2446
fix: Nested date is incorrectly decoded as empty object `{}` when fet…
dblythy Mar 5, 2023
94d558e
chore(release): 6.1.0-alpha.2 [skip ci]
semantic-release-bot Mar 5, 2023
87cab09
refactor: Upgrade pg-promise to 11.3.0 and pg-monitor to 2.0.0 (#8453)
cbaker6 Mar 5, 2023
c793bb8
feat: Add `afterFind` trigger to authentication adapters (#8444)
dblythy Mar 6, 2023
d05cfcd
chore(release): 6.1.0-alpha.3 [skip ci]
semantic-release-bot Mar 6, 2023
ce34747
fix: Parameters missing in `afterFind` trigger of authentication adap…
dblythy Mar 6, 2023
6613872
chore(release): 6.1.0-alpha.4 [skip ci]
semantic-release-bot Mar 6, 2023
4ce135a
fix: LiveQuery can return incorrectly formatted date (#8456)
dblythy Mar 6, 2023
0f1979f
chore(release): 6.1.0-alpha.5 [skip ci]
semantic-release-bot Mar 6, 2023
34833e4
feat: Add rate limiting across multiple servers via Redis (#8394)
dblythy Mar 6, 2023
c4ce59c
chore(release): 6.1.0-alpha.6 [skip ci]
semantic-release-bot Mar 6, 2023
d9e347d
fix: Rate limiting across multiple servers via Redis not working (#8469)
dblythy Mar 10, 2023
cf1b59e
chore(release): 6.1.0-alpha.7 [skip ci]
semantic-release-bot Mar 10, 2023
65e5879
ci: Fix flaky tests (#8468)
dblythy Mar 10, 2023
177891e
ci: Fix check definitions CI job not running (#8503)
dblythy Apr 11, 2023
9e43bc2
docs: Change API docs template to jsdoc-clean-theme (#8519)
coratgerl Apr 29, 2023
4f15539
feat: Allow multiple origins for header `Access-Control-Allow-Origin`…
MarcDerhammer May 1, 2023
2f53c80
chore(release): 6.1.0-alpha.8 [skip ci]
semantic-release-bot May 1, 2023
2e4119e
ci: Fix auto-release outdated ubuntu version (#8524)
mtrezza May 1, 2023
acba5cf
build: Release beta (#8525)
mtrezza May 1, 2023
f59d46c
chore(release): 6.1.0-beta.2 [skip ci]
semantic-release-bot May 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: Upgrade pg-promise to 11.3.0 and pg-monitor to 2.0.0 (#8453)
cbaker6 authored Mar 5, 2023
commit 87cab09b6ad555409241b76c10c61ce1320046bd
82 changes: 41 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -50,8 +50,8 @@
"mustache": "4.2.0",
"parse": "4.0.1",
"path-to-regexp": "0.1.7",
"pg-monitor": "1.5.0",
"pg-promise": "10.12.1",
"pg-monitor": "2.0.0",
"pg-promise": "11.3.0",
"pluralize": "8.0.0",
"redis": "4.0.6",
"semver": "7.3.8",
20 changes: 17 additions & 3 deletions spec/PostgresConfigParser.spec.js
Original file line number Diff line number Diff line change
@@ -27,13 +27,13 @@ const baseURI = 'postgres://username:password@localhost:5432/db-name';
const testfile = fs.readFileSync('./Dockerfile').toString();
const dbOptionsTest = {};
dbOptionsTest[
`${baseURI}?ssl=true&binary=true&application_name=app_name&fallback_application_name=f_app_name&poolSize=10`
`${baseURI}?ssl=true&binary=true&application_name=app_name&fallback_application_name=f_app_name&poolSize=12`
] = {
ssl: true,
binary: true,
application_name: 'app_name',
fallback_application_name: 'f_app_name',
poolSize: 10,
max: 12,
};
dbOptionsTest[`${baseURI}?ssl=&binary=aa`] = {
binary: false,
@@ -83,6 +83,20 @@ describe('PostgresConfigParser.getDatabaseOptionsFromURI', () => {
it('sets the poolSize to 10 if the it is not a number', () => {
const result = parser.getDatabaseOptionsFromURI(`${baseURI}?poolSize=sdf`);

expect(result.poolSize).toEqual(10);
expect(result.max).toEqual(10);
});

it('sets the max to 10 if the it is not a number', () => {
const result = parser.getDatabaseOptionsFromURI(`${baseURI}?&max=sdf`);

expect(result.poolSize).toBeUndefined();
expect(result.max).toEqual(10);
});

it('max should take precedence over poolSize', () => {
const result = parser.getDatabaseOptionsFromURI(`${baseURI}?poolSize=20&max=12`);

expect(result.poolSize).toBeUndefined();
expect(result.max).toEqual(12);
});
});
2 changes: 1 addition & 1 deletion src/Adapters/Storage/Postgres/PostgresConfigParser.js
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ function getDatabaseOptionsFromURI(uri) {
databaseOptions.fallback_application_name = queryParams.fallback_application_name;

if (queryParams.poolSize) {
databaseOptions.poolSize = parseInt(queryParams.poolSize) || 10;
databaseOptions.max = parseInt(queryParams.poolSize) || 10;
}
if (queryParams.max) {
databaseOptions.max = parseInt(queryParams.max) || 10;