Update DataRecordExtensions.cs

loresoft · Aug 8, 2024 · 5ff91ba · 5ff91ba
1 parent b265373
commit 5ff91ba
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/FluentCommand/Extensions/DataRecordExtensions.cs b/src/FluentCommand/Extensions/DataRecordExtensions.cs
@@ -450,6 +450,9 @@ public static object GetValue(this IDataRecord dataRecord, string name)
     public static T GetValue<T>(this IDataRecord dataRecord, string name)
     {
         int ordinal = dataRecord.GetOrdinal(name);
+        if (dataRecord.IsDBNull(ordinal))
+            return default;
+
         if (dataRecord is DbDataReader dataReader)
             return dataReader.GetFieldValue<T>(ordinal);
 
@@ -467,6 +470,9 @@ public static T GetValue<T>(this IDataRecord dataRecord, string name)
     /// </returns>
     public static T GetValue<T>(this IDataRecord dataRecord, int index)
     {
+        if (dataRecord.IsDBNull(index))
+            return default;
+
         if (dataRecord is DbDataReader dataReader)
             return dataReader.GetFieldValue<T>(index);