Skip to content

Commit 40b18b4

Browse files
authored
fix: false positive warning in some edge cases (#225)
* fix: false positive warning in some edge cases when forRootAsync with useFactory is used * chore: remove unnecessary warnings in tests, restore mock
1 parent 8f77a45 commit 40b18b4

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/mikro-orm-core.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ export class MikroOrmCoreModule implements NestModule, OnApplicationShutdown {
235235

236236
return config?.getDriver().createEntityManager();
237237
} catch {
238-
if (options && 'useFactory' in options && 'inject' in options && (options.inject as unknown[]).length > 0) {
238+
if (options && 'useFactory' in options && 'inject' in options && !options.driver && (options.inject as unknown[]).length > 0) {
239239
// eslint-disable-next-line no-console
240240
console.warn('Support for driver specific imports in modules defined with `useFactory` and `inject` requires an explicit `driver` option. See https://github.com/mikro-orm/nestjs/pull/204');
241241
}

tests/mikro-orm.module.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ describe('MikroORM Module', () => {
131131
...testOptions,
132132
logger: logger.log.bind(logger),
133133
}),
134+
driver: testOptions.driver,
134135
inject: ['my-logger'],
135136
providers: [myLoggerProvider],
136137
})],
@@ -165,6 +166,7 @@ describe('MikroORM Module', () => {
165166
...testOptions,
166167
logger: logger.log.bind(logger),
167168
}),
169+
driver: testOptions.driver,
168170
inject: ['my-logger'],
169171
providers: [myLoggerProvider],
170172
scope: Scope.REQUEST,
@@ -227,6 +229,7 @@ describe('MikroORM Module', () => {
227229
}).compile();
228230
expect(warnSpy).toBeCalledWith('Support for driver specific imports in modules defined with `useFactory` and `inject` requires an explicit `driver` option. See https://github.com/mikro-orm/nestjs/pull/204');
229231
await module.get<MikroORM>(MikroORM).close();
232+
warnSpy.mockRestore();
230233
});
231234

232235
it('forFeature should return repository', async () => {

0 commit comments

Comments
 (0)