@@ -213,32 +213,28 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
213
213
} ) ;
214
214
return await lastValueFrom (
215
215
defer ( async ( ) => {
216
+ let dataSource : DataSource ;
216
217
if ( ! options . autoLoadEntities ) {
217
- const dataSource = await createTypeormDataSource (
218
+ dataSource = await createTypeormDataSource (
218
219
options as DataSourceOptions ,
219
220
) ;
220
- // TODO: remove "dataSource.initialize" condition (left for backward compatibility)
221
- return ( dataSource as any ) . initialize && ! dataSource . isInitialized
222
- ? dataSource . initialize ( )
223
- : dataSource ;
224
- }
225
-
226
- let entities = options . entities ;
227
- if ( Array . isArray ( entities ) ) {
228
- entities = entities . concat (
229
- EntitiesMetadataStorage . getEntitiesByDataSource ( dataSourceToken ) ,
230
- ) ;
231
221
} else {
232
- entities =
233
- EntitiesMetadataStorage . getEntitiesByDataSource ( dataSourceToken ) ;
222
+ let entities = options . entities ;
223
+ if ( Array . isArray ( entities ) ) {
224
+ entities = entities . concat (
225
+ EntitiesMetadataStorage . getEntitiesByDataSource ( dataSourceToken ) ,
226
+ ) ;
227
+ } else {
228
+ entities =
229
+ EntitiesMetadataStorage . getEntitiesByDataSource ( dataSourceToken ) ;
230
+ }
231
+ dataSource = await createTypeormDataSource ( {
232
+ ...options ,
233
+ entities,
234
+ } as DataSourceOptions ) ;
234
235
}
235
- const dataSource = await createTypeormDataSource ( {
236
- ...options ,
237
- entities,
238
- } as DataSourceOptions ) ;
239
-
240
236
// TODO: remove "dataSource.initialize" condition (left for backward compatibility)
241
- return ( dataSource as any ) . initialize && ! dataSource . isInitialized
237
+ return ( dataSource as any ) . initialize && ! dataSource . isInitialized && ! options . manualInitialization
242
238
? dataSource . initialize ( )
243
239
: dataSource ;
244
240
} ) . pipe (
0 commit comments