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

fix: properly override database url properties #6247

Merged
merged 2 commits into from Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/driver/DriverUtils.ts
Expand Up @@ -28,7 +28,7 @@ export class DriverUtils {
if (buildOptions && buildOptions.useSid) {
urlDriverOptions.sid = parsedUrl.database;
}
return Object.assign({}, options, urlDriverOptions);
return Object.assign({}, urlDriverOptions, options);
}
return Object.assign({}, options);
}
Expand Down
19 changes: 19 additions & 0 deletions test/github-issues/4878/issue-4878.ts
@@ -0,0 +1,19 @@
import { DriverUtils } from "../../../src/driver/DriverUtils";
import { expect } from "chai";

describe("github issues > #4878 URL Connection string not overridden by supplied options", () => {
it("should override url-built options with user-supplied options", () => {
const obj: any = {
username: "user",
password: "password",
host: "host",
database: "database",
port: 8888
};

const url = `postgres://url_user:${obj.password}@${obj.host}:${obj.port}/${obj.database}`;
obj.url = url;
const options = DriverUtils.buildDriverOptions(obj);
expect(options.username).to.eql(obj.username);
});
});