From ee7235f6f68013ace98ed723f21cc72e5fc317fe Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Thu, 1 Aug 2024 08:47:48 +0200 Subject: [PATCH] add support for setting connection string key via options --- .../{DataApiBuilderBuilder => }/DabBuilder.cs | 8 ++++---- src/Core/efreveng60/Program.cs | 1 - src/GUI/RevEng.Shared/Dab/DataApiBuilderOptions.cs | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) rename src/Core/RevEng.Core.80/{DataApiBuilderBuilder => }/DabBuilder.cs (96%) diff --git a/src/Core/RevEng.Core.80/DataApiBuilderBuilder/DabBuilder.cs b/src/Core/RevEng.Core.80/DabBuilder.cs similarity index 96% rename from src/Core/RevEng.Core.80/DataApiBuilderBuilder/DabBuilder.cs rename to src/Core/RevEng.Core.80/DabBuilder.cs index 1fe56a226..5687204d7 100644 --- a/src/Core/RevEng.Core.80/DataApiBuilderBuilder/DabBuilder.cs +++ b/src/Core/RevEng.Core.80/DabBuilder.cs @@ -13,7 +13,7 @@ using RevEng.Core.Abstractions.Metadata; using RevEng.Core.Abstractions.Model; -namespace RevEng.Core.DataApiBuilderBuilder +namespace RevEng.Core { public class DabBuilder { @@ -47,7 +47,7 @@ public string GetDabConfigCmdFile() var fileName = Path.Combine(options.ProjectPath, "dab-config.cmd"); - string databaseType = string.Empty; + var databaseType = string.Empty; switch (options.DatabaseType) { @@ -86,7 +86,7 @@ public string GetDabConfigCmdFile() sb.AppendLine(CultureInfo.InvariantCulture, $"@echo This cmd file creates a Data API Builder configuration based on the chosen database objects."); sb.AppendLine(CultureInfo.InvariantCulture, $"@echo To run the cmd, create an .env file with the following contents:"); - sb.AppendLine(CultureInfo.InvariantCulture, $"@echo dab-connection-string=your connection string"); + sb.AppendLine(CultureInfo.InvariantCulture, $"@echo {options.ConnectionStringName}=your connection string"); sb.AppendLine(CultureInfo.InvariantCulture, $"@echo ** Make sure to exclude the .env file from source control **"); sb.AppendLine(CultureInfo.InvariantCulture, $"@echo **"); @@ -114,7 +114,7 @@ public string GetDabConfigCmdFile() if (dbObject.PrimaryKey != null) { - sb.AppendLine(CultureInfo.InvariantCulture, $"dab add \"{type}\" --source \"[{dbObject.Schema}].[{dbObject.Name}]\" --fields.include \"{columnList}\" --permissions \"anonymous:*\" "); + sb.AppendLine(CultureInfo.InvariantCulture, $"dab add \"{type}\" --source \"[{dbObject.Schema}].[{dbObject.Name}]\" --fields.include \"{columnList}\" --permissions \"anonymous:*\" "); } } diff --git a/src/Core/efreveng60/Program.cs b/src/Core/efreveng60/Program.cs index 05efc1879..8852fe141 100644 --- a/src/Core/efreveng60/Program.cs +++ b/src/Core/efreveng60/Program.cs @@ -14,7 +14,6 @@ #if NET8_0 using RevEng.Common.Dab; using RevEng.Core.DacpacReport; -using RevEng.Core.DataApiBuilderBuilder; #endif using RevEng.Core.Diagram; diff --git a/src/GUI/RevEng.Shared/Dab/DataApiBuilderOptions.cs b/src/GUI/RevEng.Shared/Dab/DataApiBuilderOptions.cs index f10ad5f62..7ab5f98ee 100644 --- a/src/GUI/RevEng.Shared/Dab/DataApiBuilderOptions.cs +++ b/src/GUI/RevEng.Shared/Dab/DataApiBuilderOptions.cs @@ -12,6 +12,9 @@ public class DataApiBuilderOptions public string ProjectPath { get; set; } public List Tables { get; set; } + public string Dacpac { get; set; } + + public string ConnectionStringName { get; set; } = "dab-connection-string"; } }