Proxy does not work on named instances

MichelZ · MichelZ · commit 54ee201db21d · 2024-12-05T11:01:10.000+01:00
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -457,6 +457,11 @@ public static bool IsNotAzureServer()
             return !AreConnStringsSetup() || !Utils.IsAzureSqlServer(new SqlConnectionStringBuilder(TCPConnectionString).DataSource);
         }
 
+        public static bool IsNotNamedInstance()
+        {
+            return !AreConnStringsSetup() || !new SqlConnectionStringBuilder(TCPConnectionString).DataSource.Contains(@"\");
+        }
+
         public static bool IsLocalHost()
         {
             SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs
@@ -37,47 +37,47 @@ public SplitPacketTest()
             _baseConnString = builder.ConnectionString;
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]
         public void OneByteSplitTest()
         {
             _splitPacketSize = 1;
             OpenConnection();
             Assert.True(true);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]
         public void AlmostFullHeaderTest()
         {
             _splitPacketSize = 7;
             OpenConnection();
             Assert.True(true);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]
         public void FullHeaderTest()
         {
             _splitPacketSize = 8;
             OpenConnection();
             Assert.True(true);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]
         public void HeaderPlusOneTest()
         {
             _splitPacketSize = 9;
             OpenConnection();
             Assert.True(true);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]
         public void MARSSplitTest()
         {
             _splitPacketSize = 1;
             OpenMarsConnection("select * from Orders");
             Assert.True(true);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]
         public void MARSReplicateTest()
         {
             _splitPacketSize = 1;

Original file line number	Diff line number	Diff line change
`@@ -457,6 +457,11 @@ public static bool IsNotAzureServer()`
`457`	`457`	`return !AreConnStringsSetup() \|\| !Utils.IsAzureSqlServer(new SqlConnectionStringBuilder(TCPConnectionString).DataSource);`
`458`	`458`	`}`
`459`	`459`
	`460`	`+ public static bool IsNotNamedInstance()`
	`461`	`+ {`
	`462`	`+ return !AreConnStringsSetup() \|\| !new SqlConnectionStringBuilder(TCPConnectionString).DataSource.Contains(@"\");`
	`463`	`+ }`
	`464`	`+`
`460`	`465`	`public static bool IsLocalHost()`
`461`	`466`	`{`
`462`	`467`	`SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);`
Original file line number	Diff line number	Diff line change
`@@ -37,47 +37,47 @@ public SplitPacketTest()`
`37`	`37`	`_baseConnString = builder.ConnectionString;`
`38`	`38`	`}`
`39`	`39`
`40`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]`
	`40`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]`
`41`	`41`	`public void OneByteSplitTest()`
`42`	`42`	`{`
`43`	`43`	`_splitPacketSize = 1;`
`44`	`44`	`OpenConnection();`
`45`	`45`	`Assert.True(true);`
`46`	`46`	`}`
`47`	`47`
`48`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]`
	`48`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]`
`49`	`49`	`public void AlmostFullHeaderTest()`
`50`	`50`	`{`
`51`	`51`	`_splitPacketSize = 7;`
`52`	`52`	`OpenConnection();`
`53`	`53`	`Assert.True(true);`
`54`	`54`	`}`
`55`	`55`
`56`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]`
	`56`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]`
`57`	`57`	`public void FullHeaderTest()`
`58`	`58`	`{`
`59`	`59`	`_splitPacketSize = 8;`
`60`	`60`	`OpenConnection();`
`61`	`61`	`Assert.True(true);`
`62`	`62`	`}`
`63`	`63`
`64`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]`
	`64`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]`
`65`	`65`	`public void HeaderPlusOneTest()`
`66`	`66`	`{`
`67`	`67`	`_splitPacketSize = 9;`
`68`	`68`	`OpenConnection();`
`69`	`69`	`Assert.True(true);`
`70`	`70`	`}`
`71`	`71`
`72`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]`
	`72`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]`
`73`	`73`	`public void MARSSplitTest()`
`74`	`74`	`{`
`75`	`75`	`_splitPacketSize = 1;`
`76`	`76`	`OpenMarsConnection("select * from Orders");`
`77`	`77`	`Assert.True(true);`
`78`	`78`	`}`
`79`	`79`
`80`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost))]`
	`80`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsTCPConnStringSetup), nameof(DataTestUtility.IsLocalHost), nameof(DataTestUtility.IsNotNamedInstance))]`
`81`	`81`	`public void MARSReplicateTest()`
`82`	`82`	`{`
`83`	`83`	`_splitPacketSize = 1;`