Add support for unstructured List and DIctionary objects in Single<T> and Scalar<T> API's

Author: mythz

src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs

@@ -659,7 +659,9 @@ internal static T Scalar<T>(this IDataReader reader, IOrmLiteDialectProvider dia
             while (reader.Read())
             {
                 object oValue = reader.GetValue(0);
-                return ToScalar<T>(dialectProvider, oValue);
+                return typeof(T) == typeof (object) 
+                    ? (T)oValue 
+                    : ToScalar<T>(dialectProvider, oValue);
             }
 
             return default(T);

src/ServiceStack.OrmLite/OrmLiteUtils.cs

@@ -41,6 +41,12 @@ public static T ConvertTo<T>(this IDataReader dataReader, IOrmLiteDialectProvide
             {
                 if (dataReader.Read())
                 {
+                    if (typeof(T) == typeof (List<object>))
+                        return (T)(object)dataReader.ConvertToListObjects();
+
+                    if (typeof(T) == typeof(Dictionary<string, object>))
+                        return (T)(object)dataReader.ConvertToDictionaryObjects();
+                    
                     var row = CreateInstance<T>();
                     var indexCache = dataReader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
                     row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
@@ -50,6 +56,26 @@ public static T ConvertTo<T>(this IDataReader dataReader, IOrmLiteDialectProvide
             }
         }
 
+        public static List<object> ConvertToListObjects(this IDataReader dataReader)
+        {
+            var row = new List<object>();
+            for (var i = 0; i < dataReader.FieldCount; i++)
+            {
+                row.Add(dataReader.GetValue(i));
+            }
+            return row;
+        }
+
+        public static Dictionary<string, object> ConvertToDictionaryObjects(this IDataReader dataReader)
+        {
+            var row = new Dictionary<string, object>();
+            for (var i = 0; i < dataReader.FieldCount; i++)
+            {
+                row[dataReader.GetName(i).Trim()] = dataReader.GetValue(i);
+            }
+            return row;
+        }
+
         public static List<T> ConvertToList<T>(this IDataReader dataReader, IOrmLiteDialectProvider dialectProvider)
         {
             var fieldDefs = ModelDefinition<T>.Definition.AllFieldDefinitionsArray;
@@ -59,32 +85,24 @@ public static List<T> ConvertToList<T>(this IDataReader dataReader, IOrmLiteDial
                 var to = new List<List<object>>();
                 using (dataReader)
                 {
-                    var row = new List<object>();
                     while (dataReader.Read())
                     {
-                        for (var i = 0; i < dataReader.FieldCount; i++)
-                        {
-                            row.Add(dataReader.GetValue(i));
-                        }
+                        var row = dataReader.ConvertToListObjects();
+                        to.Add(row);
                     }
-                    to.Add(row);
                 }
                 return (List<T>)(object)to;
             }
-            else if (typeof(T) == typeof(Dictionary<string, object>))
+            if (typeof(T) == typeof(Dictionary<string, object>))
             {
                 var to = new List<Dictionary<string,object>>();
                 using (dataReader)
                 {
-                    var row = new Dictionary<string,object>();
                     while (dataReader.Read())
                     {
-                        for (var i = 0; i < dataReader.FieldCount; i++)
-                        {
-                            row[dataReader.GetName(i).Trim()] = dataReader.GetValue(i);
-                        }
+                        var row = dataReader.ConvertToDictionaryObjects();
+                        to.Add(row);
                     }
-                    to.Add(row);
                 }
                 return (List<T>)(object)to;
             }

tests/ServiceStack.OrmLite.Tests/Expression/SqlExpressionTests.cs

@@ -124,7 +124,10 @@ public void Can_Select_as_List_Object()
                 Assert.That(Convert.ToInt64(result[2]), Is.EqualTo(letterFrequencyMinId));
                 Assert.That(Convert.ToInt64(result[3]), Is.EqualTo(letterFrequencySumId));
 
-                results.PrintDump();
+                var single = db.Single<List<object>>(query);
+                Assert.That(single, Is.EquivalentTo(result));
+
+                result.PrintDump();
             }
         }
 
@@ -151,10 +154,29 @@ public void Can_Select_as_Dictionary_Object()
                 Assert.That(Convert.ToInt64(result["Min"]), Is.EqualTo(letterFrequencyMinId));
                 Assert.That(Convert.ToInt64(result["Sum"]), Is.EqualTo(letterFrequencySumId));
 
+                var single = db.Single<Dictionary<string, object>>(query);
+                Assert.That(single, Is.EquivalentTo(result));
+
                 results.PrintDump();
             }
         }
 
+        [Test]
+        public void Can_select_Object()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<LetterFrequency>();
+                db.Insert(new LetterFrequency { Id = 1, Letter = "A" });
+
+                var result = db.Scalar<object>(db.From<LetterFrequency>().Select(x => x.Letter));
+                Assert.That(result, Is.EqualTo("A"));
+
+                result = db.Scalar<object>(db.From<LetterFrequency>().Select(x => x.Id));
+                Assert.That(result, Is.EqualTo(1));
+            }
+        }
+
         [Test]
         public void Can_select_limit_with_SqlExpression()
         {