Browse Source

Merge pull request #7244 from abpframework/issue/7242

Fix DbMigrator for mongodb
pull/7247/head
liangshiwei 6 years ago
committed by GitHub
parent
commit
29940a057d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs

19
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs

@ -41,9 +41,9 @@ namespace MyCompanyName.MyProjectName.Data
{ {
try try
{ {
if (!await MigrationsFolderExists()) if (DbMigrationsProjectExists() && !MigrationsFolderExists())
{ {
await AddInitialMigration(); AddInitialMigration();
return; return;
} }
} }
@ -108,14 +108,21 @@ namespace MyCompanyName.MyProjectName.Data
await _dataSeeder.SeedAsync(tenant?.Id); await _dataSeeder.SeedAsync(tenant?.Id);
} }
private async Task<bool> MigrationsFolderExists() private bool DbMigrationsProjectExists()
{
var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath();
return dbMigrationsProjectFolder != null;
}
private bool MigrationsFolderExists()
{ {
var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath(); var dbMigrationsProjectFolder = GetDbMigrationsProjectFolderPath();
return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "migrations")); return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "migrations"));
} }
private async Task AddInitialMigration() private void AddInitialMigration()
{ {
Logger.LogInformation("Creating initial migration..."); Logger.LogInformation("Creating initial migration...");
@ -147,7 +154,7 @@ namespace MyCompanyName.MyProjectName.Data
} }
} }
private static string GetDbMigrationsProjectFolderPath() private string GetDbMigrationsProjectFolderPath()
{ {
var slnDirectoryPath = GetSolutionDirectoryPath(); var slnDirectoryPath = GetSolutionDirectoryPath();
@ -162,7 +169,7 @@ namespace MyCompanyName.MyProjectName.Data
.FirstOrDefault(d => d.EndsWith(".DbMigrations")); .FirstOrDefault(d => d.EndsWith(".DbMigrations"));
} }
private static string GetSolutionDirectoryPath() private string GetSolutionDirectoryPath()
{ {
var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory()); var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());

Loading…
Cancel
Save