Merge remote-tracking branch 'upstream/master' into ContainsNullableSupport

Author: shift-evgeny

src/ServiceStack.OrmLite/Expressions/ReadExpressionCommandExtensions.cs

@@ -154,14 +154,22 @@ internal static long RowCount<T>(this IDbCommand dbCmd, SqlExpression<T> express
         {
             //ORDER BY throws when used in subselects in SQL Server. Removing OrderBy() clause since it doesn't impact results
             var countExpr = expression.Clone().OrderBy(); 
-            return dbCmd.Scalar<long>(dbCmd.GetDialectProvider().ToRowCountStatement(countExpr.ToSelectStatement()));
+            return dbCmd.Scalar<long>(dbCmd.GetDialectProvider().ToRowCountStatement(countExpr.ToSelectStatement()), expression.Params);
         }
 
-        internal static long RowCount(this IDbCommand dbCmd, string sql)
+        internal static long RowCount(this IDbCommand dbCmd, string sql, object anonType)
         {
+            if (anonType != null)
+                dbCmd.SetParameters(anonType.ToObjectDictionary(), excludeDefaults: false);
+
             return dbCmd.Scalar<long>(dbCmd.GetDialectProvider().ToRowCountStatement(sql));
         }
 
+        internal static long RowCount(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams)
+        {
+            return dbCmd.SetParameters(sqlParams).Scalar<long>(dbCmd.GetDialectProvider().ToRowCountStatement(sql));
+        }
+
         internal static List<T> LoadSelect<T>(this IDbCommand dbCmd, SqlExpression<T> expression = null, IEnumerable<string> include = null)
         {
             return dbCmd.LoadListWithReferences<T, T>(expression, include);

src/ServiceStack.OrmLite/OrmLiteReadExpressionsApi.cs

@@ -238,9 +238,17 @@ public static long RowCount<T>(this IDbConnection dbConn, SqlExpression<T> expre
         /// <summary>
         /// Return the number of rows returned by the supplied sql
         /// </summary>
-        public static long RowCount(this IDbConnection dbConn, string sql)
+        public static long RowCount(this IDbConnection dbConn, string sql, object anonType = null)
         {
-            return dbConn.Exec(dbCmd => dbCmd.RowCount(sql));
+            return dbConn.Exec(dbCmd => dbCmd.RowCount(sql, anonType));
+        }
+
+        /// <summary>
+        /// Return the number of rows returned by the supplied sql and db params
+        /// </summary>
+        public static long RowCount(this IDbConnection dbConn, string sql, IEnumerable<IDbDataParameter> sqlParams)
+        {
+            return dbConn.Exec(dbCmd => dbCmd.RowCount(sql, sqlParams));
         }
 
         /// <summary>

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

@@ -371,6 +371,40 @@ public void Can_do_ToCountStatement_with_SqlExpression_if_expression_has_groupby
             }
         }
 
+        [Test]
+        public void Can_select_RowCount_with_db_params()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<LetterFrequency>();
+
+                db.Insert(new LetterFrequency { Letter = "A" });
+                db.Insert(new LetterFrequency { Letter = "A" });
+                db.Insert(new LetterFrequency { Letter = "A" });
+                db.Insert(new LetterFrequency { Letter = "B" });
+                db.Insert(new LetterFrequency { Letter = "B" });
+                db.Insert(new LetterFrequency { Letter = "B" });
+                db.Insert(new LetterFrequency { Letter = "B" });
+
+                var query = db.From<LetterFrequency>()
+                    .Where(x => x.Letter == "B")
+                    .Select(x => x.Letter);
+
+                var rowCount = db.RowCount(query);
+                db.GetLastSql().Print();
+                Assert.That(rowCount, Is.EqualTo(4));
+
+                var table = typeof(LetterFrequency).Name.SqlTable();
+
+                rowCount = db.RowCount("SELECT * FROM {0} WHERE Letter = @p1".Fmt(table), new { p1 = "B" });
+                Assert.That(rowCount, Is.EqualTo(4));
+
+                rowCount = db.RowCount("SELECT * FROM {0} WHERE Letter = @p1".Fmt(table), 
+                    new[] { db.CreateParam("p1", "B") });
+                Assert.That(rowCount, Is.EqualTo(4));
+            }
+        }
+
         [Test]
         public void Can_get_RowCount_if_expression_has_OrderBy()
         {