Skip to content

Commit 90788f6

Browse files
authored
Merge pull request #7 from EitanBlumin/codex/fix-sqlcmd-implementation-of-connection-options
Fix sqlcmd flags for security options
2 parents e491ece + 6f48fcb commit 90788f6

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

SqlcmdGuiApp/MainWindow.xaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,13 @@
4747
<StackPanel Orientation="Horizontal" Margin="0 2">
4848
<TextBlock Text="Encrypt:" Width="80"/>
4949
<ComboBox x:Name="EncryptComboBox" Width="200">
50-
<ComboBoxItem Content="Optional" IsSelected="True"/>
51-
<ComboBoxItem Content="Mandatory"/>
52-
<ComboBoxItem Content="Strict"/>
50+
<ComboBoxItem Content="true" IsSelected="True"/>
51+
<ComboBoxItem Content="false"/>
52+
<ComboBoxItem Content="disable"/>
5353
</ComboBox>
5454
</StackPanel>
5555
<CheckBox x:Name="TrustServerCertificateCheckBox" Content="Trust Server Certificate" Margin="0 2"/>
5656
<CheckBox x:Name="ReadOnlyIntentCheckBox" Content="ReadOnly Application Intent" Margin="0 2"/>
57-
<StackPanel Orientation="Horizontal" Margin="0 2">
58-
<TextBlock Text="Advanced:" Width="80"/>
59-
<TextBox x:Name="AdvancedOptionsTextBox" Width="200"/>
60-
</StackPanel>
6157
</StackPanel>
6258

6359
<GroupBox Header="Parameters" Grid.Row="2" Grid.ColumnSpan="2" Margin="0 5">

SqlcmdGuiApp/MainWindow.xaml.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,26 +104,21 @@ private void ExecuteButton_Click(object sender, RoutedEventArgs e)
104104
var encrypt = (EncryptComboBox.SelectedItem as ComboBoxItem)?.Content?.ToString()?.ToLower();
105105
if (!string.IsNullOrEmpty(encrypt))
106106
{
107-
psi.ArgumentList.Add("--encrypt");
107+
psi.ArgumentList.Add("-N");
108108
psi.ArgumentList.Add(encrypt);
109109
}
110110

111111
if (TrustServerCertificateCheckBox.IsChecked == true)
112112
{
113-
psi.ArgumentList.Add("--trust-server-certificate");
113+
psi.ArgumentList.Add("-C");
114114
}
115115

116116
if (ReadOnlyIntentCheckBox.IsChecked == true)
117117
{
118-
psi.ArgumentList.Add("--application-intent");
118+
psi.ArgumentList.Add("-K");
119119
psi.ArgumentList.Add("ReadOnly");
120120
}
121121

122-
if (!string.IsNullOrWhiteSpace(AdvancedOptionsTextBox.Text))
123-
{
124-
psi.ArgumentList.Add("--connection-string");
125-
psi.ArgumentList.Add(AdvancedOptionsTextBox.Text);
126-
}
127122

128123
foreach (var p in Parameters)
129124
{

0 commit comments

Comments
 (0)