Add expr params in async ConvertTo API's

mythz · mythz · commit c9d4148eeab6 · 2015-12-26T13:12:45.000-08:00
diff --git a/src/ServiceStack.OrmLite/Async/OrmLiteResultsFilterExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/OrmLiteResultsFilterExtensionsAsync.cs
@@ -86,11 +86,13 @@ public static Task<IList> ConvertToListAsync(this IDbCommand dbCmd, Type refType
                         .Then(reader => reader.ConvertToListAsync(dialectProvider, refType, token)).Unwrap();
         }
 
-        internal static Task<List<T>> ExprConvertToListAsync<T>(this IDbCommand dbCmd, string sql, CancellationToken token)
+        internal static Task<List<T>> ExprConvertToListAsync<T>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
         {
             if (sql != null)
                 dbCmd.CommandText = sql;
 
+            dbCmd.SetParameters(sqlParams);
+
             if (OrmLiteConfig.ResultsFilter != null)
                 return OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd).InTask();
 
@@ -185,11 +187,13 @@ public static Task<long> ExecLongScalarAsync(this IDbCommand dbCmd, string sql,
             return dbCmd.LongScalarAsync(token);
         }
 
-        internal static Task<T> ExprConvertToAsync<T>(this IDbCommand dbCmd, string sql, CancellationToken token)
+        internal static Task<T> ExprConvertToAsync<T>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
         {
             if (sql != null)
                 dbCmd.CommandText = sql;
 
+            dbCmd.SetParameters(sqlParams);
+
             if (OrmLiteConfig.ResultsFilter != null)
                 return OrmLiteConfig.ResultsFilter.GetSingle<T>(dbCmd).InTask();
 
diff --git a/src/ServiceStack.OrmLite/Async/ReadExpressionCommandExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/ReadExpressionCommandExtensionsAsync.cs
@@ -16,36 +16,36 @@ internal static class ReadExpressionCommandExtensionsAsync
     {
         internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, Func<SqlExpression<T>, SqlExpression<T>> expression, CancellationToken token)
         {
-            var expr = dbCmd.GetDialectProvider().SqlExpression<T>();
-            var sql = expression(expr).SelectInto<T>();
-            return dbCmd.ExprConvertToListAsync<T>(sql, token);
+            var q = dbCmd.GetDialectProvider().SqlExpression<T>();
+            var sql = expression(q).SelectInto<T>();
+            return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);
         }
 
         internal static Task<List<Into>> SelectAsync<Into, From>(this IDbCommand dbCmd, Func<SqlExpression<From>, SqlExpression<From>> expression, CancellationToken token)
         {
-            var expr = dbCmd.GetDialectProvider().SqlExpression<From>();
-            string sql = expression(expr).SelectInto<Into>();
-            return dbCmd.ExprConvertToListAsync<Into>(sql, token);
+            var q = dbCmd.GetDialectProvider().SqlExpression<From>();
+            string sql = expression(q).SelectInto<Into>();
+            return dbCmd.ExprConvertToListAsync<Into>(sql, q.Params, token);
         }
 
-        internal static Task<List<Into>> SelectAsync<Into, From>(this IDbCommand dbCmd, SqlExpression<From> expression, CancellationToken token)
+        internal static Task<List<Into>> SelectAsync<Into, From>(this IDbCommand dbCmd, SqlExpression<From> q, CancellationToken token)
         {
-            string sql = expression.SelectInto<Into>();
-            return dbCmd.ExprConvertToListAsync<Into>(sql, token);
+            string sql = q.SelectInto<Into>();
+            return dbCmd.ExprConvertToListAsync<Into>(sql, q.Params, token);
         }
 
-        internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression, CancellationToken token)
+        internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, SqlExpression<T> q, CancellationToken token)
         {
-            string sql = expression.SelectInto<T>();
-            return dbCmd.ExprConvertToListAsync<T>(sql, token);
+            string sql = q.SelectInto<T>();
+            return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);
         }
 
         internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate, CancellationToken token)
         {
-            var expr = dbCmd.GetDialectProvider().SqlExpression<T>();
-            string sql = expr.Where(predicate).SelectInto<T>();
+            var q = dbCmd.GetDialectProvider().SqlExpression<T>();
+            string sql = q.Where(predicate).SelectInto<T>();
 
-            return dbCmd.ExprConvertToListAsync<T>(sql, token);
+            return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);
         }
 
         internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, Func<SqlExpression<T>, SqlExpression<T>> expression, CancellationToken token)
@@ -56,16 +56,16 @@ internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, Func<SqlExpression
 
         internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate, CancellationToken token)
         {
-            var ev = dbCmd.GetDialectProvider().SqlExpression<T>();
+            var q = dbCmd.GetDialectProvider().SqlExpression<T>();
 
-            return SingleAsync(dbCmd, ev.Where(predicate), token);
+            return SingleAsync(dbCmd, q.Where(predicate), token);
         }
 
         internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression, CancellationToken token)
         {
             string sql = expression.Limit(1).SelectInto<T>();
 
-            return dbCmd.ConvertToAsync<T>(sql, token);
+            return dbCmd.ExprConvertToAsync<T>(sql, expression.Params, token);
         }
 
         public static Task<TKey> ScalarAsync<T, TKey>(this IDbCommand dbCmd, Expression<Func<T, TKey>> field, CancellationToken token)
@@ -173,10 +173,10 @@ internal static Task<List<T>> ExprConvertToListAsync<T>(this IDataReader reader,
 
         internal static Task<List<T>> Select<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate, CancellationToken token)
         {
-            var expr = dbCmd.GetDialectProvider().SqlExpression<T>();
-            string sql = expr.Where(predicate).SelectInto<T>();
+            var q = dbCmd.GetDialectProvider().SqlExpression<T>();
+            string sql = q.Where(predicate).SelectInto<T>();
 
-            return dbCmd.ExprConvertToListAsync<T>(sql, token);
+            return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);
         }
 
     }
diff --git a/src/ServiceStack.OrmLite/OrmLiteResultsFilterExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteResultsFilterExtensions.cs
@@ -121,7 +121,7 @@ internal static List<T> ExprConvertToList<T>(this IDbCommand dbCmd, string sql =
             if (sql != null)
                 dbCmd.CommandText = sql;
 
-            SetParameters(dbCmd, sqlParams);
+            dbCmd.SetParameters(sqlParams);
 
             if (OrmLiteConfig.ResultsFilter != null)
             {
@@ -235,7 +235,7 @@ internal static T ExprConvertTo<T>(this IDbCommand dbCmd, string sql = null, IEn
             if (sql != null)
                 dbCmd.CommandText = sql;
 
-            SetParameters(dbCmd, sqlParams);
+            dbCmd.SetParameters(sqlParams);
 
             if (OrmLiteConfig.ResultsFilter != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,13 @@ public static Task<IList> ConvertToListAsync(this IDbCommand dbCmd, Type refType`
`86`	`86`	`.Then(reader => reader.ConvertToListAsync(dialectProvider, refType, token)).Unwrap();`
`87`	`87`	`}`
`88`	`88`
`89`		`- internal static Task<List<T>> ExprConvertToListAsync<T>(this IDbCommand dbCmd, string sql, CancellationToken token)`
	`89`	`+ internal static Task<List<T>> ExprConvertToListAsync<T>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)`
`90`	`90`	`{`
`91`	`91`	`if (sql != null)`
`92`	`92`	`dbCmd.CommandText = sql;`
`93`	`93`
	`94`	`+ dbCmd.SetParameters(sqlParams);`
	`95`	`+`
`94`	`96`	`if (OrmLiteConfig.ResultsFilter != null)`
`95`	`97`	`return OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd).InTask();`
`96`	`98`
`@@ -185,11 +187,13 @@ public static Task<long> ExecLongScalarAsync(this IDbCommand dbCmd, string sql,`
`185`	`187`	`return dbCmd.LongScalarAsync(token);`
`186`	`188`	`}`
`187`	`189`
`188`		`- internal static Task<T> ExprConvertToAsync<T>(this IDbCommand dbCmd, string sql, CancellationToken token)`
	`190`	`+ internal static Task<T> ExprConvertToAsync<T>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)`
`189`	`191`	`{`
`190`	`192`	`if (sql != null)`
`191`	`193`	`dbCmd.CommandText = sql;`
`192`	`194`
	`195`	`+ dbCmd.SetParameters(sqlParams);`
	`196`	`+`
`193`	`197`	`if (OrmLiteConfig.ResultsFilter != null)`
`194`	`198`	`return OrmLiteConfig.ResultsFilter.GetSingle<T>(dbCmd).InTask();`
`195`	`199`
Original file line number	Diff line number	Diff line change
`@@ -16,36 +16,36 @@ internal static class ReadExpressionCommandExtensionsAsync`
`16`	`16`	`{`
`17`	`17`	`internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, Func<SqlExpression<T>, SqlExpression<T>> expression, CancellationToken token)`
`18`	`18`	`{`
`19`		`- var expr = dbCmd.GetDialectProvider().SqlExpression<T>();`
`20`		`- var sql = expression(expr).SelectInto<T>();`
`21`		`- return dbCmd.ExprConvertToListAsync<T>(sql, token);`
	`19`	`+ var q = dbCmd.GetDialectProvider().SqlExpression<T>();`
	`20`	`+ var sql = expression(q).SelectInto<T>();`
	`21`	`+ return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`internal static Task<List<Into>> SelectAsync<Into, From>(this IDbCommand dbCmd, Func<SqlExpression<From>, SqlExpression<From>> expression, CancellationToken token)`
`25`	`25`	`{`
`26`		`- var expr = dbCmd.GetDialectProvider().SqlExpression<From>();`
`27`		`- string sql = expression(expr).SelectInto<Into>();`
`28`		`- return dbCmd.ExprConvertToListAsync<Into>(sql, token);`
	`26`	`+ var q = dbCmd.GetDialectProvider().SqlExpression<From>();`
	`27`	`+ string sql = expression(q).SelectInto<Into>();`
	`28`	`+ return dbCmd.ExprConvertToListAsync<Into>(sql, q.Params, token);`
`29`	`29`	`}`
`30`	`30`
`31`		`- internal static Task<List<Into>> SelectAsync<Into, From>(this IDbCommand dbCmd, SqlExpression<From> expression, CancellationToken token)`
	`31`	`+ internal static Task<List<Into>> SelectAsync<Into, From>(this IDbCommand dbCmd, SqlExpression<From> q, CancellationToken token)`
`32`	`32`	`{`
`33`		`- string sql = expression.SelectInto<Into>();`
`34`		`- return dbCmd.ExprConvertToListAsync<Into>(sql, token);`
	`33`	`+ string sql = q.SelectInto<Into>();`
	`34`	`+ return dbCmd.ExprConvertToListAsync<Into>(sql, q.Params, token);`
`35`	`35`	`}`
`36`	`36`
`37`		`- internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression, CancellationToken token)`
	`37`	`+ internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, SqlExpression<T> q, CancellationToken token)`
`38`	`38`	`{`
`39`		`- string sql = expression.SelectInto<T>();`
`40`		`- return dbCmd.ExprConvertToListAsync<T>(sql, token);`
	`39`	`+ string sql = q.SelectInto<T>();`
	`40`	`+ return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate, CancellationToken token)`
`44`	`44`	`{`
`45`		`- var expr = dbCmd.GetDialectProvider().SqlExpression<T>();`
`46`		`- string sql = expr.Where(predicate).SelectInto<T>();`
	`45`	`+ var q = dbCmd.GetDialectProvider().SqlExpression<T>();`
	`46`	`+ string sql = q.Where(predicate).SelectInto<T>();`
`47`	`47`
`48`		`- return dbCmd.ExprConvertToListAsync<T>(sql, token);`
	`48`	`+ return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, Func<SqlExpression<T>, SqlExpression<T>> expression, CancellationToken token)`
`@@ -56,16 +56,16 @@ internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, Func<SqlExpression`
`56`	`56`
`57`	`57`	`internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate, CancellationToken token)`
`58`	`58`	`{`
`59`		`- var ev = dbCmd.GetDialectProvider().SqlExpression<T>();`
	`59`	`+ var q = dbCmd.GetDialectProvider().SqlExpression<T>();`
`60`	`60`
`61`		`- return SingleAsync(dbCmd, ev.Where(predicate), token);`
	`61`	`+ return SingleAsync(dbCmd, q.Where(predicate), token);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression, CancellationToken token)`
`65`	`65`	`{`
`66`	`66`	`string sql = expression.Limit(1).SelectInto<T>();`
`67`	`67`
`68`		`- return dbCmd.ConvertToAsync<T>(sql, token);`
	`68`	`+ return dbCmd.ExprConvertToAsync<T>(sql, expression.Params, token);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public static Task<TKey> ScalarAsync<T, TKey>(this IDbCommand dbCmd, Expression<Func<T, TKey>> field, CancellationToken token)`
`@@ -173,10 +173,10 @@ internal static Task<List<T>> ExprConvertToListAsync<T>(this IDataReader reader,`
`173`	`173`
`174`	`174`	`internal static Task<List<T>> Select<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate, CancellationToken token)`
`175`	`175`	`{`
`176`		`- var expr = dbCmd.GetDialectProvider().SqlExpression<T>();`
`177`		`- string sql = expr.Where(predicate).SelectInto<T>();`
	`176`	`+ var q = dbCmd.GetDialectProvider().SqlExpression<T>();`
	`177`	`+ string sql = q.Where(predicate).SelectInto<T>();`
`178`	`178`
`179`		`- return dbCmd.ExprConvertToListAsync<T>(sql, token);`
	`179`	`+ return dbCmd.ExprConvertToListAsync<T>(sql, q.Params, token);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ internal static List<T> ExprConvertToList<T>(this IDbCommand dbCmd, string sql =`
`121`	`121`	`if (sql != null)`
`122`	`122`	`dbCmd.CommandText = sql;`
`123`	`123`
`124`		`- SetParameters(dbCmd, sqlParams);`
	`124`	`+ dbCmd.SetParameters(sqlParams);`
`125`	`125`
`126`	`126`	`if (OrmLiteConfig.ResultsFilter != null)`
`127`	`127`	`{`
`@@ -235,7 +235,7 @@ internal static T ExprConvertTo<T>(this IDbCommand dbCmd, string sql = null, IEn`
`235`	`235`	`if (sql != null)`
`236`	`236`	`dbCmd.CommandText = sql;`
`237`	`237`
`238`		`- SetParameters(dbCmd, sqlParams);`
	`238`	`+ dbCmd.SetParameters(sqlParams);`
`239`	`239`
`240`	`240`	`if (OrmLiteConfig.ResultsFilter != null)`
`241`	`241`	`{`