Change ConvertToList to handle scalars as well

mythz · mythz · commit 4290229cd50a · 2014-12-23T23:32:24.000-05:00
diff --git a/lib/ServiceStack.Client.dll b/lib/ServiceStack.Client.dll
diff --git a/lib/ServiceStack.Common.dll b/lib/ServiceStack.Common.dll
diff --git a/lib/ServiceStack.Interfaces.dll b/lib/ServiceStack.Interfaces.dll
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/CustomSqlTests.cs b/src/ServiceStack.OrmLite.SqlServerTests/CustomSqlTests.cs
@@ -82,5 +82,20 @@ public void Can_execute_stored_procedure_using_SqlProc_with_out_params()
                 Assert.That(pTotal.Value, Is.EqualTo("3"));
             }
         }
+
+        [Test]
+        public void Can_execute_stored_proceduce_returning_scalars()
+        {
+            using (var db = OpenDbConnection())
+            {
+                using (var cmd = db.SqlProc(
+                    "GetUserIdsFromEmailAddresses", new { EmailAddresses = "as@if.com" }))
+                {
+                    var userIds = cmd.ConvertToList<int>();
+
+                    Assert.That(userIds.Count, Is.GreaterThan(0));
+                }
+            }
+        }
     }
 }
diff --git a/src/ServiceStack.OrmLite/Async/OrmLiteReadCommandExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/OrmLiteReadCommandExtensionsAsync.cs
@@ -120,7 +120,7 @@ internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, object anonType, C
 
         internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)
         {
-            if (OrmLiteReadCommandExtensions.IsScalar<T>())
+            if (OrmLiteUtils.IsScalar<T>())
                 return dbCmd.ScalarAsync<T>(sql, anonType, token);
 
             dbCmd.SetParameters<T>(anonType, excludeDefaults: false);
@@ -142,19 +142,15 @@ internal static Task<List<T>> WhereAsync<T>(this IDbCommand dbCmd, object anonTy
         {
             dbCmd.SetFilters<T>(anonType);
 
-            return OrmLiteReadCommandExtensions.IsScalar<T>()
-                ? dbCmd.ColumnAsync<T>(null, token)
-                : dbCmd.ConvertToListAsync<T>(null, token);
+            return dbCmd.ConvertToListAsync<T>(null, token);
         }
 
         internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)
         {
             if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);
             dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);
 
-            return OrmLiteReadCommandExtensions.IsScalar<T>()
-                ? dbCmd.ColumnAsync<T>(null, token)
-                : dbCmd.ConvertToListAsync<T>(null, token);
+            return dbCmd.ConvertToListAsync<T>(null, token);
         }
 
         internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict, CancellationToken token)
@@ -163,9 +159,7 @@ internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, string sql,
             
             dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);
 
-            return OrmLiteReadCommandExtensions.IsScalar<T>()
-                ? dbCmd.ColumnAsync<T>(null, token)
-                : dbCmd.ConvertToListAsync<T>(null, token);
+            return dbCmd.ConvertToListAsync<T>(null, token);
         }
 
         internal static Task<List<T>> SqlListAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)
@@ -197,19 +191,15 @@ internal static Task<List<T>> SqlColumnAsync<T>(this IDbCommand dbCmd, string sq
             if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);
             dbCmd.CommandText = sql;
 
-            return OrmLiteReadCommandExtensions.IsScalar<T>()
-                ? dbCmd.ColumnAsync<T>(null, token)
-                : dbCmd.ConvertToListAsync<T>(null, token);
+            return dbCmd.ConvertToListAsync<T>(null, token);
         }
 
         internal static Task<List<T>> SqlColumnAsync<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict, CancellationToken token)
         {
             if (dict != null) dbCmd.SetParameters(dict, false);
             dbCmd.CommandText = sql;
 
-            return OrmLiteReadCommandExtensions.IsScalar<T>()
-                ? dbCmd.ColumnAsync<T>(null, token)
-                : dbCmd.ConvertToListAsync<T>(null, token);
+            return dbCmd.ConvertToListAsync<T>(null, token);
         }
 
         internal static Task<T> SqlScalarAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)
diff --git a/src/ServiceStack.OrmLite/Async/OrmLiteResultsFilterExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/OrmLiteResultsFilterExtensionsAsync.cs
@@ -57,7 +57,10 @@ public static Task<List<T>> ConvertToListAsync<T>(this IDbCommand dbCmd, string
 
             var dialectProvider = dbCmd.GetDialectProvider();
             return dbCmd.ExecReaderAsync(dbCmd.CommandText, token)
-                        .Then(reader => reader.ConvertToListAsync<T>(dialectProvider, token)).Unwrap();
+                        .Then(reader => 
+                            OrmLiteUtils.IsScalar<T>()
+                                ? reader.ColumnAsync<T>(dialectProvider, token)
+                                : reader.ConvertToListAsync<T>(dialectProvider, token)).Unwrap();
         }
 
         public static Task<IList> ConvertToListAsync(this IDbCommand dbCmd, Type refType, string sql, CancellationToken token)
diff --git a/src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs
@@ -67,11 +67,6 @@ internal static IDataReader ExecReader(this IDbCommand dbCmd, string sql, IEnume
             return dbCmd.ExecuteReader();
         }
 
-        public static bool IsScalar<T>()
-        {
-            return typeof(T).IsValueType || typeof(T) == typeof(string);
-        }
-
         internal static List<T> Select<T>(this IDbCommand dbCmd)
         {
             return SelectFmt<T>(dbCmd, (string)null);
@@ -342,7 +337,7 @@ internal static T Single<T>(this IDbCommand dbCmd, object anonType)
 
         internal static T Single<T>(this IDbCommand dbCmd, string sql, object anonType)
         {
-            if (IsScalar<T>()) return Scalar<T>(dbCmd, sql, anonType);
+            if (OrmLiteUtils.IsScalar<T>()) return Scalar<T>(dbCmd, sql, anonType);
 
             dbCmd.SetParameters<T>(anonType, excludeDefaults: false);
 
@@ -363,29 +358,23 @@ internal static List<T> Where<T>(this IDbCommand dbCmd, object anonType)
         {
             dbCmd.SetFilters<T>(anonType);
 
-            return IsScalar<T>()
-                ? dbCmd.Column<T>()
-                : dbCmd.ConvertToList<T>();
+            return dbCmd.ConvertToList<T>();
         }
 
         internal static List<T> Select<T>(this IDbCommand dbCmd, string sql, object anonType = null)
         {
             if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);
             dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);
 
-            return IsScalar<T>()
-                ? dbCmd.Column<T>()
-                : dbCmd.ConvertToList<T>();
+            return dbCmd.ConvertToList<T>();
         }
 
         internal static List<T> Select<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict)
         {
             if (dict != null) SetParameters(dbCmd, (IDictionary<string, object>)dict, (bool)false);
             dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);
 
-            return IsScalar<T>()
-                ? dbCmd.Column<T>()
-                : dbCmd.ConvertToList<T>();
+            return dbCmd.ConvertToList<T>();
         }
 
         internal static List<T> SqlList<T>(this IDbCommand dbCmd, string sql, object anonType = null)
@@ -417,19 +406,15 @@ internal static List<T> SqlColumn<T>(this IDbCommand dbCmd, string sql, object a
             if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);
             dbCmd.CommandText = sql;
 
-            return IsScalar<T>()
-                ? dbCmd.Column<T>()
-                : dbCmd.ConvertToList<T>();
+            return dbCmd.ConvertToList<T>();
         }
 
         internal static List<T> SqlColumn<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict)
         {
             if (dict != null) SetParameters(dbCmd, dict, false);
             dbCmd.CommandText = sql;
 
-            return IsScalar<T>()
-                ? dbCmd.Column<T>()
-                : dbCmd.ConvertToList<T>();
+            return dbCmd.ConvertToList<T>();
         }
 
         internal static T SqlScalar<T>(this IDbCommand dbCmd, string sql, object anonType = null)
diff --git a/src/ServiceStack.OrmLite/OrmLiteResultsFilterExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteResultsFilterExtensions.cs
@@ -63,7 +63,9 @@ public static List<T> ConvertToList<T>(this IDbCommand dbCmd, string sql = null)
 
             using (var reader = dbCmd.ExecReader(dbCmd.CommandText))
             {
-                return reader.ConvertToList<T>(dbCmd.GetDialectProvider());
+                return OrmLiteUtils.IsScalar<T>()
+                    ? reader.Column<T>(dbCmd.GetDialectProvider())
+                    : reader.ConvertToList<T>(dbCmd.GetDialectProvider());
             }
         }
 
@@ -252,6 +254,5 @@ internal static Dictionary<K, List<V>> Lookup<K, V>(this IDbCommand dbCmd, strin
                 return reader.Lookup<K, V>(dbCmd.GetDialectProvider());
             }
         }
-
     }
 }
diff --git a/src/ServiceStack.OrmLite/OrmLiteUtils.cs b/src/ServiceStack.OrmLite/OrmLiteUtils.cs
@@ -27,6 +27,11 @@ public static T CreateInstance<T>()
             return (T)ReflectionExtensions.CreateInstance<T>();
         }
 
+        public static bool IsScalar<T>()
+        {
+            return typeof(T).IsValueType || typeof(T) == typeof(string);
+        }
+
         public static T ConvertTo<T>(this IDataReader dataReader, IOrmLiteDialectProvider dialectProvider)
         {
             var fieldDefs = ModelDefinition<T>.Definition.AllFieldDefinitionsArray;
diff --git a/tests/ServiceStack.OrmLite.Tests/ApiSqliteTests.cs b/tests/ServiceStack.OrmLite.Tests/ApiSqliteTests.cs
@@ -35,7 +35,7 @@ public void API_Sqlite_Examples()
             Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" > 40)"));
 
             db.Select<Person>(q => q.Where(x => x.Age > 40).OrderBy(x => x.Id));
-            Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" > 40)\nORDER BY \"Id\" ASC"));
+            Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" > 40)\nORDER BY \"Id\""));
 
             db.Select<Person>(q => q.Where(x => x.Age > 40));
             Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" > 40)"));
diff --git a/tests/ServiceStack.OrmLite.Tests/OrmLiteExecuteNonQueryTests.cs b/tests/ServiceStack.OrmLite.Tests/OrmLiteExecuteNonQueryTests.cs
@@ -60,6 +60,9 @@ Select @name1
                     Assert.That(affectedRows, Is.EqualTo(2));
                     Assert.That(rows[0].Name, Is.EqualTo(name1));
                     Assert.That(rows[1].Name, Is.EqualTo(name2));
+
+                    var ids = db.SqlColumn<int>("select Id from Person order by Id");
+                    Assert.That(ids, Is.EquivalentTo(new[] { 1, 2 }));
                 }
             }
 
@@ -183,6 +186,9 @@ Select @name1
                     Assert.That(affectedRows, Is.EqualTo(2));
                     Assert.That(rows[0].Name, Is.EqualTo(name1));
                     Assert.That(rows[1].Name, Is.EqualTo(name2));
+
+                    var ids = db.SqlColumn<int>("select Id from Person order by Id");
+                    Assert.That(ids, Is.EquivalentTo(new[] { 1, 2 }));
                 }
             }
 
@@ -301,6 +307,9 @@ public void Can_insert_multiple_rows_and_get_matching_number_of_affected_rows()
                     Assert.That(affectedRows, Is.EqualTo(2));
                     Assert.That(rows[0].Name, Is.EqualTo(name1));
                     Assert.That(rows[1].Name, Is.EqualTo(name2));
+
+                    var ids = db.SqlColumn<int>("select Id from Person order by Id");
+                    Assert.That(ids, Is.EquivalentTo(new[] { 1, 2 }));
                 }
             }
 
diff --git a/tests/ServiceStack.OrmLite.Tests/OrmLiteGetScalarTests.cs b/tests/ServiceStack.OrmLite.Tests/OrmLiteGetScalarTests.cs

Original file line number	Diff line number	Diff line change
`@@ -82,5 +82,20 @@ public void Can_execute_stored_procedure_using_SqlProc_with_out_params()`
`82`	`82`	`Assert.That(pTotal.Value, Is.EqualTo("3"));`
`83`	`83`	`}`
`84`	`84`	`}`
	`85`	`+`
	`86`	`+ [Test]`
	`87`	`+ public void Can_execute_stored_proceduce_returning_scalars()`
	`88`	`+ {`
	`89`	`+ using (var db = OpenDbConnection())`
	`90`	`+ {`
	`91`	`+ using (var cmd = db.SqlProc(`
	`92`	`+ "GetUserIdsFromEmailAddresses", new { EmailAddresses = "[email protected]" }))`
	`93`	`+ {`
	`94`	`+ var userIds = cmd.ConvertToList<int>();`
	`95`	`+`
	`96`	`+ Assert.That(userIds.Count, Is.GreaterThan(0));`
	`97`	`+ }`
	`98`	`+ }`
	`99`	`+ }`
`85`	`100`	`}`
`86`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, object anonType, C`
`120`	`120`
`121`	`121`	`internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)`
`122`	`122`	`{`
`123`		`- if (OrmLiteReadCommandExtensions.IsScalar<T>())`
	`123`	`+ if (OrmLiteUtils.IsScalar<T>())`
`124`	`124`	`return dbCmd.ScalarAsync<T>(sql, anonType, token);`
`125`	`125`
`126`	`126`	`dbCmd.SetParameters<T>(anonType, excludeDefaults: false);`
`@@ -142,19 +142,15 @@ internal static Task<List<T>> WhereAsync<T>(this IDbCommand dbCmd, object anonTy`
`142`	`142`	`{`
`143`	`143`	`dbCmd.SetFilters<T>(anonType);`
`144`	`144`
`145`		`- return OrmLiteReadCommandExtensions.IsScalar<T>()`
`146`		`- ? dbCmd.ColumnAsync<T>(null, token)`
`147`		`- : dbCmd.ConvertToListAsync<T>(null, token);`
	`145`	`+ return dbCmd.ConvertToListAsync<T>(null, token);`
`148`	`146`	`}`
`149`	`147`
`150`	`148`	`internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)`
`151`	`149`	`{`
`152`	`150`	`if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);`
`153`	`151`	`dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);`
`154`	`152`
`155`		`- return OrmLiteReadCommandExtensions.IsScalar<T>()`
`156`		`- ? dbCmd.ColumnAsync<T>(null, token)`
`157`		`- : dbCmd.ConvertToListAsync<T>(null, token);`
	`153`	`+ return dbCmd.ConvertToListAsync<T>(null, token);`
`158`	`154`	`}`
`159`	`155`
`160`	`156`	`internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict, CancellationToken token)`
`@@ -163,9 +159,7 @@ internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, string sql,`
`163`	`159`
`164`	`160`	`dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);`
`165`	`161`
`166`		`- return OrmLiteReadCommandExtensions.IsScalar<T>()`
`167`		`- ? dbCmd.ColumnAsync<T>(null, token)`
`168`		`- : dbCmd.ConvertToListAsync<T>(null, token);`
	`162`	`+ return dbCmd.ConvertToListAsync<T>(null, token);`
`169`	`163`	`}`
`170`	`164`
`171`	`165`	`internal static Task<List<T>> SqlListAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)`
`@@ -197,19 +191,15 @@ internal static Task<List<T>> SqlColumnAsync<T>(this IDbCommand dbCmd, string sq`
`197`	`191`	`if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);`
`198`	`192`	`dbCmd.CommandText = sql;`
`199`	`193`
`200`		`- return OrmLiteReadCommandExtensions.IsScalar<T>()`
`201`		`- ? dbCmd.ColumnAsync<T>(null, token)`
`202`		`- : dbCmd.ConvertToListAsync<T>(null, token);`
	`194`	`+ return dbCmd.ConvertToListAsync<T>(null, token);`
`203`	`195`	`}`
`204`	`196`
`205`	`197`	`internal static Task<List<T>> SqlColumnAsync<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict, CancellationToken token)`
`206`	`198`	`{`
`207`	`199`	`if (dict != null) dbCmd.SetParameters(dict, false);`
`208`	`200`	`dbCmd.CommandText = sql;`
`209`	`201`
`210`		`- return OrmLiteReadCommandExtensions.IsScalar<T>()`
`211`		`- ? dbCmd.ColumnAsync<T>(null, token)`
`212`		`- : dbCmd.ConvertToListAsync<T>(null, token);`
	`202`	`+ return dbCmd.ConvertToListAsync<T>(null, token);`
`213`	`203`	`}`
`214`	`204`
`215`	`205`	`internal static Task<T> SqlScalarAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)`
Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,6 @@ internal static IDataReader ExecReader(this IDbCommand dbCmd, string sql, IEnume`
`67`	`67`	`return dbCmd.ExecuteReader();`
`68`	`68`	`}`
`69`	`69`
`70`		`- public static bool IsScalar<T>()`
`71`		`- {`
`72`		`- return typeof(T).IsValueType \|\| typeof(T) == typeof(string);`
`73`		`- }`
`74`		`-`
`75`	`70`	`internal static List<T> Select<T>(this IDbCommand dbCmd)`
`76`	`71`	`{`
`77`	`72`	`return SelectFmt<T>(dbCmd, (string)null);`
`@@ -342,7 +337,7 @@ internal static T Single<T>(this IDbCommand dbCmd, object anonType)`
`342`	`337`
`343`	`338`	`internal static T Single<T>(this IDbCommand dbCmd, string sql, object anonType)`
`344`	`339`	`{`
`345`		`- if (IsScalar<T>()) return Scalar<T>(dbCmd, sql, anonType);`
	`340`	`+ if (OrmLiteUtils.IsScalar<T>()) return Scalar<T>(dbCmd, sql, anonType);`
`346`	`341`
`347`	`342`	`dbCmd.SetParameters<T>(anonType, excludeDefaults: false);`
`348`	`343`
`@@ -363,29 +358,23 @@ internal static List<T> Where<T>(this IDbCommand dbCmd, object anonType)`
`363`	`358`	`{`
`364`	`359`	`dbCmd.SetFilters<T>(anonType);`
`365`	`360`
`366`		`- return IsScalar<T>()`
`367`		`- ? dbCmd.Column<T>()`
`368`		`- : dbCmd.ConvertToList<T>();`
	`361`	`+ return dbCmd.ConvertToList<T>();`
`369`	`362`	`}`
`370`	`363`
`371`	`364`	`internal static List<T> Select<T>(this IDbCommand dbCmd, string sql, object anonType = null)`
`372`	`365`	`{`
`373`	`366`	`if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);`
`374`	`367`	`dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);`
`375`	`368`
`376`		`- return IsScalar<T>()`
`377`		`- ? dbCmd.Column<T>()`
`378`		`- : dbCmd.ConvertToList<T>();`
	`369`	`+ return dbCmd.ConvertToList<T>();`
`379`	`370`	`}`
`380`	`371`
`381`	`372`	`internal static List<T> Select<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict)`
`382`	`373`	`{`
`383`	`374`	`if (dict != null) SetParameters(dbCmd, (IDictionary<string, object>)dict, (bool)false);`
`384`	`375`	`dbCmd.CommandText = dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql);`
`385`	`376`
`386`		`- return IsScalar<T>()`
`387`		`- ? dbCmd.Column<T>()`
`388`		`- : dbCmd.ConvertToList<T>();`
	`377`	`+ return dbCmd.ConvertToList<T>();`
`389`	`378`	`}`
`390`	`379`
`391`	`380`	`internal static List<T> SqlList<T>(this IDbCommand dbCmd, string sql, object anonType = null)`
`@@ -417,19 +406,15 @@ internal static List<T> SqlColumn<T>(this IDbCommand dbCmd, string sql, object a`
`417`	`406`	`if (anonType != null) dbCmd.SetParameters<T>(anonType, excludeDefaults: false);`
`418`	`407`	`dbCmd.CommandText = sql;`
`419`	`408`
`420`		`- return IsScalar<T>()`
`421`		`- ? dbCmd.Column<T>()`
`422`		`- : dbCmd.ConvertToList<T>();`
	`409`	`+ return dbCmd.ConvertToList<T>();`
`423`	`410`	`}`
`424`	`411`
`425`	`412`	`internal static List<T> SqlColumn<T>(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict)`
`426`	`413`	`{`
`427`	`414`	`if (dict != null) SetParameters(dbCmd, dict, false);`
`428`	`415`	`dbCmd.CommandText = sql;`
`429`	`416`
`430`		`- return IsScalar<T>()`
`431`		`- ? dbCmd.Column<T>()`
`432`		`- : dbCmd.ConvertToList<T>();`
	`417`	`+ return dbCmd.ConvertToList<T>();`
`433`	`418`	`}`
`434`	`419`
`435`	`420`	`internal static T SqlScalar<T>(this IDbCommand dbCmd, string sql, object anonType = null)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ public static List<T> ConvertToList<T>(this IDbCommand dbCmd, string sql = null)`
`63`	`63`
`64`	`64`	`using (var reader = dbCmd.ExecReader(dbCmd.CommandText))`
`65`	`65`	`{`
`66`		`- return reader.ConvertToList<T>(dbCmd.GetDialectProvider());`
	`66`	`+ return OrmLiteUtils.IsScalar<T>()`
	`67`	`+ ? reader.Column<T>(dbCmd.GetDialectProvider())`
	`68`	`+ : reader.ConvertToList<T>(dbCmd.GetDialectProvider());`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`
`@@ -252,6 +254,5 @@ internal static Dictionary<K, List<V>> Lookup<K, V>(this IDbCommand dbCmd, strin`
`252`	`254`	`return reader.Lookup<K, V>(dbCmd.GetDialectProvider());`
`253`	`255`	`}`
`254`	`256`	`}`
`255`		`-`
`256`	`257`	`}`
`257`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@ public static T CreateInstance<T>()`
`27`	`27`	`return (T)ReflectionExtensions.CreateInstance<T>();`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ public static bool IsScalar<T>()`
	`31`	`+ {`
	`32`	`+ return typeof(T).IsValueType \|\| typeof(T) == typeof(string);`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`public static T ConvertTo<T>(this IDataReader dataReader, IOrmLiteDialectProvider dialectProvider)`
`31`	`36`	`{`
`32`	`37`	`var fieldDefs = ModelDefinition<T>.Definition.AllFieldDefinitionsArray;`