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.

Sign up for GitHub

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

Jump to bottom

fix: decode encoded value from urlParts.pathname for database option #14963

Merged
merged 8 commits into from Sep 14, 2022
Merged

fix: decode encoded value from urlParts.pathname for database option #14963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a45a23d
fix: decode encoded value from `urlParts.pathname` for `database` option
fzn0x Sep 7, 2022
c712cd5
refactor: move to `decodeURIComponent`
fzn0x Sep 8, 2022
3cfbc49
Merge branch 'main' into fix/sequelize-utils-url
fzn0x Sep 9, 2022
59ce2dc
Merge branch 'main' into fix/sequelize-utils-url
fzn0x Sep 11, 2022
529d5b7
test: add parse connection string function test from url utility
fzn0x Sep 11, 2022
d938a8b
fix: linting
fzn0x Sep 11, 2022
fc14e16
Merge branch 'main' into fix/sequelize-utils-url
fzn0x Sep 11, 2022
4cc1078
Merge branch 'main' into fix/sequelize-utils-url
fzn0x Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/utils/url.ts
View file
Open in desktop
Expand Up @@ -26,7 +26,8 @@ export function parseConnectionString(connectionString: string): Options {
}

if (urlParts.pathname) {
options.database = urlParts.pathname.replace(/^\//, '');
// decode the URI component from urlParts.pathname value
options.database = decodeURIComponent(urlParts.pathname.replace(/^\//, ''));
}

if (urlParts.port) {
Expand Down
12 changes: 12 additions & 0 deletions test/unit/utils/utils.test.ts
View file
Open in desktop
Expand Up @@ -154,4 +154,16 @@ describe(getTestDialectTeaser('Utils'), () => {
});
});
});

describe('url', () => {
it('should return the correct options after parsed', () => {
const options = Utils.parseConnectionString('pg://wpx%20ss:wpx%20ss@21.77.77:4001/database ss');
expect(options.dialect).to.equal('pg');
expect(options.host).to.equal('21.77.77');
expect(options.port).to.equal('4001');
expect(options.database).to.equal('database ss');
expect(options.username).to.equal('wpx ss');
expect(options.password).to.equal('wpx ss');
});
});
});