Skip to content

Commit

Permalink
Revert "fix: properly override database url properties (typeorm#6247)" (
Browse files Browse the repository at this point in the history
typeorm#6802)

This reverts commit 0ba2a48.
  • Loading branch information
pleerock authored and Svetlozar committed Jan 12, 2021
1 parent 059723f commit 7929df7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
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({}, urlDriverOptions, options);
return Object.assign({}, options, urlDriverOptions);
}
return Object.assign({}, options);
}
Expand Down
19 changes: 0 additions & 19 deletions test/github-issues/4878/issue-4878.ts

This file was deleted.

0 comments on commit 7929df7

Please sign in to comment.