From 5f8b40dfbd7050e382f8a313d9f904f8704a30a7 Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Fri, 2 Feb 2024 14:31:07 +0100 Subject: [PATCH] Update to SqlClient 5.1.5 fixes #150 --- src/SQLQueryStress/ConnectionInfo.cs | 6 + src/SQLQueryStress/DatabaseSelect.Designer.cs | 737 ++++++++++-------- src/SQLQueryStress/DatabaseSelect.cs | 20 +- src/SQLQueryStress/DatabaseSelect.resx | 60 ++ src/SQLQueryStress/SQLQueryStress.csproj | 2 +- src/SqlQueryStressCLI/sqlstresscmd.csproj | 2 +- 6 files changed, 478 insertions(+), 349 deletions(-) diff --git a/src/SQLQueryStress/ConnectionInfo.cs b/src/SQLQueryStress/ConnectionInfo.cs index a75ad40..b94a653 100644 --- a/src/SQLQueryStress/ConnectionInfo.cs +++ b/src/SQLQueryStress/ConnectionInfo.cs @@ -26,6 +26,9 @@ public class ConnectionInfo : ICloneable [DataMember] public string Server { get; set; } + [DataMember] + public SqlConnectionEncryptOption EncryptOption { get; set; } + [DataMember] public ApplicationIntent ApplicationIntent { get; set; } @@ -57,6 +60,7 @@ public ConnectionInfo() ConnectTimeout = 0; MaxPoolSize = 0; EnablePooling = true; + EncryptOption = SqlConnectionEncryptOption.Optional; } public ConnectionInfo(int connectTimeout, bool enablePooling, int maxPoolSize) : this() @@ -102,6 +106,7 @@ public string ConnectionString } build.Pooling = EnablePooling; + build.Encrypt = EncryptOption; return build.ConnectionString; } @@ -133,6 +138,7 @@ public void CopyTo(ConnectionInfo to) to.Password = Password; to.Database = Database; to.ApplicationIntent = ApplicationIntent; + to.EncryptOption = EncryptOption; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types")] diff --git a/src/SQLQueryStress/DatabaseSelect.Designer.cs b/src/SQLQueryStress/DatabaseSelect.Designer.cs index 2ca1f02..fb4b23b 100644 --- a/src/SQLQueryStress/DatabaseSelect.Designer.cs +++ b/src/SQLQueryStress/DatabaseSelect.Designer.cs @@ -28,441 +28,484 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.server_textBox = new System.Windows.Forms.TextBox(); - this.authentication_comboBox = new System.Windows.Forms.ComboBox(); - this.login_textBox = new System.Windows.Forms.TextBox(); - this.password_textBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.cancel_button = new System.Windows.Forms.Button(); - this.test_button = new System.Windows.Forms.Button(); - this.ok_button = new System.Windows.Forms.Button(); - this.db_comboBox = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.appintent_combo = new System.Windows.Forms.ComboBox(); - this.appintent_check = new System.Windows.Forms.CheckBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.pm_test_button = new System.Windows.Forms.Button(); - this.shareSettings_checkBox = new System.Windows.Forms.CheckBox(); - this.pm_db_comboBox = new System.Windows.Forms.ComboBox(); - this.label6 = new System.Windows.Forms.Label(); - this.pm_password_textBox = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.pm_server_textBox = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.pm_login_textBox = new System.Windows.Forms.TextBox(); - this.pm_authentication_comboBox = new System.Windows.Forms.ComboBox(); - this.label10 = new System.Windows.Forms.Label(); - this.pm_appintent_combo = new System.Windows.Forms.ComboBox(); - this.pm_appintent_check = new System.Windows.Forms.CheckBox(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.SuspendLayout(); + label1 = new System.Windows.Forms.Label(); + server_textBox = new System.Windows.Forms.TextBox(); + authentication_comboBox = new System.Windows.Forms.ComboBox(); + login_textBox = new System.Windows.Forms.TextBox(); + password_textBox = new System.Windows.Forms.TextBox(); + label2 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); + cancel_button = new System.Windows.Forms.Button(); + test_button = new System.Windows.Forms.Button(); + ok_button = new System.Windows.Forms.Button(); + db_comboBox = new System.Windows.Forms.ComboBox(); + label5 = new System.Windows.Forms.Label(); + groupBox1 = new System.Windows.Forms.GroupBox(); + encrypt_Combo = new System.Windows.Forms.ComboBox(); + label11 = new System.Windows.Forms.Label(); + appintent_combo = new System.Windows.Forms.ComboBox(); + appintent_check = new System.Windows.Forms.CheckBox(); + groupBox2 = new System.Windows.Forms.GroupBox(); + pm_encrypt_Combo = new System.Windows.Forms.ComboBox(); + label12 = new System.Windows.Forms.Label(); + pm_appintent_combo = new System.Windows.Forms.ComboBox(); + pm_appintent_check = new System.Windows.Forms.CheckBox(); + pm_test_button = new System.Windows.Forms.Button(); + shareSettings_checkBox = new System.Windows.Forms.CheckBox(); + pm_db_comboBox = new System.Windows.Forms.ComboBox(); + label6 = new System.Windows.Forms.Label(); + pm_password_textBox = new System.Windows.Forms.TextBox(); + label7 = new System.Windows.Forms.Label(); + pm_server_textBox = new System.Windows.Forms.TextBox(); + label8 = new System.Windows.Forms.Label(); + label9 = new System.Windows.Forms.Label(); + pm_login_textBox = new System.Windows.Forms.TextBox(); + pm_authentication_comboBox = new System.Windows.Forms.ComboBox(); + label10 = new System.Windows.Forms.Label(); + groupBox1.SuspendLayout(); + groupBox2.SuspendLayout(); + SuspendLayout(); // // label1 // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(9, 60); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(64, 20); - this.label1.TabIndex = 0; - this.label1.Text = "Server"; + label1.AutoSize = true; + label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label1.Location = new System.Drawing.Point(10, 75); + label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(64, 20); + label1.TabIndex = 0; + label1.Text = "Server"; // // server_textBox // - this.server_textBox.Location = new System.Drawing.Point(14, 85); - this.server_textBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.server_textBox.Name = "server_textBox"; - this.server_textBox.Size = new System.Drawing.Size(344, 26); - this.server_textBox.TabIndex = 0; + server_textBox.Location = new System.Drawing.Point(16, 106); + server_textBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + server_textBox.Name = "server_textBox"; + server_textBox.Size = new System.Drawing.Size(382, 31); + server_textBox.TabIndex = 0; // // authentication_comboBox // - this.authentication_comboBox.FormattingEnabled = true; - this.authentication_comboBox.Items.AddRange(new object[] { - "Integrated Authentication", - "SQL Server Authentication", - "Azure Active Directory - Universal with MFA"}); - this.authentication_comboBox.Location = new System.Drawing.Point(14, 145); - this.authentication_comboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.authentication_comboBox.Name = "authentication_comboBox"; - this.authentication_comboBox.Size = new System.Drawing.Size(344, 28); - this.authentication_comboBox.TabIndex = 1; + authentication_comboBox.FormattingEnabled = true; + authentication_comboBox.Items.AddRange(new object[] { "Integrated Authentication", "SQL Server Authentication", "Azure Active Directory - Universal with MFA" }); + authentication_comboBox.Location = new System.Drawing.Point(16, 181); + authentication_comboBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + authentication_comboBox.Name = "authentication_comboBox"; + authentication_comboBox.Size = new System.Drawing.Size(382, 33); + authentication_comboBox.TabIndex = 1; // // login_textBox // - this.login_textBox.Location = new System.Drawing.Point(14, 206); - this.login_textBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.login_textBox.Name = "login_textBox"; - this.login_textBox.Size = new System.Drawing.Size(344, 26); - this.login_textBox.TabIndex = 2; + login_textBox.Location = new System.Drawing.Point(16, 258); + login_textBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + login_textBox.Name = "login_textBox"; + login_textBox.Size = new System.Drawing.Size(382, 31); + login_textBox.TabIndex = 2; // // password_textBox // - this.password_textBox.Location = new System.Drawing.Point(14, 266); - this.password_textBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.password_textBox.Name = "password_textBox"; - this.password_textBox.Size = new System.Drawing.Size(344, 26); - this.password_textBox.TabIndex = 3; - this.password_textBox.UseSystemPasswordChar = true; + password_textBox.Location = new System.Drawing.Point(16, 332); + password_textBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + password_textBox.Name = "password_textBox"; + password_textBox.Size = new System.Drawing.Size(382, 31); + password_textBox.TabIndex = 3; + password_textBox.UseSystemPasswordChar = true; // // label2 // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(14, 242); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(91, 20); - this.label2.TabIndex = 5; - this.label2.Text = "Password"; + label2.AutoSize = true; + label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label2.Location = new System.Drawing.Point(16, 302); + label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(91, 20); + label2.TabIndex = 5; + label2.Text = "Password"; // // label3 // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(9, 182); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(55, 20); - this.label3.TabIndex = 6; - this.label3.Text = "Login"; + label3.AutoSize = true; + label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label3.Location = new System.Drawing.Point(10, 228); + label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(55, 20); + label3.TabIndex = 6; + label3.Text = "Login"; // // label4 // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(9, 120); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(129, 20); - this.label4.TabIndex = 7; - this.label4.Text = "Authentication"; + label4.AutoSize = true; + label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label4.Location = new System.Drawing.Point(10, 150); + label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(129, 20); + label4.TabIndex = 7; + label4.Text = "Authentication"; // // cancel_button // - this.cancel_button.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancel_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cancel_button.Location = new System.Drawing.Point(645, 505); - this.cancel_button.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cancel_button.Name = "cancel_button"; - this.cancel_button.Size = new System.Drawing.Size(120, 35); - this.cancel_button.TabIndex = 3; - this.cancel_button.Text = "Cancel"; - this.cancel_button.UseVisualStyleBackColor = true; - this.cancel_button.Click += new System.EventHandler(this.cancel_button_Click); + cancel_button.DialogResult = System.Windows.Forms.DialogResult.Cancel; + cancel_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + cancel_button.Location = new System.Drawing.Point(717, 724); + cancel_button.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + cancel_button.Name = "cancel_button"; + cancel_button.Size = new System.Drawing.Size(133, 44); + cancel_button.TabIndex = 3; + cancel_button.Text = "Cancel"; + cancel_button.UseVisualStyleBackColor = true; + cancel_button.Click += cancel_button_Click; // // test_button // - this.test_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.test_button.Location = new System.Drawing.Point(178, 430); - this.test_button.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.test_button.Name = "test_button"; - this.test_button.Size = new System.Drawing.Size(180, 35); - this.test_button.TabIndex = 5; - this.test_button.Text = "Test Connection"; - this.test_button.UseVisualStyleBackColor = true; - this.test_button.Click += new System.EventHandler(this.test_button_Click); + test_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + test_button.Location = new System.Drawing.Point(202, 619); + test_button.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + test_button.Name = "test_button"; + test_button.Size = new System.Drawing.Size(200, 44); + test_button.TabIndex = 5; + test_button.Text = "Test Connection"; + test_button.UseVisualStyleBackColor = true; + test_button.Click += test_button_Click; // // ok_button // - this.ok_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ok_button.Location = new System.Drawing.Point(517, 505); - this.ok_button.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.ok_button.Name = "ok_button"; - this.ok_button.Size = new System.Drawing.Size(120, 35); - this.ok_button.TabIndex = 2; - this.ok_button.Text = "OK"; - this.ok_button.UseVisualStyleBackColor = true; - this.ok_button.Click += new System.EventHandler(this.ok_button_Click); + ok_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + ok_button.Location = new System.Drawing.Point(573, 724); + ok_button.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + ok_button.Name = "ok_button"; + ok_button.Size = new System.Drawing.Size(133, 44); + ok_button.TabIndex = 2; + ok_button.Text = "OK"; + ok_button.UseVisualStyleBackColor = true; + ok_button.Click += ok_button_Click; // // db_comboBox // - this.db_comboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.db_comboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.db_comboBox.FormattingEnabled = true; - this.db_comboBox.Location = new System.Drawing.Point(14, 326); - this.db_comboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.db_comboBox.Name = "db_comboBox"; - this.db_comboBox.Size = new System.Drawing.Size(344, 28); - this.db_comboBox.TabIndex = 4; + db_comboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + db_comboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + db_comboBox.FormattingEnabled = true; + db_comboBox.Location = new System.Drawing.Point(16, 408); + db_comboBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + db_comboBox.Name = "db_comboBox"; + db_comboBox.Size = new System.Drawing.Size(382, 33); + db_comboBox.TabIndex = 4; // // label5 // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(9, 302); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(156, 20); - this.label5.TabIndex = 12; - this.label5.Text = "Default Database"; + label5.AutoSize = true; + label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label5.Location = new System.Drawing.Point(10, 378); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(156, 20); + label5.TabIndex = 12; + label5.Text = "Default Database"; // // groupBox1 // - this.groupBox1.Controls.Add(this.appintent_combo); - this.groupBox1.Controls.Add(this.appintent_check); - this.groupBox1.Controls.Add(this.db_comboBox); - this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.password_textBox); - this.groupBox1.Controls.Add(this.test_button); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.server_textBox); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Controls.Add(this.login_textBox); - this.groupBox1.Controls.Add(this.authentication_comboBox); - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Location = new System.Drawing.Point(18, 18); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Size = new System.Drawing.Size(369, 477); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Main Load Settings"; + groupBox1.Controls.Add(encrypt_Combo); + groupBox1.Controls.Add(label11); + groupBox1.Controls.Add(appintent_combo); + groupBox1.Controls.Add(appintent_check); + groupBox1.Controls.Add(db_comboBox); + groupBox1.Controls.Add(label5); + groupBox1.Controls.Add(password_textBox); + groupBox1.Controls.Add(test_button); + groupBox1.Controls.Add(label2); + groupBox1.Controls.Add(server_textBox); + groupBox1.Controls.Add(label1); + groupBox1.Controls.Add(label4); + groupBox1.Controls.Add(login_textBox); + groupBox1.Controls.Add(authentication_comboBox); + groupBox1.Controls.Add(label3); + groupBox1.Location = new System.Drawing.Point(20, 22); + groupBox1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + groupBox1.Name = "groupBox1"; + groupBox1.Padding = new System.Windows.Forms.Padding(4, 6, 4, 6); + groupBox1.Size = new System.Drawing.Size(410, 675); + groupBox1.TabIndex = 0; + groupBox1.TabStop = false; + groupBox1.Text = "Main Load Settings"; + // + // encrypt_Combo + // + encrypt_Combo.FormattingEnabled = true; + encrypt_Combo.Items.AddRange(new object[] { "False", "True", "Strict" }); + encrypt_Combo.Location = new System.Drawing.Point(16, 565); + encrypt_Combo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + encrypt_Combo.Name = "encrypt_Combo"; + encrypt_Combo.Size = new System.Drawing.Size(382, 33); + encrypt_Combo.TabIndex = 17; + // + // label11 + // + label11.AutoSize = true; + label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label11.Location = new System.Drawing.Point(10, 532); + label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label11.Name = "label11"; + label11.Size = new System.Drawing.Size(73, 20); + label11.TabIndex = 16; + label11.Text = "Encrypt"; // // appintent_combo // - this.appintent_combo.Enabled = false; - this.appintent_combo.FormattingEnabled = true; - this.appintent_combo.Items.AddRange(new object[] { - "ReadWrite ", - "ReadOnly"}); - this.appintent_combo.Location = new System.Drawing.Point(14, 394); - this.appintent_combo.Name = "appintent_combo"; - this.appintent_combo.Size = new System.Drawing.Size(344, 28); - this.appintent_combo.TabIndex = 14; + appintent_combo.Enabled = false; + appintent_combo.FormattingEnabled = true; + appintent_combo.Items.AddRange(new object[] { "ReadWrite ", "ReadOnly" }); + appintent_combo.Location = new System.Drawing.Point(16, 492); + appintent_combo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + appintent_combo.Name = "appintent_combo"; + appintent_combo.Size = new System.Drawing.Size(382, 33); + appintent_combo.TabIndex = 14; // // appintent_check // - this.appintent_check.AutoSize = true; - this.appintent_check.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.appintent_check.Location = new System.Drawing.Point(14, 363); - this.appintent_check.Name = "appintent_check"; - this.appintent_check.Size = new System.Drawing.Size(177, 24); - this.appintent_check.TabIndex = 13; - this.appintent_check.Text = "Application Intent"; - this.appintent_check.UseVisualStyleBackColor = true; - this.appintent_check.CheckedChanged += new System.EventHandler(this.appintent_check_CheckedChanged); + appintent_check.AutoSize = true; + appintent_check.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + appintent_check.Location = new System.Drawing.Point(16, 454); + appintent_check.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + appintent_check.Name = "appintent_check"; + appintent_check.Size = new System.Drawing.Size(177, 24); + appintent_check.TabIndex = 13; + appintent_check.Text = "Application Intent"; + appintent_check.UseVisualStyleBackColor = true; + appintent_check.CheckedChanged += appintent_check_CheckedChanged; // // groupBox2 // - this.groupBox2.Controls.Add(this.pm_appintent_combo); - this.groupBox2.Controls.Add(this.pm_appintent_check); - this.groupBox2.Controls.Add(this.pm_test_button); - this.groupBox2.Controls.Add(this.shareSettings_checkBox); - this.groupBox2.Controls.Add(this.pm_db_comboBox); - this.groupBox2.Controls.Add(this.label6); - this.groupBox2.Controls.Add(this.pm_password_textBox); - this.groupBox2.Controls.Add(this.label7); - this.groupBox2.Controls.Add(this.pm_server_textBox); - this.groupBox2.Controls.Add(this.label8); - this.groupBox2.Controls.Add(this.label9); - this.groupBox2.Controls.Add(this.pm_login_textBox); - this.groupBox2.Controls.Add(this.pm_authentication_comboBox); - this.groupBox2.Controls.Add(this.label10); - this.groupBox2.Location = new System.Drawing.Point(396, 18); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox2.Size = new System.Drawing.Size(369, 477); - this.groupBox2.TabIndex = 1; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Parameterization Settings"; + groupBox2.Controls.Add(pm_encrypt_Combo); + groupBox2.Controls.Add(label12); + groupBox2.Controls.Add(pm_appintent_combo); + groupBox2.Controls.Add(pm_appintent_check); + groupBox2.Controls.Add(pm_test_button); + groupBox2.Controls.Add(shareSettings_checkBox); + groupBox2.Controls.Add(pm_db_comboBox); + groupBox2.Controls.Add(label6); + groupBox2.Controls.Add(pm_password_textBox); + groupBox2.Controls.Add(label7); + groupBox2.Controls.Add(pm_server_textBox); + groupBox2.Controls.Add(label8); + groupBox2.Controls.Add(label9); + groupBox2.Controls.Add(pm_login_textBox); + groupBox2.Controls.Add(pm_authentication_comboBox); + groupBox2.Controls.Add(label10); + groupBox2.Location = new System.Drawing.Point(440, 22); + groupBox2.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + groupBox2.Name = "groupBox2"; + groupBox2.Padding = new System.Windows.Forms.Padding(4, 6, 4, 6); + groupBox2.Size = new System.Drawing.Size(410, 675); + groupBox2.TabIndex = 1; + groupBox2.TabStop = false; + groupBox2.Text = "Parameterization Settings"; + // + // pm_encrypt_Combo + // + pm_encrypt_Combo.FormattingEnabled = true; + pm_encrypt_Combo.Items.AddRange(new object[] { "Optional", "Mandatory", "Strict" }); + pm_encrypt_Combo.Location = new System.Drawing.Point(14, 565); + pm_encrypt_Combo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + pm_encrypt_Combo.Name = "pm_encrypt_Combo"; + pm_encrypt_Combo.Size = new System.Drawing.Size(382, 33); + pm_encrypt_Combo.TabIndex = 18; + // + // label12 + // + label12.AutoSize = true; + label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label12.Location = new System.Drawing.Point(11, 533); + label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label12.Name = "label12"; + label12.Size = new System.Drawing.Size(73, 20); + label12.TabIndex = 18; + label12.Text = "Encrypt"; + // + // pm_appintent_combo + // + pm_appintent_combo.Enabled = false; + pm_appintent_combo.FormattingEnabled = true; + pm_appintent_combo.Items.AddRange(new object[] { "ReadWrite ", "ReadOnly" }); + pm_appintent_combo.Location = new System.Drawing.Point(14, 492); + pm_appintent_combo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + pm_appintent_combo.Name = "pm_appintent_combo"; + pm_appintent_combo.Size = new System.Drawing.Size(382, 33); + pm_appintent_combo.TabIndex = 16; + // + // pm_appintent_check + // + pm_appintent_check.AutoSize = true; + pm_appintent_check.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + pm_appintent_check.Location = new System.Drawing.Point(14, 454); + pm_appintent_check.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + pm_appintent_check.Name = "pm_appintent_check"; + pm_appintent_check.Size = new System.Drawing.Size(177, 24); + pm_appintent_check.TabIndex = 15; + pm_appintent_check.Text = "Application Intent"; + pm_appintent_check.UseVisualStyleBackColor = true; + pm_appintent_check.CheckedChanged += pm_appintent_check_CheckedChanged; // // pm_test_button // - this.pm_test_button.Enabled = false; - this.pm_test_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.pm_test_button.Location = new System.Drawing.Point(177, 430); - this.pm_test_button.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pm_test_button.Name = "pm_test_button"; - this.pm_test_button.Size = new System.Drawing.Size(180, 35); - this.pm_test_button.TabIndex = 5; - this.pm_test_button.Text = "Test Connection"; - this.pm_test_button.UseVisualStyleBackColor = true; - this.pm_test_button.Click += new System.EventHandler(this.pm_test_button_Click); + pm_test_button.Enabled = false; + pm_test_button.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + pm_test_button.Location = new System.Drawing.Point(196, 619); + pm_test_button.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + pm_test_button.Name = "pm_test_button"; + pm_test_button.Size = new System.Drawing.Size(200, 44); + pm_test_button.TabIndex = 5; + pm_test_button.Text = "Test Connection"; + pm_test_button.UseVisualStyleBackColor = true; + pm_test_button.Click += pm_test_button_Click; // // shareSettings_checkBox // - this.shareSettings_checkBox.AutoSize = true; - this.shareSettings_checkBox.Checked = true; - this.shareSettings_checkBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.shareSettings_checkBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.shareSettings_checkBox.Location = new System.Drawing.Point(18, 29); - this.shareSettings_checkBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.shareSettings_checkBox.Name = "shareSettings_checkBox"; - this.shareSettings_checkBox.Size = new System.Drawing.Size(259, 24); - this.shareSettings_checkBox.TabIndex = 13; - this.shareSettings_checkBox.Text = "Share Connection Settings"; - this.shareSettings_checkBox.UseVisualStyleBackColor = true; - this.shareSettings_checkBox.CheckedChanged += new System.EventHandler(this.shareSettings_checkBox_CheckedChanged); + shareSettings_checkBox.AutoSize = true; + shareSettings_checkBox.Checked = true; + shareSettings_checkBox.CheckState = System.Windows.Forms.CheckState.Checked; + shareSettings_checkBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + shareSettings_checkBox.Location = new System.Drawing.Point(20, 36); + shareSettings_checkBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + shareSettings_checkBox.Name = "shareSettings_checkBox"; + shareSettings_checkBox.Size = new System.Drawing.Size(259, 24); + shareSettings_checkBox.TabIndex = 13; + shareSettings_checkBox.Text = "Share Connection Settings"; + shareSettings_checkBox.UseVisualStyleBackColor = true; + shareSettings_checkBox.CheckedChanged += shareSettings_checkBox_CheckedChanged; // // pm_db_comboBox // - this.pm_db_comboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.pm_db_comboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.pm_db_comboBox.Enabled = false; - this.pm_db_comboBox.FormattingEnabled = true; - this.pm_db_comboBox.Location = new System.Drawing.Point(14, 326); - this.pm_db_comboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pm_db_comboBox.Name = "pm_db_comboBox"; - this.pm_db_comboBox.Size = new System.Drawing.Size(344, 28); - this.pm_db_comboBox.TabIndex = 4; + pm_db_comboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + pm_db_comboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + pm_db_comboBox.Enabled = false; + pm_db_comboBox.FormattingEnabled = true; + pm_db_comboBox.Location = new System.Drawing.Point(16, 408); + pm_db_comboBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + pm_db_comboBox.Name = "pm_db_comboBox"; + pm_db_comboBox.Size = new System.Drawing.Size(382, 33); + pm_db_comboBox.TabIndex = 4; // // label6 // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(9, 302); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(156, 20); - this.label6.TabIndex = 12; - this.label6.Text = "Default Database"; + label6.AutoSize = true; + label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label6.Location = new System.Drawing.Point(10, 378); + label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(156, 20); + label6.TabIndex = 12; + label6.Text = "Default Database"; // // pm_password_textBox // - this.pm_password_textBox.Enabled = false; - this.pm_password_textBox.Location = new System.Drawing.Point(14, 266); - this.pm_password_textBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pm_password_textBox.Name = "pm_password_textBox"; - this.pm_password_textBox.Size = new System.Drawing.Size(344, 26); - this.pm_password_textBox.TabIndex = 3; - this.pm_password_textBox.UseSystemPasswordChar = true; + pm_password_textBox.Enabled = false; + pm_password_textBox.Location = new System.Drawing.Point(16, 332); + pm_password_textBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + pm_password_textBox.Name = "pm_password_textBox"; + pm_password_textBox.Size = new System.Drawing.Size(382, 31); + pm_password_textBox.TabIndex = 3; + pm_password_textBox.UseSystemPasswordChar = true; // // label7 // - this.label7.AutoSize = true; - this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(14, 242); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(91, 20); - this.label7.TabIndex = 5; - this.label7.Text = "Password"; + label7.AutoSize = true; + label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label7.Location = new System.Drawing.Point(16, 302); + label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(91, 20); + label7.TabIndex = 5; + label7.Text = "Password"; // // pm_server_textBox // - this.pm_server_textBox.Enabled = false; - this.pm_server_textBox.Location = new System.Drawing.Point(14, 85); - this.pm_server_textBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pm_server_textBox.Name = "pm_server_textBox"; - this.pm_server_textBox.Size = new System.Drawing.Size(344, 26); - this.pm_server_textBox.TabIndex = 0; + pm_server_textBox.Enabled = false; + pm_server_textBox.Location = new System.Drawing.Point(16, 106); + pm_server_textBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + pm_server_textBox.Name = "pm_server_textBox"; + pm_server_textBox.Size = new System.Drawing.Size(382, 31); + pm_server_textBox.TabIndex = 0; // // label8 // - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(9, 60); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(64, 20); - this.label8.TabIndex = 0; - this.label8.Text = "Server"; + label8.AutoSize = true; + label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label8.Location = new System.Drawing.Point(10, 75); + label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(64, 20); + label8.TabIndex = 0; + label8.Text = "Server"; // // label9 // - this.label9.AutoSize = true; - this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(9, 120); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(129, 20); - this.label9.TabIndex = 7; - this.label9.Text = "Authentication"; + label9.AutoSize = true; + label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label9.Location = new System.Drawing.Point(10, 150); + label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(129, 20); + label9.TabIndex = 7; + label9.Text = "Authentication"; // // pm_login_textBox // - this.pm_login_textBox.Enabled = false; - this.pm_login_textBox.Location = new System.Drawing.Point(14, 206); - this.pm_login_textBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pm_login_textBox.Name = "pm_login_textBox"; - this.pm_login_textBox.Size = new System.Drawing.Size(344, 26); - this.pm_login_textBox.TabIndex = 2; + pm_login_textBox.Enabled = false; + pm_login_textBox.Location = new System.Drawing.Point(16, 258); + pm_login_textBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + pm_login_textBox.Name = "pm_login_textBox"; + pm_login_textBox.Size = new System.Drawing.Size(382, 31); + pm_login_textBox.TabIndex = 2; // // pm_authentication_comboBox // - this.pm_authentication_comboBox.Enabled = false; - this.pm_authentication_comboBox.FormattingEnabled = true; - this.pm_authentication_comboBox.Items.AddRange(new object[] { - "Integrated Authentication", - "SQL Server Authentication", - "Azure Active Directory - Universal with MFA"}); - this.pm_authentication_comboBox.Location = new System.Drawing.Point(14, 145); - this.pm_authentication_comboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.pm_authentication_comboBox.Name = "pm_authentication_comboBox"; - this.pm_authentication_comboBox.Size = new System.Drawing.Size(344, 28); - this.pm_authentication_comboBox.TabIndex = 1; + pm_authentication_comboBox.Enabled = false; + pm_authentication_comboBox.FormattingEnabled = true; + pm_authentication_comboBox.Items.AddRange(new object[] { "Integrated Authentication", "SQL Server Authentication", "Azure Active Directory - Universal with MFA" }); + pm_authentication_comboBox.Location = new System.Drawing.Point(16, 181); + pm_authentication_comboBox.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + pm_authentication_comboBox.Name = "pm_authentication_comboBox"; + pm_authentication_comboBox.Size = new System.Drawing.Size(382, 33); + pm_authentication_comboBox.TabIndex = 1; // // label10 // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(9, 182); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(55, 20); - this.label10.TabIndex = 6; - this.label10.Text = "Login"; - // - // pm_appintent_combo - // - this.pm_appintent_combo.Enabled = false; - this.pm_appintent_combo.FormattingEnabled = true; - this.pm_appintent_combo.Items.AddRange(new object[] { - "ReadWrite ", - "ReadOnly"}); - this.pm_appintent_combo.Location = new System.Drawing.Point(13, 394); - this.pm_appintent_combo.Name = "pm_appintent_combo"; - this.pm_appintent_combo.Size = new System.Drawing.Size(344, 28); - this.pm_appintent_combo.TabIndex = 16; - // - // pm_appintent_check - // - this.pm_appintent_check.AutoSize = true; - this.pm_appintent_check.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.pm_appintent_check.Location = new System.Drawing.Point(13, 363); - this.pm_appintent_check.Name = "pm_appintent_check"; - this.pm_appintent_check.Size = new System.Drawing.Size(177, 24); - this.pm_appintent_check.TabIndex = 15; - this.pm_appintent_check.Text = "Application Intent"; - this.pm_appintent_check.UseVisualStyleBackColor = true; - this.pm_appintent_check.CheckedChanged += new System.EventHandler(this.pm_appintent_check_CheckedChanged); + label10.AutoSize = true; + label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); + label10.Location = new System.Drawing.Point(10, 228); + label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(55, 20); + label10.TabIndex = 6; + label10.Text = "Login"; // // DatabaseSelect // - this.AcceptButton = this.ok_button; - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.cancel_button; - this.ClientSize = new System.Drawing.Size(786, 556); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.ok_button); - this.Controls.Add(this.cancel_button); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "DatabaseSelect"; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.Text = "Database Select"; - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.ResumeLayout(false); - + AcceptButton = ok_button; + AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + CancelButton = cancel_button; + ClientSize = new System.Drawing.Size(873, 783); + Controls.Add(groupBox2); + Controls.Add(groupBox1); + Controls.Add(ok_button); + Controls.Add(cancel_button); + FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + MaximizeBox = false; + MinimizeBox = false; + Name = "DatabaseSelect"; + ShowIcon = false; + ShowInTaskbar = false; + Text = "Database Select"; + groupBox1.ResumeLayout(false); + groupBox1.PerformLayout(); + groupBox2.ResumeLayout(false); + groupBox2.PerformLayout(); + ResumeLayout(false); } #endregion @@ -498,5 +541,9 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox appintent_combo; private System.Windows.Forms.ComboBox pm_appintent_combo; private System.Windows.Forms.CheckBox pm_appintent_check; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.ComboBox encrypt_Combo; + private System.Windows.Forms.ComboBox pm_encrypt_Combo; + private System.Windows.Forms.Label label12; } } \ No newline at end of file diff --git a/src/SQLQueryStress/DatabaseSelect.cs b/src/SQLQueryStress/DatabaseSelect.cs index 8149feb..a0c107a 100644 --- a/src/SQLQueryStress/DatabaseSelect.cs +++ b/src/SQLQueryStress/DatabaseSelect.cs @@ -30,9 +30,14 @@ public DatabaseSelect(QueryStressSettings settings) server_textBox.Text = _localMainConnectionInfo.Server; + if (SqlConnectionEncryptOption.TryParse(_localMainConnectionInfo.EncryptOption.ToString(), out SqlConnectionEncryptOption encrypt)) + { + encrypt_Combo.SelectedItem = encrypt.ToString(); + } + if (!_localMainConnectionInfo.RequiresPassword) { - authentication_comboBox.SelectedIndex = _localMainConnectionInfo.IntegratedAuth ? 0 : 2; + authentication_comboBox.SelectedIndex = _localMainConnectionInfo.IntegratedAuth ? 0 : 2; login_textBox.Enabled = false; password_textBox.Enabled = false; } @@ -58,6 +63,7 @@ public DatabaseSelect(QueryStressSettings settings) if (!settings.ShareDbSettings) { pm_server_textBox.Text = _localParamConnectionInfo.Server; + pm_encrypt_Combo.SelectedText = _localParamConnectionInfo.EncryptOption.ToString(); if (!_localParamConnectionInfo.RequiresPassword) { @@ -274,6 +280,11 @@ private void pm_saveLocalSettings() _localParamConnectionInfo.IntegratedAuth = pm_authentication_comboBox.SelectedIndex == 0; _localParamConnectionInfo.AzureMFA = pm_authentication_comboBox.SelectedIndex == 2; + if (SqlConnectionEncryptOption.TryParse(pm_encrypt_Combo.Text, out SqlConnectionEncryptOption encrypt)) + { + _localParamConnectionInfo.EncryptOption = encrypt; + } + if (!_localParamConnectionInfo.RequiresPassword && !_localParamConnectionInfo.AzureMFA) { _localParamConnectionInfo.Login = string.Empty; @@ -315,6 +326,12 @@ private void SaveLocalSettings() { _localMainConnectionInfo.Server = server_textBox.Text; _localMainConnectionInfo.IntegratedAuth = authentication_comboBox.SelectedIndex == 0; + + if (SqlConnectionEncryptOption.TryParse(encrypt_Combo.Text, out SqlConnectionEncryptOption encrypt)) + { + _localMainConnectionInfo.EncryptOption = encrypt; + } + _localMainConnectionInfo.AzureMFA = authentication_comboBox.SelectedIndex == 2; if (!_localMainConnectionInfo.RequiresPassword && !_localMainConnectionInfo.AzureMFA) @@ -335,7 +352,6 @@ private void SaveLocalSettings() if (appintent_check.Checked) { - _ = Enum.TryParse(appintent_combo.Text, out ApplicationIntent applicationIntent); _localMainConnectionInfo.ApplicationIntent = applicationIntent; diff --git a/src/SQLQueryStress/DatabaseSelect.resx b/src/SQLQueryStress/DatabaseSelect.resx index 6dae11d..25bdb3a 100644 --- a/src/SQLQueryStress/DatabaseSelect.resx +++ b/src/SQLQueryStress/DatabaseSelect.resx @@ -1,4 +1,64 @@ + + diff --git a/src/SQLQueryStress/SQLQueryStress.csproj b/src/SQLQueryStress/SQLQueryStress.csproj index 8a5ab30..1e9dc23 100644 --- a/src/SQLQueryStress/SQLQueryStress.csproj +++ b/src/SQLQueryStress/SQLQueryStress.csproj @@ -110,6 +110,6 @@ - + \ No newline at end of file diff --git a/src/SqlQueryStressCLI/sqlstresscmd.csproj b/src/SqlQueryStressCLI/sqlstresscmd.csproj index b2a4fe9..415e936 100644 --- a/src/SqlQueryStressCLI/sqlstresscmd.csproj +++ b/src/SqlQueryStressCLI/sqlstresscmd.csproj @@ -43,7 +43,7 @@ - +