From 0e8769803ace6ea2dc18fbf1c542d85a148b3319 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 11 Sep 2020 09:26:56 +0800 Subject: [PATCH 1/3] Always migrate seed data --- .../Data/MyProjectNameDbMigrationService.cs | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 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 932518ba86..fe86ebe33b 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 @@ -47,27 +47,25 @@ namespace MyCompanyName.MyProjectName.Data var migratedDatabaseSchemas = new HashSet(); foreach (var tenant in tenants) { - if (!tenant.ConnectionStrings.Any()) + if (tenant.ConnectionStrings.Any()) { - continue; - } - - using (_currentTenant.Change(tenant.Id)) - { - var tenantConnectionStrings = tenant.ConnectionStrings - .Select(x => x.Value) - .ToList(); - - if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings)) + using (_currentTenant.Change(tenant.Id)) { - await MigrateDatabaseSchemaAsync(tenant); + var tenantConnectionStrings = tenant.ConnectionStrings + .Select(x => x.Value) + .ToList(); - migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings); - } + if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings)) + { + await MigrateDatabaseSchemaAsync(tenant); - await SeedDataAsync(tenant); + migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings); + } + } } + await SeedDataAsync(tenant); + Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations."); } @@ -92,4 +90,4 @@ namespace MyCompanyName.MyProjectName.Data await _dataSeeder.SeedAsync(tenant?.Id); } } -} \ No newline at end of file +} From e6e6797c9c391562982a997bbddf9361dfac9000 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 11 Sep 2020 10:42:49 +0800 Subject: [PATCH 2/3] Update MyProjectNameDbMigrationService.cs --- .../Data/MyProjectNameDbMigrationService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 fe86ebe33b..db5b9291a6 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 @@ -47,9 +47,9 @@ namespace MyCompanyName.MyProjectName.Data var migratedDatabaseSchemas = new HashSet(); foreach (var tenant in tenants) { - if (tenant.ConnectionStrings.Any()) + using (_currentTenant.Change(tenant.Id)) { - using (_currentTenant.Change(tenant.Id)) + if (tenant.ConnectionStrings.Any()) { var tenantConnectionStrings = tenant.ConnectionStrings .Select(x => x.Value) @@ -62,9 +62,9 @@ namespace MyCompanyName.MyProjectName.Data migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings); } } - } - await SeedDataAsync(tenant); + await SeedDataAsync(tenant); + } Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations."); } From 338acf5b7768ded68fe7ec2a5856d06963db8b60 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 11 Sep 2020 10:42:49 +0800 Subject: [PATCH 3/3] Revert "Update MyProjectNameDbMigrationService.cs" This reverts commit e6e6797c9c391562982a997bbddf9361dfac9000. --- .../Data/MyProjectNameDbMigrationService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 db5b9291a6..fe86ebe33b 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 @@ -47,9 +47,9 @@ namespace MyCompanyName.MyProjectName.Data var migratedDatabaseSchemas = new HashSet(); foreach (var tenant in tenants) { - using (_currentTenant.Change(tenant.Id)) + if (tenant.ConnectionStrings.Any()) { - if (tenant.ConnectionStrings.Any()) + using (_currentTenant.Change(tenant.Id)) { var tenantConnectionStrings = tenant.ConnectionStrings .Select(x => x.Value) @@ -62,10 +62,10 @@ namespace MyCompanyName.MyProjectName.Data migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings); } } - - await SeedDataAsync(tenant); } + await SeedDataAsync(tenant); + Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations."); }