Merge pull request #1300 from mo4islona/master

Do not initialize datasource if already initialized
nestjs · Jun 14, 2022 · 3a4c65c · 3a4c65c
2 parents 3454481 + d359f4d
commit 3a4c65c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/typeorm-core.module.ts b/lib/typeorm-core.module.ts
@@ -217,7 +217,7 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
           const dataSource = await createTypeormDataSource(
             options as DataSourceOptions,
           );
-          return dataSource.initialize ? dataSource.initialize() : dataSource;
+          return dataSource.initialize && !dataSource.isInitialized ? dataSource.initialize() : dataSource;
         }
 
         let entities = options.entities;
@@ -233,7 +233,7 @@ export class TypeOrmCoreModule implements OnApplicationShutdown {
           ...options,
           entities,
         } as DataSourceOptions);
-        return dataSource.initialize ? dataSource.initialize() : dataSource;
+        return dataSource.initialize && !dataSource.isInitialized ? dataSource.initialize() : dataSource;
       }).pipe(
         handleRetry(
           options.retryAttempts,