diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/Contracts/SqlCmdVariables/AddSqlCmdVariable.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/Contracts/SqlCmdVariables/AddSqlCmdVariable.cs index 633152be..88e3a285 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/Contracts/SqlCmdVariables/AddSqlCmdVariable.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/Contracts/SqlCmdVariables/AddSqlCmdVariable.cs @@ -24,11 +24,6 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlProjects.Contracts /// Default value of the SQLCMD variable /// public string DefaultValue { get; set; } - - /// - /// Value of the SQLCMD variable, with or without the $() - /// - public string Value { get; set; } } /// diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs index 253a9fa9..cccc077e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/SqlProjects/SqlProjectsService.cs @@ -458,7 +458,7 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlProjects internal async Task HandleAddSqlCmdVariableRequest(AddSqlCmdVariableParams requestParams, RequestContext requestContext) { - await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri!).SqlCmdVariables.Add(new SqlCmdVariable(requestParams.Name, requestParams.DefaultValue, requestParams.Value)), requestContext); + await RunWithErrorHandling(() => GetProject(requestParams.ProjectUri!).SqlCmdVariables.Add(new SqlCmdVariable(requestParams.Name, requestParams.DefaultValue)), requestContext); } internal async Task HandleDeleteSqlCmdVariableRequest(DeleteSqlCmdVariableParams requestParams, RequestContext requestContext) @@ -472,7 +472,7 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlProjects { SqlProject project = GetProject(requestParams.ProjectUri!); project.SqlCmdVariables.Delete(requestParams.Name); // idempotent (won't throw if doesn't exist) - project.SqlCmdVariables.Add(new SqlCmdVariable(requestParams.Name, requestParams.DefaultValue, requestParams.Value)); + project.SqlCmdVariables.Add(new SqlCmdVariable(requestParams.Name, requestParams.DefaultValue)); }, requestContext); } diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs index b004e9d5..1f53b387 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SqlProjects/SqlProjectsServiceTests.cs @@ -734,8 +734,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects { ProjectUri = projectUri, Name = variableName, - DefaultValue = "$(TestVarDefaultValue)", - Value = "$(TestVarValue)" + DefaultValue = "TestVarDefaultValue", }, requestMock.Object); requestMock.AssertSuccess(nameof(service.HandleAddSqlCmdVariableRequest)); @@ -754,8 +753,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects Assert.AreEqual(variableName, getMock.Result.SqlCmdVariables[0].VarName); // Validate updating a SQLCMD variable - const string updatedDefaultValue = "$(UpdatedDefaultValue)"; - const string updatedValue = "$(UpdatedValue)"; + const string updatedDefaultValue = "UpdatedDefaultValues"; requestMock = new(); await service.HandleUpdateSqlCmdVariableRequest(new AddSqlCmdVariableParams() @@ -763,13 +761,11 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SqlProjects ProjectUri = projectUri, Name = variableName, DefaultValue = updatedDefaultValue, - Value = updatedValue }, requestMock.Object); requestMock.AssertSuccess(nameof(service.HandleUpdateSqlCmdVariableRequest)); Assert.AreEqual(1, service.Projects[projectUri].SqlCmdVariables.Count, "Number of SQLCMD variables after update not as expected"); Assert.AreEqual(updatedDefaultValue, service.Projects[projectUri].SqlCmdVariables.First().DefaultValue, "Updated default value"); - Assert.AreEqual(updatedValue, service.Projects[projectUri].SqlCmdVariables.First().Value, "Updated value"); // Validate deleting a SQLCMD variable requestMock = new();