Skip to content

Commit e0c845b

Browse files
authored
stop passing sqlcmd default values when launching dacpactool (#702)
fixes #701
1 parent a7871a2 commit e0c845b

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

src/DacpacTool/Extensions.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,8 @@ public static void AddSqlCmdVariables(this TSqlModel model, string[] variables)
256256

257257
var customData = Activator.CreateInstance(Type.GetType("Microsoft.Data.Tools.Schema.SchemaModel.CustomSchemaData, Microsoft.Data.Tools.Schema.Sql"), "SqlCmdVariables", "SqlCmdVariable");
258258

259-
foreach (var variable in variables)
259+
foreach (var variableName in variables)
260260
{
261-
var varWithValue = variable.Split('=', 2);
262-
var variableName = varWithValue[0];
263-
264261
Console.WriteLine($"Adding SqlCmd variable {variableName}");
265262

266263
var setMetadataMethod = customData.GetType().GetMethod("SetMetadata", BindingFlags.Public | BindingFlags.Instance);

src/MSBuild.Sdk.SqlProj/Sdk/Sdk.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<InputFileArguments>-i &quot;$(IntermediateOutputPath)$(MSBuildProjectName).InputFiles.txt&quot;</InputFileArguments>
225225
<BuildPropertyArguments>@(BuildPropertyNames->'-bp %(Identity)=%(PropertyValue)', ' ')</BuildPropertyArguments>
226226
<DeployPropertyArguments>@(DeployPropertyNames->'-dp %(Identity)=%(PropertyValue)', ' ')</DeployPropertyArguments>
227-
<SqlCmdVariableArguments>@(SqlCmdVariable->'-sc %(Identity)=&quot;%(DefaultValue)&quot;', ' ')</SqlCmdVariableArguments>
227+
<SqlCmdVariableArguments>@(SqlCmdVariable->'-sc %(Identity)', ' ')</SqlCmdVariableArguments>
228228
<PreDeploymentScriptArgument>@(PreDeploy->'--predeploy &quot;%(Identity)&quot;', ' ')</PreDeploymentScriptArgument>
229229
<PostDeploymentScriptArgument>@(PostDeploy->'--postdeploy &quot;%(Identity)&quot;', ' ')</PostDeploymentScriptArgument>
230230
<RefactorLogScriptArgument>@(RefactorLog->'--refactorlog &quot;%(Identity)&quot;', ' ')</RefactorLogScriptArgument>

test/DacpacTool.Tests/PackageBuilderTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ public void AddSqlCmdvariable()
245245
public void AddSqlCmdvariableWithDefaultValue()
246246
{
247247
// Arrange
248-
var first = "DbReader=dbReaderValue";
249-
var second = "DbWriter=dbWriterValue";
248+
var first = "DbReader";
249+
var second = "DbWriter";
250250
var tempFile = new FileInfo(Path.GetTempFileName());
251251
var packageBuilder = new PackageBuilder(new TestConsole());
252252
packageBuilder.SetMetadata("MyPackage", "1.0.0.0");

0 commit comments

Comments
 (0)