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

allow options to be a JSON object #12404

Merged
merged 8 commits into from
Jun 23, 2020
Merged

allow options to be a JSON object #12404

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8211a3e
allow options to be a JSON object
yorek Jun 22, 2020
0e81427
fix: correctly handle JSON options in URI
yorek Jun 22, 2020
b3379f3
refactor: code style
yorek Jun 23, 2020
5037095
test: test URL connection with JSON option
yorek Jun 23, 2020
9a1f368
test: fixed test
yorek Jun 23, 2020
73d5c66
test: removed erroneus async
yorek Jun 23, 2020
787c95f
test: moved to unit test
yorek Jun 23, 2020
f6da4e9
refactor: adhered to code conventions
yorek Jun 23, 2020
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
13 changes: 12 additions & 1 deletion lib/sequelize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,19 @@ class Sequelize {

if (options.dialectOptions)
Object.assign(options.dialectOptions, urlParts.query);
else
else
{
yorek marked this conversation as resolved.
Show resolved Hide resolved
options.dialectOptions = urlParts.query;
if (urlParts.query.options) {
try {
const o = JSON.parse(urlParts.query.options);
options.dialectOptions.options = o;
} catch (e) {
// Nothing to do, string is not a valid JSON
// an thus does not need any further processing
}
}
}
}
} else {
// new Sequelize(database, username, password, { ... options })
Expand Down
8 changes: 8 additions & 0 deletions test/integration/configuration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ describe(Support.getTestDialectTeaser('Configuration'), () => {
});
});

describe('Instantiation with a URL string', () => {
yorek marked this conversation as resolved.
Show resolved Hide resolved
it('should handle options in URL', () => {
const sequelizeWithOptions = new Sequelize('mssql://user:password!@server.database.windows.net/database?options={"encrypt":true}&anotherOption=1');
expect(sequelizeWithOptions.options.dialectOptions.options.encrypt).to.equal(true);
expect(sequelizeWithOptions.options.dialectOptions.anotherOption).to.equal('1');
});
});

describe('Instantiation with arguments', () => {
if (dialect === 'sqlite') {
it('should respect READONLY / READWRITE connection modes', async () => {
Expand Down