From a71e460892198824280136ba4d64acf85474157e Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 15 Jan 2021 09:42:32 +0300 Subject: [PATCH 1/3] Fix DbMigrator for mongodb resolves https://github.com/abpframework/abp/issues/7242 --- .../Data/MyProjectNameDbMigrationService.cs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs index aec2fb6de7..13ba7dc40f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs @@ -41,9 +41,9 @@ namespace MyCompanyName.MyProjectName.Data { try { - if (!await MigrationsFolderExists()) + if (await DbMigrationsProjectExistsAsync() && !await MigrationsFolderExistsAsync()) { - await AddInitialMigration(); + await AddInitialMigrationAsync(); return; } } @@ -108,14 +108,21 @@ namespace MyCompanyName.MyProjectName.Data await _dataSeeder.SeedAsync(tenant?.Id); } - private async Task MigrationsFolderExists() + private async Task DbMigrationsProjectExistsAsync() + { + var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath(); + + return dbMigrationsProjectFolder != null; + } + + private async Task MigrationsFolderExistsAsync() { var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath(); return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "migrations")); } - private async Task AddInitialMigration() + private async Task AddInitialMigrationAsync() { Logger.LogInformation("Creating initial migration..."); @@ -147,7 +154,7 @@ namespace MyCompanyName.MyProjectName.Data } } - private static string GetDbMigrationsProjectFolderPath() + private string GetDbMigrationsProjectFolderPath() { var slnDirectoryPath = GetSolutionDirectoryPath(); @@ -162,7 +169,7 @@ namespace MyCompanyName.MyProjectName.Data .FirstOrDefault(d => d.EndsWith(".DbMigrations")); } - private static string GetSolutionDirectoryPath() + private string GetSolutionDirectoryPath() { var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory()); From 732afa51d5bbf1580f7b512c483f34004a501b14 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 15 Jan 2021 10:10:11 +0300 Subject: [PATCH 2/3] MyProjectNameDbMigrationService remove unneccessary async --- .../Data/MyProjectNameDbMigrationService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs index 13ba7dc40f..aece171844 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs @@ -41,7 +41,7 @@ namespace MyCompanyName.MyProjectName.Data { try { - if (await DbMigrationsProjectExistsAsync() && !await MigrationsFolderExistsAsync()) + if (DbMigrationsProjectExists() && !MigrationsFolderExists()) { await AddInitialMigrationAsync(); return; @@ -108,14 +108,14 @@ namespace MyCompanyName.MyProjectName.Data await _dataSeeder.SeedAsync(tenant?.Id); } - private async Task DbMigrationsProjectExistsAsync() + private bool DbMigrationsProjectExists() { var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath(); return dbMigrationsProjectFolder != null; } - private async Task MigrationsFolderExistsAsync() + private bool MigrationsFolderExists() { var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath(); From d52198bb397eae429a4d192f78885b0b62e4ef5e Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 15 Jan 2021 15:50:20 +0800 Subject: [PATCH 3/3] Rename AddInitialMigrationAsync to AddInitialMigration --- .../Data/MyProjectNameDbMigrationService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs index aece171844..1cb3ba052c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs @@ -43,7 +43,7 @@ namespace MyCompanyName.MyProjectName.Data { if (DbMigrationsProjectExists() && !MigrationsFolderExists()) { - await AddInitialMigrationAsync(); + AddInitialMigration(); return; } } @@ -122,7 +122,7 @@ namespace MyCompanyName.MyProjectName.Data return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "migrations")); } - private async Task AddInitialMigrationAsync() + private void AddInitialMigration() { Logger.LogInformation("Creating initial migration...");