Create init migration and execute.

4 years ago · 361ca721a0
5 changed files with 362 additions and 7 deletions
--- a/build/common.ps1
+++ b/build/common.ps1
@ -36,6 +36,7 @@ if ($full -eq "-f")
 		"../templates/app/aspnet-core",
 		"../templates/console",
 		"../templates/wpf",
+		"../templates/app-nolayers/aspnet-core",
 		"../abp_io/AbpIoLocalization"
 	) 
 }else{ 
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
@ -13,7 +13,7 @@ namespace Volo.Abp.Cli.Commands;
 public class CreateMigrationAndRunMigratorCommand : IConsoleCommand, ITransientDependency
 {
    public const string Name = "create-migration-and-run-migrator";
-    
+
    public ICmdHelper CmdHelper { get; }
    public ILogger<CreateMigrationAndRunMigratorCommand> Logger { get; set; }

@ -32,8 +32,9 @@ public class CreateMigrationAndRunMigratorCommand : IConsoleCommand, ITransientD

        var dbMigrationsFolder = commandLineArgs.Target;

+        var nolayers = commandLineArgs.Options.ContainsKey("nolayers");
        var dbMigratorProjectPath = GetDbMigratorProjectPath(dbMigrationsFolder);
-        if (dbMigratorProjectPath == null)
+        if (!nolayers && dbMigratorProjectPath == null)
        {
            throw new Exception("DbMigrator is not found!");
        }
@ -55,8 +56,16 @@ public class CreateMigrationAndRunMigratorCommand : IConsoleCommand, ITransientD

        if (CheckMigrationOutput(migrationOutput) && CheckMigrationOutput(tenantMigrationOutput))
        {
-            // Migration added successfully
-            CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(dbMigratorProjectPath) + "\" && dotnet run");
+            if (nolayers)
+            {
+                // Migration added successfully
+                CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(Path.Combine(dbMigrationsFolder, "MyCompanyName.MyProjectName")) + "\" && dotnet run --migrate-database");
+            }
+            else
+            {
+                // Migration added successfully
+                CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(dbMigratorProjectPath) + "\" && dotnet run");
+            }
            await Task.CompletedTask;
        }
        else
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Data/MyProjectNameDbMigrationService.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Data/MyProjectNameDbMigrationService.cs
@ -1,4 +1,6 @@
-using Microsoft.Extensions.Logging.Abstractions;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
@ -32,6 +34,13 @@ public class MyProjectNameDbMigrationService : ITransientDependency

    public async Task MigrateAsync()
    {
+        var initialMigrationAdded = AddInitialMigrationIfNotExist();
+
+        if (initialMigrationAdded)
+        {
+            return;
+        }
+
        Logger.LogInformation("Started database migrations...");

        await MigrateDatabaseSchemaAsync();
@ -85,4 +94,110 @@ public class MyProjectNameDbMigrationService : ITransientDependency
            .WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue)
        );
    }
+
+    private bool AddInitialMigrationIfNotExist()
+    {
+        try
+        {
+            if (!DbMigrationsProjectExists())
+            {
+                return false;
+            }
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
+        try
+        {
+            if (!MigrationsFolderExists())
+            {
+                AddInitialMigration();
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        catch (Exception e)
+        {
+            Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
+            return false;
+        }
+    }
+
+    private bool DbMigrationsProjectExists()
+    {
+        return Directory.Exists(GetEntityFrameworkCoreProjectFolderPath());
+    }
+
+    private bool MigrationsFolderExists()
+    {
+        var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
+
+        return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
+    }
+
+    private void AddInitialMigration()
+    {
+        Logger.LogInformation("Creating initial migration...");
+
+        string argumentPrefix;
+        string fileName;
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            argumentPrefix = "-c";
+            fileName = "/bin/bash";
+        }
+        else
+        {
+            argumentPrefix = "/C";
+            fileName = "cmd.exe";
+        }
+
+        var procStartInfo = new ProcessStartInfo(fileName,
+            $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetEntityFrameworkCoreProjectFolderPath()}\" --nolayers\""
+        );
+
+        try
+        {
+            Process.Start(procStartInfo);
+        }
+        catch (Exception)
+        {
+            throw new Exception("Couldn't run ABP CLI...");
+        }
+    }
+
+    private string GetEntityFrameworkCoreProjectFolderPath()
+    {
+        var slnDirectoryPath = GetSolutionDirectoryPath();
+
+        if (slnDirectoryPath == null)
+        {
+            throw new Exception("Solution folder not found!");
+        }
+
+        return Path.Combine(slnDirectoryPath, "MyCompanyName.MyProjectName");
+    }
+
+    private string GetSolutionDirectoryPath()
+    {
+        var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
+
+        while (Directory.GetParent(currentDirectory.FullName) != null)
+        {
+            currentDirectory = Directory.GetParent(currentDirectory.FullName);
+
+            if (Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
+            {
+                return currentDirectory.FullName;
+            }
+        }
+
+        return null;
+    }
 }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/MyProjectNameDbMigrationService.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/MyProjectNameDbMigrationService.cs
@ -1,4 +1,6 @@
-using Microsoft.Extensions.Logging.Abstractions;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
@ -32,6 +34,13 @@ public class MyProjectNameDbMigrationService : ITransientDependency

    public async Task MigrateAsync()
    {
+        var initialMigrationAdded = AddInitialMigrationIfNotExist();
+
+        if (initialMigrationAdded)
+        {
+            return;
+        }
+
        Logger.LogInformation("Started database migrations...");

        await MigrateDatabaseSchemaAsync();
@ -85,4 +94,110 @@ public class MyProjectNameDbMigrationService : ITransientDependency
            .WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue)
        );
    }
+
+    private bool AddInitialMigrationIfNotExist()
+    {
+        try
+        {
+            if (!DbMigrationsProjectExists())
+            {
+                return false;
+            }
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
+        try
+        {
+            if (!MigrationsFolderExists())
+            {
+                AddInitialMigration();
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        catch (Exception e)
+        {
+            Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
+            return false;
+        }
+    }
+
+    private bool DbMigrationsProjectExists()
+    {
+        return Directory.Exists(GetEntityFrameworkCoreProjectFolderPath());
+    }
+
+    private bool MigrationsFolderExists()
+    {
+        var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
+
+        return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
+    }
+
+    private void AddInitialMigration()
+    {
+        Logger.LogInformation("Creating initial migration...");
+
+        string argumentPrefix;
+        string fileName;
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            argumentPrefix = "-c";
+            fileName = "/bin/bash";
+        }
+        else
+        {
+            argumentPrefix = "/C";
+            fileName = "cmd.exe";
+        }
+
+        var procStartInfo = new ProcessStartInfo(fileName,
+            $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetEntityFrameworkCoreProjectFolderPath()}\" --nolayers\""
+        );
+
+        try
+        {
+            Process.Start(procStartInfo);
+        }
+        catch (Exception)
+        {
+            throw new Exception("Couldn't run ABP CLI...");
+        }
+    }
+
+    private string GetEntityFrameworkCoreProjectFolderPath()
+    {
+        var slnDirectoryPath = GetSolutionDirectoryPath();
+
+        if (slnDirectoryPath == null)
+        {
+            throw new Exception("Solution folder not found!");
+        }
+
+        return Path.Combine(slnDirectoryPath, "MyCompanyName.MyProjectName");
+    }
+
+    private string GetSolutionDirectoryPath()
+    {
+        var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
+
+        while (Directory.GetParent(currentDirectory.FullName) != null)
+        {
+            currentDirectory = Directory.GetParent(currentDirectory.FullName);
+
+            if (Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
+            {
+                return currentDirectory.FullName;
+            }
+        }
+
+        return null;
+    }
 }
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Data/MyProjectNameDbMigrationService.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Data/MyProjectNameDbMigrationService.cs
@ -1,4 +1,6 @@
-using Microsoft.Extensions.Logging.Abstractions;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
@ -32,6 +34,13 @@ public class MyProjectNameDbMigrationService : ITransientDependency

    public async Task MigrateAsync()
    {
+        var initialMigrationAdded = AddInitialMigrationIfNotExist();
+
+        if (initialMigrationAdded)
+        {
+            return;
+        }
+
        Logger.LogInformation("Started database migrations...");

        await MigrateDatabaseSchemaAsync();
@ -85,4 +94,110 @@ public class MyProjectNameDbMigrationService : ITransientDependency
            .WithProperty(IdentityDataSeedContributor.AdminPasswordPropertyName, IdentityDataSeedContributor.AdminPasswordDefaultValue)
        );
    }
+
+    private bool AddInitialMigrationIfNotExist()
+    {
+        try
+        {
+            if (!DbMigrationsProjectExists())
+            {
+                return false;
+            }
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
+        try
+        {
+            if (!MigrationsFolderExists())
+            {
+                AddInitialMigration();
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        catch (Exception e)
+        {
+            Logger.LogWarning("Couldn't determinate if any migrations exist : " + e.Message);
+            return false;
+        }
+    }
+
+    private bool DbMigrationsProjectExists()
+    {
+        return Directory.Exists(GetEntityFrameworkCoreProjectFolderPath());
+    }
+
+    private bool MigrationsFolderExists()
+    {
+        var dbMigrationsProjectFolder = GetEntityFrameworkCoreProjectFolderPath();
+
+        return Directory.Exists(Path.Combine(dbMigrationsProjectFolder, "Migrations"));
+    }
+
+    private void AddInitialMigration()
+    {
+        Logger.LogInformation("Creating initial migration...");
+
+        string argumentPrefix;
+        string fileName;
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            argumentPrefix = "-c";
+            fileName = "/bin/bash";
+        }
+        else
+        {
+            argumentPrefix = "/C";
+            fileName = "cmd.exe";
+        }
+
+        var procStartInfo = new ProcessStartInfo(fileName,
+            $"{argumentPrefix} \"abp create-migration-and-run-migrator \"{GetEntityFrameworkCoreProjectFolderPath()}\" --nolayers\""
+        );
+
+        try
+        {
+            Process.Start(procStartInfo);
+        }
+        catch (Exception)
+        {
+            throw new Exception("Couldn't run ABP CLI...");
+        }
+    }
+
+    private string GetEntityFrameworkCoreProjectFolderPath()
+    {
+        var slnDirectoryPath = GetSolutionDirectoryPath();
+
+        if (slnDirectoryPath == null)
+        {
+            throw new Exception("Solution folder not found!");
+        }
+
+        return Path.Combine(slnDirectoryPath, "MyCompanyName.MyProjectName");
+    }
+
+    private string GetSolutionDirectoryPath()
+    {
+        var currentDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
+
+        while (Directory.GetParent(currentDirectory.FullName) != null)
+        {
+            currentDirectory = Directory.GetParent(currentDirectory.FullName);
+
+            if (Directory.GetFiles(currentDirectory.FullName).FirstOrDefault(f => f.EndsWith(".sln")) != null)
+            {
+                return currentDirectory.FullName;
+            }
+        }
+
+        return null;
+    }
 }