Bug-fix on DBNull in ADO adapter

ThatRendle · ThatRendle · commit c42acc5ab2d5 · 2011-03-01T01:32:48.000Z
diff --git a/Simple.Data.Ado/DataReaderExtensions.cs b/Simple.Data.Ado/DataReaderExtensions.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Data;
 using Simple.Data.Extensions;
@@ -44,7 +45,7 @@ private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataR
             while (reader.Read())
             {
                 reader.GetValues(values);
-                yield return OptimizedDictionary.Create(index, values);
+                yield return OptimizedDictionary.Create(index, values.Replace(DBNull.Value, null));
             }
         }
 
diff --git a/Simple.Data.Ado/DataRecordExtensions.cs b/Simple.Data.Ado/DataRecordExtensions.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Data;
 using Simple.Data.Extensions;
@@ -29,7 +30,7 @@ public static dynamic ToDynamicRecord(this IDataRecord dataRecord, IDictionary<s
 
         public static Dictionary<string, object> ToDictionary(this IDataRecord dataRecord)
         {
-            return dataRecord.GetFieldNames().ToDictionary(fieldName => fieldName.Homogenize(), fieldName => dataRecord[fieldName]);
+            return dataRecord.GetFieldNames().ToDictionary(fieldName => fieldName.Homogenize(), fieldName => DBNullToNull(dataRecord[fieldName]));
         }
 
         public static IDictionary<string, object> ToDictionary(this IDataRecord dataRecord, IDictionary<string,int> index)
@@ -49,7 +50,12 @@ public static IEnumerable<object> GetValues(this IDataRecord dataRecord)
         {
             var values = new object[dataRecord.FieldCount];
             dataRecord.GetValues(values);
-            return values;
+            return values.Replace(DBNull.Value, null);
+        }
+
+        private static object DBNullToNull(object source)
+        {
+            return source == DBNull.Value ? null : source;
         }
     }
 }
diff --git a/Simple.Data/Extensions/EnumerableExtensions.cs b/Simple.Data/Extensions/EnumerableExtensions.cs
@@ -87,5 +87,10 @@ public static IEnumerable<T> ExtendInfinite<T>(this IEnumerable<T> source)
                 yield return default(T);
             }
         }
+
+        public static IEnumerable<T> Replace<T>(this IEnumerable<T> source, T toReplace, T replaceWith)
+        {
+            return source.Select(item => Equals(item, toReplace) ? replaceWith : item);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Linq;`
`3`	`4`	`using System.Data;`
`4`	`5`	`using Simple.Data.Extensions;`
`@@ -44,7 +45,7 @@ private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataR`
`44`	`45`	`while (reader.Read())`
`45`	`46`	`{`
`46`	`47`	`reader.GetValues(values);`
`47`		`- yield return OptimizedDictionary.Create(index, values);`
	`48`	`+ yield return OptimizedDictionary.Create(index, values.Replace(DBNull.Value, null));`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -87,5 +87,10 @@ public static IEnumerable<T> ExtendInfinite<T>(this IEnumerable<T> source)`
`87`	`87`	`yield return default(T);`
`88`	`88`	`}`
`89`	`89`	`}`
	`90`	`+`
	`91`	`+ public static IEnumerable<T> Replace<T>(this IEnumerable<T> source, T toReplace, T replaceWith)`
	`92`	`+ {`
	`93`	`+ return source.Select(item => Equals(item, toReplace) ? replaceWith : item);`
	`94`	`+ }`
`90`	`95`	`}`
`91`	`96`	`}`