Skip to content

Commit fc4282b

Browse files
llalikburtram
authored andcommitted
fixed the issue with defualt values for options not loaded correctly (#581)
1 parent efd38be commit fc4282b

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptAsOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ public override bool? UniqueKeys
691691
/// <summary>
692692
/// Returns the value of ScriptIndexes Property
693693
/// </summary>
694-
public bool? DriIndexes { get { return ScriptOptions.ScriptIndexes; } }
694+
public bool? Indexes { get { return ScriptOptions.ScriptIndexes; } }
695695

696696

697697
/// <summary>

src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptAsScriptingOperation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public override void Execute()
7575
UrnCollection urns = CreateUrns(ServerConnection);
7676
ScriptingOptions options = new ScriptingOptions();
7777
SetScriptBehavior(options);
78-
PopulateAdvancedScriptOptions(this.Parameters.ScriptOptions, options);
78+
ScriptAsOptions scriptAsOptions = new ScriptAsOptions(this.Parameters.ScriptOptions);
79+
PopulateAdvancedScriptOptions(scriptAsOptions, options);
7980
options.WithDependencies = false;
8081
// TODO: Not including the header by default. We have to get this option from client
8182
options.IncludeHeaders = false;

test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Scripting/ScriptingServiceTests.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,25 @@ public async void ScriptingScript()
8989
[Fact]
9090
public async void VerifyScriptAsCreateTable()
9191
{
92-
string query = "CREATE TABLE testTable1 (c1 int)";
92+
string query = @"CREATE TABLE testTable1 (c1 int)
93+
GO
94+
CREATE CLUSTERED INDEX [ClusteredIndex-1] ON [dbo].[testTable1]
95+
(
96+
[c1] ASC
97+
)
98+
GO
99+
";
93100
ScriptingOperationType scriptCreateDrop = ScriptingOperationType.Create;
94101
ScriptingObject scriptingObject = new ScriptingObject
95102
{
96103
Name = "testTable1",
97104
Schema = "dbo",
98105
Type = "Table"
99106
};
100-
string expectedScript = "CREATE TABLE [dbo].[testTable1]";
107+
List<string> expectedScripts = new List<string> { "CREATE TABLE [dbo].[testTable1]", "CREATE CLUSTERED INDEX [ClusteredIndex-1] ON [dbo].[testTable1]" };
101108

102-
await VerifyScriptAs(query, scriptingObject, scriptCreateDrop, expectedScript);
109+
110+
await VerifyScriptAsForMultipleObjects(query, new List<ScriptingObject> { scriptingObject }, scriptCreateDrop, expectedScripts);
103111
}
104112

105113
[Fact]

0 commit comments

Comments
 (0)