Change Count to sum counts of all rows returned not just the first scalar value.

Author: mythz

src/ServiceStack.OrmLite/Expressions/ReadExtensions.cs

@@ -90,30 +90,35 @@ internal static TKey Scalar<T, TKey>(this IDbCommand dbCmd,
 
         internal static long Count<T>(this IDbCommand dbCmd)
         {
-            SqlExpression<T> expression = OrmLiteConfig.DialectProvider.SqlExpression<T>();
-            string sql = expression.ToCountStatement();
-            return dbCmd.Scalar<long>(sql);
+            var expression = OrmLiteConfig.DialectProvider.SqlExpression<T>();
+            var sql = expression.ToCountStatement();
+            return GetCount(dbCmd, sql);
         }
 
         internal static long Count<T>(this IDbCommand dbCmd, Func<SqlExpression<T>, SqlExpression<T>> expression)
         {
             var expr = OrmLiteConfig.DialectProvider.SqlExpression<T>();
-            string sql = expression(expr).ToCountStatement();
-            return dbCmd.Scalar<long>(sql);
+            var sql = expression(expr).ToCountStatement();
+            return GetCount(dbCmd, sql);
         }
 
         internal static long Count<T>(this IDbCommand dbCmd, SqlExpression<T> expression)
         {
-            string sql = expression.ToCountStatement();
-            return dbCmd.Scalar<long>(sql);
+            var sql = expression.ToCountStatement();
+            return GetCount(dbCmd, sql);
         }
 
         internal static long Count<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate)
         {
             var ev = OrmLiteConfig.DialectProvider.SqlExpression<T>();
             ev.Where(predicate);
-            string sql = ev.ToCountStatement();
-            return dbCmd.Scalar<long>(sql);
+            var sql = ev.ToCountStatement();
+            return GetCount(dbCmd, sql);
+        }
+
+        internal static long GetCount(this IDbCommand dbCmd, string sql)
+        {
+            return dbCmd.Column<long>(sql).Sum();
         }
 
         internal static List<T> LoadSelect<T>(this IDbCommand dbCmd, Func<SqlExpression<T>, SqlExpression<T>> expression)

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

@@ -264,11 +264,13 @@ public void Can_do_ToCountStatement_with_SqlExpression_if_expression_has_groupby
                     .Select(x => x.Letter)
                     .GroupBy(x => x.Letter);
 
-                query.ToCountStatement().Print();
-
                 var count = db.Count(query);
+                db.GetLastSql().Print();
+                Assert.That(count, Is.EqualTo(7));
 
-                Assert.That(count, Is.EqualTo(2));
+                var rowCount = db.Select(query).Count;
+                db.GetLastSql().Print();
+                Assert.That(rowCount, Is.EqualTo(2));
             }
         }
 

tests/ServiceStack.OrmLite.Tests/MockAllApiTests.cs

@@ -181,8 +181,6 @@ public void Can_mock_all_Scalar_Apis()
             {
                 Assert.That(db.Scalar<Person, int>(x => Sql.Max(x.Age)), Is.EqualTo(1000));
                 Assert.That(db.Scalar<Person, int>(x => Sql.Max(x.Age), x => x.Age < 50), Is.EqualTo(1000));
-                Assert.That(db.Count<Person>(x => x.Age < 50), Is.EqualTo(1000));
-                Assert.That(db.Count(db.From<Person>().Where(x => x.Age < 50)), Is.EqualTo(1000));
                 Assert.That(db.Scalar<int>("SELECT COUNT(*) FROM Person WHERE Age > @age", new { age = 40 }), Is.EqualTo(1000));
                 Assert.That(db.ScalarFmt<int>("SELECT COUNT(*) FROM Person WHERE Age > {0}", 40), Is.EqualTo(1000));