Fixes bug in stored procedures calls that return a null value, was not converting to .Net's null type.

geoffreysmith · geoffreysmith · commit eff9693759b4 · 2011-07-25T15:17:26.000-07:00
diff --git a/Simple.Data.Ado/DataReaderExtensions.cs b/Simple.Data.Ado/DataReaderExtensions.cs
@@ -1,79 +1,87 @@
-﻿using System.Collections.Generic;
-using System.Linq;
-using System.Data;
-using Simple.Data.Extensions;
-
-namespace Simple.Data.Ado
-{
-    public static class DataReaderExtensions
-    {
-        public static IDictionary<string,object> ToDictionary(this IDataReader dataReader)
-        {
-            return dataReader.ToDictionary(dataReader.CreateDictionaryIndex());
-        }
-
-        public static IEnumerable<IDictionary<string, object>> ToDictionaries(this IDataReader reader)
-        {
-            using (reader)
-            {
-                return ToDictionariesImpl(reader).ToArray().AsEnumerable();
-            }
-        }
-
-        public static IEnumerable<IEnumerable<IDictionary<string, object>>> ToMultipleDictionaries(this IDataReader reader)
-        {
-            using (reader)
-            {
-                return ToMultipleDictionariesImpl(reader).ToArray().AsEnumerable();
-            }
-        }
-
-        private static IEnumerable<IEnumerable<IDictionary<string,object>>> ToMultipleDictionariesImpl(IDataReader reader)
-        {
-            do
-            {
-                yield return ToDictionariesImpl(reader).ToArray().AsEnumerable();
-            } while (reader.NextResult());
-            
-        }
-
-        private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataReader reader)
-        {
-            var index = reader.CreateDictionaryIndex();
-            var values = new object[reader.FieldCount];
-            while (reader.Read())
-            {
-                reader.GetValues(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)
-        {
-            var list = new List<object>();
-            using (reader)
-            {
-                while (reader.Read())
-                {
-                    list.Add(reader.ToDynamicRecord(tableName, database));
-                }
-            }
-
-            return list.AsEnumerable();
-        }
-    }
-}
+﻿using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using Simple.Data.Extensions;
+
+namespace Simple.Data.Ado
+{
+    public static class DataReaderExtensions
+    {
+        public static IDictionary<string,object> ToDictionary(this IDataReader dataReader)
+        {
+            return dataReader.ToDictionary(dataReader.CreateDictionaryIndex());
+        }
+
+        public static IEnumerable<IDictionary<string, object>> ToDictionaries(this IDataReader reader)
+        {
+            using (reader)
+            {
+                return ToDictionariesImpl(reader).ToArray().AsEnumerable();
+            }
+        }
+
+        public static IEnumerable<IEnumerable<IDictionary<string, object>>> ToMultipleDictionaries(this IDataReader reader)
+        {
+            using (reader)
+            {
+                return ToMultipleDictionariesImpl(reader).ToArray().AsEnumerable();
+            }
+        }
+
+        private static IEnumerable<IEnumerable<IDictionary<string,object>>> ToMultipleDictionariesImpl(IDataReader reader)
+        {
+            do
+            {
+                yield return ToDictionariesImpl(reader).ToArray().AsEnumerable();
+            } while (reader.NextResult());
+            
+        }
+
+        private static IEnumerable<IDictionary<string,object>> ToDictionariesImpl(IDataReader reader)
+        {
+            var index = reader.CreateDictionaryIndex();
+            var values = new object[reader.FieldCount];
+            while (reader.Read())
+            {
+                reader.GetValues(values);
+
+                for (var i = 0; i < reader.FieldCount; i++)
+                {
+                    var value = values[i];
+                    if (value is DBNull)
+                        values[i] = null;
+                }
+
+                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)
+        {
+            var list = new List<object>();
+            using (reader)
+            {
+                while (reader.Read())
+                {
+                    list.Add(reader.ToDynamicRecord(tableName, database));
+                }
+            }
+
+            return list.AsEnumerable();
+        }
+    }
+}
