Perform initial cleanup of ITypedXettersV3 interfaces

edwardneal · edwardneal · commit 1437afc6a631 · 2025-06-27T06:52:02.000+01:00
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ITypedGettersV3.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ITypedGettersV3.cs
@@ -63,6 +63,10 @@ internal interface ITypedGettersV3
 
         // valid for UniqueIdentifier
         Guid GetGuid(int ordinal);
+        // valid for SqlDbType.Time
+        TimeSpan GetTimeSpan(int ordinal);
+        // valid for DateTimeOffset
+        DateTimeOffset GetDateTimeOffset(int ordinal);
     }
 }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ITypedSettersV3.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ITypedSettersV3.cs
@@ -73,6 +73,10 @@ internal interface ITypedSettersV3
 
         // valid for UniqueIdentifier
         void SetGuid(int ordinal, Guid value);
+        // valid for SqlDbType.Time
+        void SetTimeSpan(int ordinal, TimeSpan value);
+        // valid for DateTimeOffset
+        void SetDateTimeOffset(int ordinal, DateTimeOffset value);
     }
 }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
@@ -240,7 +240,7 @@ internal static DateTime GetDateTime(ITypedGettersV3 getters, int ordinal, SmiMe
         }
 
         // dealing with v200 SMI
-        internal static DateTimeOffset GetDateTimeOffset(SmiTypedGetterSetter getters, int ordinal, SmiMetaData metaData)
+        internal static DateTimeOffset GetDateTimeOffset(ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)
         {
             ThrowIfITypedGettersIsNull(getters, ordinal);
             if (CanAccessGetterDirectly(metaData, ExtendedClrTypeCode.DateTimeOffset))
@@ -851,7 +851,7 @@ internal static string GetString(ITypedGettersV3 getters, int ordinal, SmiMetaDa
         }
 
          // dealing with v200 SMI
-        internal static TimeSpan GetTimeSpan(SmiTypedGetterSetter getters, int ordinal, SmiMetaData metaData)
+        internal static TimeSpan GetTimeSpan(ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)
         {
             ThrowIfITypedGettersIsNull(getters, ordinal);
             if (CanAccessGetterDirectly(metaData, ExtendedClrTypeCode.TimeSpan))
@@ -863,7 +863,7 @@ internal static TimeSpan GetTimeSpan(SmiTypedGetterSetter getters, int ordinal,
 
         // GetValue() for v200 SMI (2008 Date/Time types)
         internal static object GetValue200(
-            SmiTypedGetterSetter getters,
+            ITypedGettersV3 getters,
             int ordinal,
             SmiMetaData metaData)
         {
@@ -1005,7 +1005,7 @@ internal static object GetValue(
 
         // dealing with v200 SMI
         internal static object GetSqlValue200(
-            SmiTypedGetterSetter getters,
+            ITypedGettersV3 getters,
             int ordinal,
             SmiMetaData metaData)
         {
@@ -1293,7 +1293,7 @@ internal static void SetDateTime(ITypedSettersV3 setters, int ordinal, SmiMetaDa
         internal static void SetDateTimeOffset(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DateTimeOffset value)
         {
             ThrowIfInvalidSetterAccess(metaData, ExtendedClrTypeCode.DateTimeOffset);
-            SetDateTimeOffset_Unchecked((SmiTypedGetterSetter)setters, ordinal, value);
+            SetDateTimeOffset_Unchecked(setters, ordinal, value);
         }
 
         internal static void SetDecimal(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, decimal value)
@@ -1444,7 +1444,7 @@ internal static void SetString(ITypedSettersV3 setters, int ordinal, SmiMetaData
         internal static void SetTimeSpan(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, TimeSpan value)
         {
             ThrowIfInvalidSetterAccess(metaData, ExtendedClrTypeCode.TimeSpan);
-            SetTimeSpan_Checked((SmiTypedGetterSetter)setters, ordinal, metaData, value);
+            SetTimeSpan_Checked(setters, ordinal, metaData, value);
         }
 
         //  Implements SqlClient 2.0-compatible SetValue() semantics
@@ -1494,7 +1494,7 @@ value is DataFeed
                     SetDateTime_Checked(setters, ordinal, metaData, ((DateOnly)value).ToDateTime(new TimeOnly(0, 0)));
                     break;
                 case ExtendedClrTypeCode.TimeOnly:
-                    SetTimeSpan_Checked((SmiTypedGetterSetter)setters, ordinal, metaData, ((TimeOnly)value).ToTimeSpan());
+                    SetTimeSpan_Checked(setters, ordinal, metaData, ((TimeOnly)value).ToTimeSpan());
                     break;
 #endif
                 case ExtendedClrTypeCode.DateTime:
@@ -2142,7 +2142,7 @@ private static void SetDateTime_Checked(ITypedSettersV3 setters, int ordinal, Sm
             SetDateTime_Unchecked(setters, ordinal, (metaData.SqlDbType == SqlDbType.Date) ? value.Date : value);
         }
 
-        private static void SetTimeSpan_Checked(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, TimeSpan value)
+        private static void SetTimeSpan_Checked(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, TimeSpan value)
         {
             VerifyTimeRange(metaData.SqlDbType, value);
             SetTimeSpan_Unchecked(setters, ordinal, value);
@@ -2252,7 +2252,7 @@ private static void SetBytes_FromRecord(ITypedSettersV3 setters, int ordinal, Sm
             setters.SetBytesLength(ordinal, currentOffset);
         }
 
-        private static void SetBytes_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
+        private static void SetBytes_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
         {
             // Deal with large values by sending bufferLength of NoLengthLimit (== assume 
             //  CheckXetParameters will ignore requested-length checks in this case)
@@ -2357,7 +2357,7 @@ private static void SetChars_FromRecord(ITypedSettersV3 setters, int ordinal, Sm
         // Transfer a character value from a reader when we're not sure which GetXXX method the reader will support.
         //  Prefers to chunk data via GetChars, but falls back to GetString if that fails.
         //  Mainly put in place because DataTableReader doesn't support GetChars on string columns, but others could fail too...
-        private static void SetCharsOrString_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
+        private static void SetCharsOrString_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
         {
             bool success = false;
             try
@@ -2380,7 +2380,7 @@ private static void SetCharsOrString_FromReader(SmiTypedGetterSetter setters, in
         }
 
         // Use chunking via SetChars to transfer a value from a reader to a gettersetter
-        private static void SetChars_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
+        private static void SetChars_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
         {
             // Deal with large values by sending bufferLength of NoLengthLimit (== assume 
             //  CheckXetParameters will ignore requested-length checks in this case)
@@ -2421,7 +2421,7 @@ private static void SetChars_FromReader(SmiTypedGetterSetter setters, int ordina
             setters.SetCharsLength(ordinal, currentOffset);
         }
 
-        private static void SetString_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
+        private static void SetString_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)
         {
             string value = reader.GetString(ordinal);
             int length = CheckXetParameters(metaData.SqlDbType, metaData.MaxLength, value.Length, fieldOffset: 0, bufferLength: NoLengthLimit, bufferOffset: offset, length: NoLengthLimit);
@@ -2880,7 +2880,7 @@ private static DateTime GetDateTime_Unchecked(ITypedGettersV3 getters, int ordin
             return result;
         }
 
-        private static DateTimeOffset GetDateTimeOffset_Unchecked(SmiTypedGetterSetter getters, int ordinal)
+        private static DateTimeOffset GetDateTimeOffset_Unchecked(ITypedGettersV3 getters, int ordinal)
         {
             Debug.Assert(!IsDBNull_Unchecked(getters, ordinal));
 
@@ -2987,7 +2987,7 @@ private static string GetString_Unchecked(ITypedGettersV3 getters, int ordinal)
             return result;
         }
 
-        private static TimeSpan GetTimeSpan_Unchecked(SmiTypedGetterSetter getters, int ordinal)
+        private static TimeSpan GetTimeSpan_Unchecked(ITypedGettersV3 getters, int ordinal)
         {
             Debug.Assert(!IsDBNull_Unchecked(getters, ordinal));
 
@@ -3124,12 +3124,12 @@ private static void SetDate_Unchecked(ITypedSettersV3 setters, int ordinal, SmiM
             setters.SetDateTime(ordinal, value);
         }
 
-        private static void SetTimeSpan_Unchecked(SmiTypedGetterSetter setters, int ordinal, TimeSpan value)
+        private static void SetTimeSpan_Unchecked(ITypedSettersV3 setters, int ordinal, TimeSpan value)
         {
             setters.SetTimeSpan(ordinal, value);
         }
 
-        private static void SetDateTimeOffset_Unchecked(SmiTypedGetterSetter setters, int ordinal, DateTimeOffset value)
+        private static void SetDateTimeOffset_Unchecked(ITypedSettersV3 setters, int ordinal, DateTimeOffset value)
         {
             setters.SetDateTimeOffset(ordinal, value);
         }

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ internal interface ITypedGettersV3`
`63`	`63`
`64`	`64`	`// valid for UniqueIdentifier`
`65`	`65`	`Guid GetGuid(int ordinal);`
	`66`	`+ // valid for SqlDbType.Time`
	`67`	`+ TimeSpan GetTimeSpan(int ordinal);`
	`68`	`+ // valid for DateTimeOffset`
	`69`	`+ DateTimeOffset GetDateTimeOffset(int ordinal);`
`66`	`70`	`}`
`67`	`71`	`}`
`68`	`72`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,10 @@ internal interface ITypedSettersV3`
`73`	`73`
`74`	`74`	`// valid for UniqueIdentifier`
`75`	`75`	`void SetGuid(int ordinal, Guid value);`
	`76`	`+ // valid for SqlDbType.Time`
	`77`	`+ void SetTimeSpan(int ordinal, TimeSpan value);`
	`78`	`+ // valid for DateTimeOffset`
	`79`	`+ void SetDateTimeOffset(int ordinal, DateTimeOffset value);`
`76`	`80`	`}`
`77`	`81`	`}`
`78`	`82`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ internal static DateTime GetDateTime(ITypedGettersV3 getters, int ordinal, SmiMe`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`// dealing with v200 SMI`
`243`		`- internal static DateTimeOffset GetDateTimeOffset(SmiTypedGetterSetter getters, int ordinal, SmiMetaData metaData)`
	`243`	`+ internal static DateTimeOffset GetDateTimeOffset(ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)`
`244`	`244`	`{`
`245`	`245`	`ThrowIfITypedGettersIsNull(getters, ordinal);`
`246`	`246`	`if (CanAccessGetterDirectly(metaData, ExtendedClrTypeCode.DateTimeOffset))`
`@@ -851,7 +851,7 @@ internal static string GetString(ITypedGettersV3 getters, int ordinal, SmiMetaDa`
`851`	`851`	`}`
`852`	`852`
`853`	`853`	`// dealing with v200 SMI`
`854`		`- internal static TimeSpan GetTimeSpan(SmiTypedGetterSetter getters, int ordinal, SmiMetaData metaData)`
	`854`	`+ internal static TimeSpan GetTimeSpan(ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)`
`855`	`855`	`{`
`856`	`856`	`ThrowIfITypedGettersIsNull(getters, ordinal);`
`857`	`857`	`if (CanAccessGetterDirectly(metaData, ExtendedClrTypeCode.TimeSpan))`
`@@ -863,7 +863,7 @@ internal static TimeSpan GetTimeSpan(SmiTypedGetterSetter getters, int ordinal,`
`863`	`863`
`864`	`864`	`// GetValue() for v200 SMI (2008 Date/Time types)`
`865`	`865`	`internal static object GetValue200(`
`866`		`- SmiTypedGetterSetter getters,`
	`866`	`+ ITypedGettersV3 getters,`
`867`	`867`	`int ordinal,`
`868`	`868`	`SmiMetaData metaData)`
`869`	`869`	`{`
`@@ -1005,7 +1005,7 @@ internal static object GetValue(`
`1005`	`1005`
`1006`	`1006`	`// dealing with v200 SMI`
`1007`	`1007`	`internal static object GetSqlValue200(`
`1008`		`- SmiTypedGetterSetter getters,`
	`1008`	`+ ITypedGettersV3 getters,`
`1009`	`1009`	`int ordinal,`
`1010`	`1010`	`SmiMetaData metaData)`
`1011`	`1011`	`{`
`@@ -1293,7 +1293,7 @@ internal static void SetDateTime(ITypedSettersV3 setters, int ordinal, SmiMetaDa`
`1293`	`1293`	`internal static void SetDateTimeOffset(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DateTimeOffset value)`
`1294`	`1294`	`{`
`1295`	`1295`	`ThrowIfInvalidSetterAccess(metaData, ExtendedClrTypeCode.DateTimeOffset);`
`1296`		`- SetDateTimeOffset_Unchecked((SmiTypedGetterSetter)setters, ordinal, value);`
	`1296`	`+ SetDateTimeOffset_Unchecked(setters, ordinal, value);`
`1297`	`1297`	`}`
`1298`	`1298`
`1299`	`1299`	`internal static void SetDecimal(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, decimal value)`
`@@ -1444,7 +1444,7 @@ internal static void SetString(ITypedSettersV3 setters, int ordinal, SmiMetaData`
`1444`	`1444`	`internal static void SetTimeSpan(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, TimeSpan value)`
`1445`	`1445`	`{`
`1446`	`1446`	`ThrowIfInvalidSetterAccess(metaData, ExtendedClrTypeCode.TimeSpan);`
`1447`		`- SetTimeSpan_Checked((SmiTypedGetterSetter)setters, ordinal, metaData, value);`
	`1447`	`+ SetTimeSpan_Checked(setters, ordinal, metaData, value);`
`1448`	`1448`	`}`
`1449`	`1449`
`1450`	`1450`	`// Implements SqlClient 2.0-compatible SetValue() semantics`
`@@ -1494,7 +1494,7 @@ value is DataFeed`
`1494`	`1494`	`SetDateTime_Checked(setters, ordinal, metaData, ((DateOnly)value).ToDateTime(new TimeOnly(0, 0)));`
`1495`	`1495`	`break;`
`1496`	`1496`	`case ExtendedClrTypeCode.TimeOnly:`
`1497`		`- SetTimeSpan_Checked((SmiTypedGetterSetter)setters, ordinal, metaData, ((TimeOnly)value).ToTimeSpan());`
	`1497`	`+ SetTimeSpan_Checked(setters, ordinal, metaData, ((TimeOnly)value).ToTimeSpan());`
`1498`	`1498`	`break;`
`1499`	`1499`	`#endif`
`1500`	`1500`	`case ExtendedClrTypeCode.DateTime:`
`@@ -2142,7 +2142,7 @@ private static void SetDateTime_Checked(ITypedSettersV3 setters, int ordinal, Sm`
`2142`	`2142`	`SetDateTime_Unchecked(setters, ordinal, (metaData.SqlDbType == SqlDbType.Date) ? value.Date : value);`
`2143`	`2143`	`}`
`2144`	`2144`
`2145`		`- private static void SetTimeSpan_Checked(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, TimeSpan value)`
	`2145`	`+ private static void SetTimeSpan_Checked(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, TimeSpan value)`
`2146`	`2146`	`{`
`2147`	`2147`	`VerifyTimeRange(metaData.SqlDbType, value);`
`2148`	`2148`	`SetTimeSpan_Unchecked(setters, ordinal, value);`
`@@ -2252,7 +2252,7 @@ private static void SetBytes_FromRecord(ITypedSettersV3 setters, int ordinal, Sm`
`2252`	`2252`	`setters.SetBytesLength(ordinal, currentOffset);`
`2253`	`2253`	`}`
`2254`	`2254`
`2255`		`- private static void SetBytes_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
	`2255`	`+ private static void SetBytes_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
`2256`	`2256`	`{`
`2257`	`2257`	`// Deal with large values by sending bufferLength of NoLengthLimit (== assume`
`2258`	`2258`	`// CheckXetParameters will ignore requested-length checks in this case)`
`@@ -2357,7 +2357,7 @@ private static void SetChars_FromRecord(ITypedSettersV3 setters, int ordinal, Sm`
`2357`	`2357`	`// Transfer a character value from a reader when we're not sure which GetXXX method the reader will support.`
`2358`	`2358`	`// Prefers to chunk data via GetChars, but falls back to GetString if that fails.`
`2359`	`2359`	`// Mainly put in place because DataTableReader doesn't support GetChars on string columns, but others could fail too...`
`2360`		`- private static void SetCharsOrString_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
	`2360`	`+ private static void SetCharsOrString_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
`2361`	`2361`	`{`
`2362`	`2362`	`bool success = false;`
`2363`	`2363`	`try`
`@@ -2380,7 +2380,7 @@ private static void SetCharsOrString_FromReader(SmiTypedGetterSetter setters, in`
`2380`	`2380`	`}`
`2381`	`2381`
`2382`	`2382`	`// Use chunking via SetChars to transfer a value from a reader to a gettersetter`
`2383`		`- private static void SetChars_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
	`2383`	`+ private static void SetChars_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
`2384`	`2384`	`{`
`2385`	`2385`	`// Deal with large values by sending bufferLength of NoLengthLimit (== assume`
`2386`	`2386`	`// CheckXetParameters will ignore requested-length checks in this case)`
`@@ -2421,7 +2421,7 @@ private static void SetChars_FromReader(SmiTypedGetterSetter setters, int ordina`
`2421`	`2421`	`setters.SetCharsLength(ordinal, currentOffset);`
`2422`	`2422`	`}`
`2423`	`2423`
`2424`		`- private static void SetString_FromReader(SmiTypedGetterSetter setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
	`2424`	`+ private static void SetString_FromReader(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DbDataReader reader, int offset)`
`2425`	`2425`	`{`
`2426`	`2426`	`string value = reader.GetString(ordinal);`
`2427`	`2427`	`int length = CheckXetParameters(metaData.SqlDbType, metaData.MaxLength, value.Length, fieldOffset: 0, bufferLength: NoLengthLimit, bufferOffset: offset, length: NoLengthLimit);`
`@@ -2880,7 +2880,7 @@ private static DateTime GetDateTime_Unchecked(ITypedGettersV3 getters, int ordin`
`2880`	`2880`	`return result;`
`2881`	`2881`	`}`
`2882`	`2882`
`2883`		`- private static DateTimeOffset GetDateTimeOffset_Unchecked(SmiTypedGetterSetter getters, int ordinal)`
	`2883`	`+ private static DateTimeOffset GetDateTimeOffset_Unchecked(ITypedGettersV3 getters, int ordinal)`
`2884`	`2884`	`{`
`2885`	`2885`	`Debug.Assert(!IsDBNull_Unchecked(getters, ordinal));`
`2886`	`2886`
`@@ -2987,7 +2987,7 @@ private static string GetString_Unchecked(ITypedGettersV3 getters, int ordinal)`
`2987`	`2987`	`return result;`
`2988`	`2988`	`}`
`2989`	`2989`
`2990`		`- private static TimeSpan GetTimeSpan_Unchecked(SmiTypedGetterSetter getters, int ordinal)`
	`2990`	`+ private static TimeSpan GetTimeSpan_Unchecked(ITypedGettersV3 getters, int ordinal)`
`2991`	`2991`	`{`
`2992`	`2992`	`Debug.Assert(!IsDBNull_Unchecked(getters, ordinal));`
`2993`	`2993`
`@@ -3124,12 +3124,12 @@ private static void SetDate_Unchecked(ITypedSettersV3 setters, int ordinal, SmiM`
`3124`	`3124`	`setters.SetDateTime(ordinal, value);`
`3125`	`3125`	`}`
`3126`	`3126`
`3127`		`- private static void SetTimeSpan_Unchecked(SmiTypedGetterSetter setters, int ordinal, TimeSpan value)`
	`3127`	`+ private static void SetTimeSpan_Unchecked(ITypedSettersV3 setters, int ordinal, TimeSpan value)`
`3128`	`3128`	`{`
`3129`	`3129`	`setters.SetTimeSpan(ordinal, value);`
`3130`	`3130`	`}`
`3131`	`3131`
`3132`		`- private static void SetDateTimeOffset_Unchecked(SmiTypedGetterSetter setters, int ordinal, DateTimeOffset value)`
	`3132`	`+ private static void SetDateTimeOffset_Unchecked(ITypedSettersV3 setters, int ordinal, DateTimeOffset value)`
`3133`	`3133`	`{`
`3134`	`3134`	`setters.SetDateTimeOffset(ordinal, value);`
`3135`	`3135`	`}`