Skip to content

Commit 47f918a

Browse files
Standardize Connection String properties for enhanced user experience (#534)
1 parent ec4c42d commit 47f918a

File tree

12 files changed

+261
-76
lines changed

12 files changed

+261
-76
lines changed

doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml

Lines changed: 13 additions & 10 deletions
Large diffs are not rendered by default.

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.NetCoreApp.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,20 @@ public enum PoolBlockingPeriod
4848
public sealed partial class SqlConnectionStringBuilder : System.Data.Common.DbConnectionStringBuilder
4949
{
5050
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/PoolBlockingPeriod/*'/>
51+
[System.ComponentModel.DisplayNameAttribute("Pool Blocking Period")]
52+
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
5153
public PoolBlockingPeriod PoolBlockingPeriod { get { throw null; } set { } }
5254
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/ColumnEncryptionSetting/*'/>
55+
[System.ComponentModel.DisplayNameAttribute("Column Encryption Setting")]
56+
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
5357
public Microsoft.Data.SqlClient.SqlConnectionColumnEncryptionSetting ColumnEncryptionSetting { get { throw null; } set { } }
5458
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/EnclaveAttestationUrl/*'/>
59+
[System.ComponentModel.DisplayNameAttribute("Enclave Attestation Url")]
60+
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
5561
public string EnclaveAttestationUrl { get { throw null; } set { } }
56-
5762
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/AttestationProtocol/*' />
63+
[System.ComponentModel.DisplayNameAttribute("Attestation Protocol")]
64+
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
5865
public Microsoft.Data.SqlClient.SqlConnectionAttestationProtocol AttestationProtocol {get { throw null; } set { } }
5966
}
6067
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml' path='docs/members[@name="SqlParameter"]/SqlParameter/*'/>

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ public SqlConnectionStringBuilder() { }
617617
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/ctorConnectionString/*'/>
618618
public SqlConnectionStringBuilder(string connectionString) { }
619619
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/ApplicationIntent/*'/>
620-
[System.ComponentModel.DisplayNameAttribute("ApplicationIntent")]
620+
[System.ComponentModel.DisplayNameAttribute("Application Intent")]
621621
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
622622
public Microsoft.Data.SqlClient.ApplicationIntent ApplicationIntent { get { throw null; } set { } }
623623
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/ApplicationName/*'/>
@@ -634,11 +634,11 @@ public SqlConnectionStringBuilder(string connectionString) { }
634634
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
635635
public Microsoft.Data.SqlClient.SqlAuthenticationMethod Authentication { get { throw null; } set { } }
636636
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/ConnectRetryCount/*'/>
637-
[System.ComponentModel.DisplayNameAttribute("ConnectRetryCount")]
637+
[System.ComponentModel.DisplayNameAttribute("Connect Retry Count")]
638638
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
639639
public int ConnectRetryCount { get { throw null; } set { } }
640640
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/ConnectRetryInterval/*'/>
641-
[System.ComponentModel.DisplayNameAttribute("ConnectRetryInterval")]
641+
[System.ComponentModel.DisplayNameAttribute("Connect Retry Interval")]
642642
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
643643
public int ConnectRetryInterval { get { throw null; } set { } }
644644
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/ConnectTimeout/*'/>
@@ -692,11 +692,11 @@ public SqlConnectionStringBuilder(string connectionString) { }
692692
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
693693
public int MinPoolSize { get { throw null; } set { } }
694694
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/MultipleActiveResultSets/*'/>
695-
[System.ComponentModel.DisplayNameAttribute("MultipleActiveResultSets")]
695+
[System.ComponentModel.DisplayNameAttribute("Multiple Active Result Sets")]
696696
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
697697
public bool MultipleActiveResultSets { get { throw null; } set { } }
698698
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/MultiSubnetFailover/*'/>
699-
[System.ComponentModel.DisplayNameAttribute("MultiSubnetFailover")]
699+
[System.ComponentModel.DisplayNameAttribute("Multi Subnet Failover")]
700700
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
701701
public bool MultiSubnetFailover { get { throw null; } set { } }
702702
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/PacketSize/*'/>
@@ -725,7 +725,7 @@ public SqlConnectionStringBuilder(string connectionString) { }
725725
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
726726
public string TransactionBinding { get { throw null; } set { } }
727727
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/TrustServerCertificate/*'/>
728-
[System.ComponentModel.DisplayNameAttribute("TrustServerCertificate")]
728+
[System.ComponentModel.DisplayNameAttribute("Trust Server Certificate")]
729729
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
730730
public bool TrustServerCertificate { get { throw null; } set { } }
731731
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/TypeSystemVersion/*'/>

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/Common/DbConnectionStringCommon.cs

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ internal static partial class DbConnectionStringKeywords
677677
// internal const string NamedConnection = "Named Connection";
678678

679679
// SqlClient
680-
internal const string ApplicationIntent = "ApplicationIntent";
680+
internal const string ApplicationIntent = "Application Intent";
681681
internal const string ApplicationName = "Application Name";
682682
internal const string AsynchronousProcessing = "Asynchronous Processing";
683683
internal const string AttachDBFilename = "AttachDbFilename";
@@ -688,18 +688,18 @@ internal static partial class DbConnectionStringKeywords
688688
internal const string Encrypt = "Encrypt";
689689
internal const string FailoverPartner = "Failover Partner";
690690
internal const string InitialCatalog = "Initial Catalog";
691-
internal const string MultipleActiveResultSets = "MultipleActiveResultSets";
692-
internal const string MultiSubnetFailover = "MultiSubnetFailover";
691+
internal const string MultipleActiveResultSets = "Multiple Active Result Sets";
692+
internal const string MultiSubnetFailover = "Multi Subnet Failover";
693693
internal const string NetworkLibrary = "Network Library";
694694
internal const string PacketSize = "Packet Size";
695695
internal const string Replication = "Replication";
696696
internal const string TransactionBinding = "Transaction Binding";
697-
internal const string TrustServerCertificate = "TrustServerCertificate";
697+
internal const string TrustServerCertificate = "Trust Server Certificate";
698698
internal const string TypeSystemVersion = "Type System Version";
699699
internal const string UserInstance = "User Instance";
700700
internal const string WorkstationID = "Workstation ID";
701-
internal const string ConnectRetryCount = "ConnectRetryCount";
702-
internal const string ConnectRetryInterval = "ConnectRetryInterval";
701+
internal const string ConnectRetryCount = "Connect Retry Count";
702+
internal const string ConnectRetryInterval = "Connect Retry Interval";
703703
internal const string Authentication = "Authentication";
704704
internal const string ColumnEncryptionSetting = "Column Encryption Setting";
705705
internal const string EnclaveAttestationUrl = "Enclave Attestation Url";
@@ -720,7 +720,7 @@ internal static partial class DbConnectionStringKeywords
720720
internal const string Pooling = "Pooling";
721721
internal const string MinPoolSize = "Min Pool Size";
722722
#if netcoreapp
723-
internal const string PoolBlockingPeriod = "PoolBlockingPeriod";
723+
internal const string PoolBlockingPeriod = "Pool Blocking Period";
724724
#endif
725725
}
726726

@@ -732,6 +732,9 @@ internal static class DbConnectionStringSynonyms
732732
//internal const string ApplicationName = APP;
733733
internal const string APP = "app";
734734

735+
//internal const string ApplicationIntent = APPLICATIONINTENT;
736+
internal const string APPLICATIONINTENT = "ApplicationIntent";
737+
735738
//internal const string AttachDBFilename = EXTENDEDPROPERTIES+","+INITIALFILENAME;
736739
internal const string EXTENDEDPROPERTIES = "extended properties";
737740
internal const string INITIALFILENAME = "initial file name";
@@ -740,6 +743,12 @@ internal static class DbConnectionStringSynonyms
740743
internal const string CONNECTIONTIMEOUT = "connection timeout";
741744
internal const string TIMEOUT = "timeout";
742745

746+
//internal const string ConnectRetryCount = CONNECTRETRYCOUNT;
747+
internal const string CONNECTRETRYCOUNT = "ConnectRetryCount";
748+
749+
//internal const string ConnectRetryInterval = CONNECTRETRYINTERVAL;
750+
internal const string CONNECTRETRYINTERVAL = "ConnectRetryInterval";
751+
743752
//internal const string CurrentLanguage = LANGUAGE;
744753
internal const string LANGUAGE = "language";
745754

@@ -759,17 +768,30 @@ internal static class DbConnectionStringSynonyms
759768
//internal const string LoadBalanceTimeout = ConnectionLifetime;
760769
internal const string ConnectionLifetime = "connection lifetime";
761770

771+
//internal const string MultipleActiveResultSets = MULTIPLEACTIVERESULTSETS;
772+
internal const string MULTIPLEACTIVERESULTSETS = "MultipleActiveResultSets";
773+
774+
//internal const string MultiSubnetFailover = MULTISUBNETFAILOVER;
775+
internal const string MULTISUBNETFAILOVER = "MultiSubnetFailover";
776+
762777
//internal const string NetworkLibrary = NET+","+NETWORK;
763778
internal const string NET = "net";
764779
internal const string NETWORK = "network";
765780

781+
#if netcoreapp
782+
//internal const string PoolBlockingPeriod = POOLBLOCKINGPERIOD;
783+
internal const string POOLBLOCKINGPERIOD = "PoolBlockingPeriod";
784+
#endif
766785

767786
//internal const string Password = Pwd;
768787
internal const string Pwd = "pwd";
769788

770789
//internal const string PersistSecurityInfo = PERSISTSECURITYINFO;
771790
internal const string PERSISTSECURITYINFO = "persistsecurityinfo";
772791

792+
//internal const string TrustServerCertificate = TRUSTSERVERCERTIFICATE;
793+
internal const string TRUSTSERVERCERTIFICATE = "TrustServerCertificate";
794+
773795
//internal const string UserID = UID+","+User;
774796
internal const string UID = "uid";
775797
internal const string User = "user";

0 commit comments

Comments
 (0)