stop passing sqlcmd default values when launching dacpactool (#702)

fixes #701
rr-wfm · Jan 31, 2025 · e0c845b · e0c845b
1 parent a7871a2
commit e0c845b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/DacpacTool/Extensions.cs b/src/DacpacTool/Extensions.cs
@@ -256,11 +256,8 @@ public static void AddSqlCmdVariables(this TSqlModel model, string[] variables)
 
             var customData = Activator.CreateInstance(Type.GetType("Microsoft.Data.Tools.Schema.SchemaModel.CustomSchemaData, Microsoft.Data.Tools.Schema.Sql"), "SqlCmdVariables", "SqlCmdVariable");
 
-            foreach (var variable in variables)
+            foreach (var variableName in variables)
             {
-                var varWithValue = variable.Split('=', 2);
-                var variableName = varWithValue[0];
-
                 Console.WriteLine($"Adding SqlCmd variable {variableName}");
 
                 var setMetadataMethod = customData.GetType().GetMethod("SetMetadata", BindingFlags.Public | BindingFlags.Instance);

diff --git a/src/MSBuild.Sdk.SqlProj/Sdk/Sdk.targets b/src/MSBuild.Sdk.SqlProj/Sdk/Sdk.targets
@@ -224,7 +224,7 @@
       <InputFileArguments>-i &quot;$(IntermediateOutputPath)$(MSBuildProjectName).InputFiles.txt&quot;</InputFileArguments>
       <BuildPropertyArguments>@(BuildPropertyNames->'-bp %(Identity)=%(PropertyValue)', ' ')</BuildPropertyArguments>
       <DeployPropertyArguments>@(DeployPropertyNames->'-dp %(Identity)=%(PropertyValue)', ' ')</DeployPropertyArguments>
-      <SqlCmdVariableArguments>@(SqlCmdVariable->'-sc %(Identity)=&quot;%(DefaultValue)&quot;', ' ')</SqlCmdVariableArguments>
+      <SqlCmdVariableArguments>@(SqlCmdVariable->'-sc %(Identity)', ' ')</SqlCmdVariableArguments>
       <PreDeploymentScriptArgument>@(PreDeploy->'--predeploy &quot;%(Identity)&quot;', ' ')</PreDeploymentScriptArgument>
       <PostDeploymentScriptArgument>@(PostDeploy->'--postdeploy &quot;%(Identity)&quot;', ' ')</PostDeploymentScriptArgument>
       <RefactorLogScriptArgument>@(RefactorLog->'--refactorlog &quot;%(Identity)&quot;', ' ')</RefactorLogScriptArgument>

diff --git a/test/DacpacTool.Tests/PackageBuilderTests.cs b/test/DacpacTool.Tests/PackageBuilderTests.cs
@@ -245,8 +245,8 @@ public void AddSqlCmdvariable()
         public void AddSqlCmdvariableWithDefaultValue()
         {
             // Arrange
-            var first = "DbReader=dbReaderValue";
-            var second = "DbWriter=dbWriterValue";
+            var first = "DbReader";
+            var second = "DbWriter";
             var tempFile = new FileInfo(Path.GetTempFileName());
             var packageBuilder = new PackageBuilder(new TestConsole());
             packageBuilder.SetMetadata("MyPackage", "1.0.0.0");