Also use column Mock API's for scalar types

mythz · mythz · commit 1b89d8e49184 · 2014-12-23T23:59:29.000-05:00
diff --git a/src/ServiceStack.OrmLite/OrmLiteResultsFilterExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteResultsFilterExtensions.cs
@@ -56,14 +56,18 @@ public static List<T> ConvertToList<T>(this IDbCommand dbCmd, string sql = null)
             if (sql != null)
                 dbCmd.CommandText = sql;
 
+            var isScalar = OrmLiteUtils.IsScalar<T>();
+
             if (OrmLiteConfig.ResultsFilter != null)
             {
-                return OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd);
+                return isScalar
+                    ? OrmLiteConfig.ResultsFilter.GetColumn<T>(dbCmd)
+                    : OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd);
             }
 
             using (var reader = dbCmd.ExecReader(dbCmd.CommandText))
             {
-                return OrmLiteUtils.IsScalar<T>()
+                return isScalar
                     ? reader.Column<T>(dbCmd.GetDialectProvider())
                     : reader.ConvertToList<T>(dbCmd.GetDialectProvider());
             }

Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,18 @@ public static List<T> ConvertToList<T>(this IDbCommand dbCmd, string sql = null)`
`56`	`56`	`if (sql != null)`
`57`	`57`	`dbCmd.CommandText = sql;`
`58`	`58`
	`59`	`+ var isScalar = OrmLiteUtils.IsScalar<T>();`
	`60`	`+`
`59`	`61`	`if (OrmLiteConfig.ResultsFilter != null)`
`60`	`62`	`{`
`61`		`- return OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd);`
	`63`	`+ return isScalar`
	`64`	`+ ? OrmLiteConfig.ResultsFilter.GetColumn<T>(dbCmd)`
	`65`	`+ : OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd);`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`using (var reader = dbCmd.ExecReader(dbCmd.CommandText))`
`65`	`69`	`{`
`66`		`- return OrmLiteUtils.IsScalar<T>()`
	`70`	`+ return isScalar`
`67`	`71`	`? reader.Column<T>(dbCmd.GetDialectProvider())`
`68`	`72`	`: reader.ConvertToList<T>(dbCmd.GetDialectProvider());`
`69`	`73`	`}`