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

feat: asynchronous ormconfig support #5048

Merged
merged 1 commit into from
Nov 22, 2019
Merged

feat: asynchronous ormconfig support #5048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/connection/ConnectionOptionsReader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ export class ConnectionOptionsReader {
connectionOptions = new ConnectionOptionsEnvReader().read();

} else if (foundFileFormat === "js") {
connectionOptions = PlatformTools.load(configFile);
connectionOptions = await PlatformTools.load(configFile);

} else if (foundFileFormat === "ts") {
connectionOptions = PlatformTools.load(configFile);
connectionOptions = await PlatformTools.load(configFile);

} else if (foundFileFormat === "json") {
connectionOptions = PlatformTools.load(configFile);
Expand Down
5 changes: 5 additions & 0 deletions test/functional/connection-options-reader/configs/test-path-config-async.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = Promise.resolve({
type: "sqlite",
name: "file",
database: "test-js-async"
});
6 changes: 6 additions & 0 deletions test/functional/connection-options-reader/connection-options-reader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ describe("ConnectionOptionsReader", () => {
expect(fileOptions.database).to.have.string("/test-js");
});

it("properly loads asynchronous config with specified file path", async () => {
const connectionOptionsReader = new ConnectionOptionsReader({ root: __dirname, configName: "configs/test-path-config-async.js" });
const fileOptions: ConnectionOptions = await connectionOptionsReader.get("file");
expect(fileOptions.database).to.have.string("/test-js-async");
});

// TODO This test requires the configs/.env file be moved to the matching directory in build/compiled
it.skip("properly loads config from .env file", async () => {
const connectionOptionsReader = new ConnectionOptionsReader({ root: __dirname, configName: "configs/.env" });
Expand Down