From f2641509c4b09b20f1a5da9a92026eff8afe288c Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 28 Dec 2020 14:17:32 +0300
Subject: [PATCH 1/2] Cli new command: change connection string by dbms

---
 .../Volo/Abp/Cli/Commands/NewCommand.cs       | 25 +++++++++++++++++++
 .../TemplateProjectBuildPipelineBuilder.cs    | 11 ++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
index 3bd8aecbc1..3b2666695e 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -150,6 +150,13 @@ namespace Volo.Abp.Cli.Commands
 
             Logger.LogInformation("Output folder: " + outputFolder);
 
+            if (connectionString == null &&
+                databaseManagementSystem != DatabaseManagementSystem.NotSpecified &&
+                databaseManagementSystem != DatabaseManagementSystem.SQLServer)
+            {
+                connectionString = GetNewConnectionStringByDbms(databaseManagementSystem, outputFolder);
+            }
+
             commandLineArgs.Options.Add(CliConsts.Command, commandLineArgs.Command);
 
             var result = await TemplateProjectBuilder.BuildAsync(
@@ -219,6 +226,24 @@ namespace Volo.Abp.Cli.Commands
             }
         }
 
+        private string GetNewConnectionStringByDbms(DatabaseManagementSystem databaseManagementSystem, string outputFolder)
+        {
+            switch (databaseManagementSystem)
+            {
+                case DatabaseManagementSystem.MySQL:
+                    return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;";
+                case DatabaseManagementSystem.PostgreSQL:
+                    return "User ID=root;Password=myPassword;Host=localhost;Port=5432;Database=MyProjectName;Pooling=true;Min Pool Size=0;Max Pool Size=100;Connection Lifetime=0;";
+                case DatabaseManagementSystem.Oracle:
+                case DatabaseManagementSystem.OracleDevart:
+                    return "Data Source=MyProjectName;Integrated Security=yes;";
+                case DatabaseManagementSystem.SQLite:
+                    return $"Data Source={Path.Combine(outputFolder,"database\\MyProjectName.db")};Version=3;";
+                default:
+                    return null;
+            }
+        }
+
         private void DeleteMigrationsIfNeeded(DatabaseProvider databaseProvider, DatabaseManagementSystem databaseManagementSystem, string outputFolder)
         {
             if (databaseManagementSystem == DatabaseManagementSystem.NotSpecified || databaseManagementSystem == DatabaseManagementSystem.SQLServer)
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
index 9590001ea4..513c2b4198 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateProjectBuildPipelineBuilder.cs
@@ -17,6 +17,12 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
 
             pipeline.Steps.Add(new ProjectReferenceReplaceStep());
             pipeline.Steps.Add(new TemplateCodeDeleteStep());
+
+            if (context.BuildArgs.ConnectionString != null)
+            {
+                pipeline.Steps.Add(new ConnectionStringChangeStep());
+            }
+
             pipeline.Steps.Add(new SolutionRenameStep());
 
             if (context.Template.Name == AppProTemplate.TemplateName ||
@@ -37,11 +43,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
                 pipeline.Steps.Add(new RemoveRootFolderStep());
             }
 
-            if (context.BuildArgs.ConnectionString != null)
-            {
-                pipeline.Steps.Add(new ConnectionStringChangeStep());
-            }
-
             pipeline.Steps.Add(new CreateProjectResultZipStep());
 
             return pipeline;

From cfa005fcd7265b32a0d0a8af97c35001b0966c00 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 28 Dec 2020 14:18:25 +0300
Subject: [PATCH 2/2] Update NewCommand.cs

---
 .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
index 3b2666695e..c4942d04ab 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -234,7 +234,7 @@ namespace Volo.Abp.Cli.Commands
                     return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;";
                 case DatabaseManagementSystem.PostgreSQL:
                     return "User ID=root;Password=myPassword;Host=localhost;Port=5432;Database=MyProjectName;Pooling=true;Min Pool Size=0;Max Pool Size=100;Connection Lifetime=0;";
-                case DatabaseManagementSystem.Oracle:
+                //case DatabaseManagementSystem.Oracle:
                 case DatabaseManagementSystem.OracleDevart:
                     return "Data Source=MyProjectName;Integrated Security=yes;";
                 case DatabaseManagementSystem.SQLite: