Move conditional compilation directive, add parameter name

edwardneal · edwardneal · commit 402b207ad71d · 2025-06-30T18:10:03.000+01:00
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs
@@ -58,16 +58,14 @@ public virtual Type GetFieldType(int ordinal)
         {
             SqlMetaData md = GetSqlMetaData(ordinal);
 
-#if NETFRAMEWORK
+            #if NETFRAMEWORK
             if (md.SqlDbType == SqlDbType.Udt)
             {
                 return md.Type;
             }
-            else
-#endif
-            {
-                return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, false).ClassType;
-            }
+            #endif
+
+            return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, isMultiValued: false).ClassType;
         }
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetValue/*' />

Original file line number	Diff line number	Diff line change
`@@ -58,16 +58,14 @@ public virtual Type GetFieldType(int ordinal)`
`58`	`58`	`{`
`59`	`59`	`SqlMetaData md = GetSqlMetaData(ordinal);`
`60`	`60`
`61`		`-#if NETFRAMEWORK`
	`61`	`+ #if NETFRAMEWORK`
`62`	`62`	`if (md.SqlDbType == SqlDbType.Udt)`
`63`	`63`	`{`
`64`	`64`	`return md.Type;`
`65`	`65`	`}`
`66`		`- else`
`67`		`-#endif`
`68`		`- {`
`69`		`- return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, false).ClassType;`
`70`		`- }`
	`66`	`+ #endif`
	`67`	`+`
	`68`	`+ return MetaType.GetMetaTypeFromSqlDbType(md.SqlDbType, isMultiValued: false).ClassType;`
`71`	`69`	`}`
`72`	`70`
`73`	`71`	`/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/GetValue/*' />`