Revert "Bug-fix on DBNull in ADO adapter"

ThatRendle · ThatRendle · commit 6e42374e3b7a · 2011-03-01T01:37:17.000Z
This should have been in the 0.5 branch. This reverts commit c42acc5.
diff --git a/Simple.Data.Ado/DataReaderExtensions.cs b/Simple.Data.Ado/DataReaderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 using System.Data;
 using Simple.Data.Extensions;
@@ -45,7 +44,7 @@ private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataR
             while (reader.Read())
             {
                 reader.GetValues(values);
-                yield return OptimizedDictionary.Create(index, values.Replace(DBNull.Value, null));
+                yield return OptimizedDictionary.Create(index, values);
             }
         }
 
diff --git a/Simple.Data.Ado/DataRecordExtensions.cs b/Simple.Data.Ado/DataRecordExtensions.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 using System.Data;
 using Simple.Data.Extensions;
@@ -30,7 +29,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 => DBNullToNull(dataRecord[fieldName]));
+            return dataRecord.GetFieldNames().ToDictionary(fieldName => fieldName.Homogenize(), fieldName => dataRecord[fieldName]);
         }
 
         public static IDictionary<string, object> ToDictionary(this IDataRecord dataRecord, IDictionary<string,int> index)
@@ -50,12 +49,7 @@ public static IEnumerable<object> GetValues(this IDataRecord dataRecord)
         {
             var values = new object[dataRecord.FieldCount];
             dataRecord.GetValues(values);
-            return values.Replace(DBNull.Value, null);
-        }
-
-        private static object DBNullToNull(object source)
-        {
-            return source == DBNull.Value ? null : source;
+            return values;
         }
     }
 }
diff --git a/Simple.Data/Extensions/EnumerableExtensions.cs b/Simple.Data/Extensions/EnumerableExtensions.cs
@@ -87,10 +87,5 @@ 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,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`	`using System.Linq;`
`4`	`3`	`using System.Data;`
`5`	`4`	`using Simple.Data.Extensions;`
`@@ -45,7 +44,7 @@ private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataR`
`45`	`44`	`while (reader.Read())`
`46`	`45`	`{`
`47`	`46`	`reader.GetValues(values);`
`48`		`- yield return OptimizedDictionary.Create(index, values.Replace(DBNull.Value, null));`
	`47`	`+ yield return OptimizedDictionary.Create(index, values);`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`
Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,5 @@ 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`		`- }`
`95`	`90`	`}`
`96`	`91`	`}`