Optimized DBNull -> CLR null process

ThatRendle · ThatRendle · commit bbeb9c74b3fa · 2011-07-26T10:35:20.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ test-results
 apply_config.bat
 NDependOut
 *.dotCover
+*_mm_cache.bin
diff --git a/Simple.Data.Ado/DataReaderExtensions.cs b/Simple.Data.Ado/DataReaderExtensions.cs
@@ -5,6 +5,8 @@
 
 namespace Simple.Data.Ado
 {
+    using System;
+
     public static class DataReaderExtensions
     {
         public static IDictionary<string,object> ToDictionary(this IDataReader dataReader)
@@ -45,43 +47,19 @@ private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataR
             {
                 reader.GetValues(values);
 
-                for (var i = 0; i < reader.FieldCount; i++)
-                {
-                    var value = values[i];
-                    if (value is DBNull)
-                        values[i] = null;
-                }
+                ReplaceDbNullsWithClrNulls(values);
 
                 yield return OptimizedDictionary.Create(index, values);
             }
         }
 
-        public static IEnumerable<object> ToDynamicList(this IDataReader reader)
-        {
-            var list = new List<object>();
-            using (reader)
-            {
-                while (reader.Read())
-                {
-                    list.Add(reader.ToDynamicRecord());
-                }
-            }
-
-            return list.AsEnumerable();
-        }
-
-        public static IEnumerable<object> ToDynamicList(this IDataReader reader, Database database, string tableName)
+        private static void ReplaceDbNullsWithClrNulls(object[] values)
         {
-            var list = new List<object>();
-            using (reader)
+            int dbNullIndex;
+            while ((dbNullIndex = Array.IndexOf(values, DBNull.Value)) > -1)
             {
-                while (reader.Read())
-                {
-                    list.Add(reader.ToDynamicRecord(tableName, database));
-                }
+                values[dbNullIndex] = null;
             }
-
-            return list.AsEnumerable();
         }
     }
 }
diff --git a/Simple.Data_mm_cache.bin b/Simple.Data_mm_cache.bin

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`namespace Simple.Data.Ado`
`7`	`7`	`{`
	`8`	`+ using System;`
	`9`	`+`
`8`	`10`	`public static class DataReaderExtensions`
`9`	`11`	`{`
`10`	`12`	`public static IDictionary<string,object> ToDictionary(this IDataReader dataReader)`
`@@ -45,43 +47,19 @@ private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataR`
`45`	`47`	`{`
`46`	`48`	`reader.GetValues(values);`
`47`	`49`
`48`		`- for (var i = 0; i < reader.FieldCount; i++)`
`49`		`- {`
`50`		`- var value = values[i];`
`51`		`- if (value is DBNull)`
`52`		`- values[i] = null;`
`53`		`- }`
	`50`	`+ ReplaceDbNullsWithClrNulls(values);`
`54`	`51`
`55`	`52`	`yield return OptimizedDictionary.Create(index, values);`
`56`	`53`	`}`
`57`	`54`	`}`
`58`	`55`
`59`		`- public static IEnumerable<object> ToDynamicList(this IDataReader reader)`
`60`		`- {`
`61`		`- var list = new List<object>();`
`62`		`- using (reader)`
`63`		`- {`
`64`		`- while (reader.Read())`
`65`		`- {`
`66`		`- list.Add(reader.ToDynamicRecord());`
`67`		`- }`
`68`		`- }`
`69`		`-`
`70`		`- return list.AsEnumerable();`
`71`		`- }`
`72`		`-`
`73`		`- public static IEnumerable<object> ToDynamicList(this IDataReader reader, Database database, string tableName)`
	`56`	`+ private static void ReplaceDbNullsWithClrNulls(object[] values)`
`74`	`57`	`{`
`75`		`- var list = new List<object>();`
`76`		`- using (reader)`
	`58`	`+ int dbNullIndex;`
	`59`	`+ while ((dbNullIndex = Array.IndexOf(values, DBNull.Value)) > -1)`
`77`	`60`	`{`
`78`		`- while (reader.Read())`
`79`		`- {`
`80`		`- list.Add(reader.ToDynamicRecord(tableName, database));`
`81`		`- }`
	`61`	`+ values[dbNullIndex] = null;`
`82`	`62`	`}`
`83`		`-`
`84`		`- return list.AsEnumerable();`
`85`	`63`	`}`
`86`	`64`	`}`
`87`	`65`	`}`