tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 18:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 完善 ISelect<T>.WithSql 方法，支持传入参数化 #413；

Browse Source
This commit is contained in:
28810 2020-08-13 10:25:01 +08:00
parent ae56952621
commit 5f645f194f
4 changed files with 23 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectTest.cs
View File

@ -1043,14 +1043,23 @@ WHERE (((cast(a.[Id] as nvarchar(100))) in (SELECT b.[Title]
}); });
var testUnionAll = select var testUnionAll = select
.WithSql("SELECT * FROM [tb_topic22] where id = 10") .WithSql("SELECT * FROM [tb_topic22] where id = @id1", new { id1 = 10 })
.WithSql("SELECT * FROM [tb_topic22] where id = 11") .WithSql("SELECT * FROM [tb_topic22] where id = @id2", new { id2 = 11 })
.ToSql(a => new .ToSql(a => new
{ {
a.Id, a.Id,
a.Clicks a.Clicks
}); });
var testUnionAllToList = select
.WithSql("SELECT * FROM [tb_topic22] where id = @id1", new { id1 = 10 })
.WithSql("SELECT * FROM [tb_topic22] where id = @id2", new { id2 = 11 })
.ToList(a => new
{
a.Id,
a.Clicks
});
var testUnionAll2 = g.sqlite.Select<object>() var testUnionAll2 = g.sqlite.Select<object>()
.WithSql("SELECT * FROM [tb_topic22] where id = 10") .WithSql("SELECT * FROM [tb_topic22] where id = 10")
.WithSql("SELECT * FROM [tb_topic22] where id = 11") .WithSql("SELECT * FROM [tb_topic22] where id = 11")

158
FreeSql/FreeSql.xml
View File

@ -1983,12 +1983,15 @@
<param name="then">即能 ThenInclude，还可以二次过滤（这个 EFCore 做不到？）</param> <param name="then">即能 ThenInclude，还可以二次过滤（这个 EFCore 做不到？）</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.ISelect`1.WithSql(System.String)"> <member name="M:FreeSql.ISelect`1.WithSql(System.String,System.Object)">
<summary> <summary>
实现 select .. from ( select ... from t ) a 这样的功能<para></para> 实现 select .. from ( select ... from t ) a 这样的功能<para></para>
使用 AsTable 方法也可以达到效果 使用 AsTable 方法也可以达到效果<para></para>
示例：WithSql("select * from id=?id", new { id = 1 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary> </summary>
<param name="sql">SQL语句</param> <param name="sql">SQL语句</param>
<param name="parms">参数</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.ISelectFromExpression`1.Where(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})"> <member name="M:FreeSql.ISelectFromExpression`1.Where(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
@ -2594,145 +2597,6 @@
<param name="parms"></param> <param name="parms"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
</summary>
<param name="readerHander"></param>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.String,System.Object)">
<summary>
查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object)">
<summary>
查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object)">
<summary>
查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询
</summary>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object)">
<summary>
查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object)">
<summary>
在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object)">
<summary>
在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T1"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object)">
<summary>
执行SQL返回对象集合，Query&lt;User, Address&gt;("select * from user where age > ?age; select * from address", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T1"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<returns></returns>
</member>
<member name="E:FreeSql.IAop.ParseExpression"> <member name="E:FreeSql.IAop.ParseExpression">
<summary> <summary>
可自定义解析表达式 可自定义解析表达式
@ -3419,12 +3283,6 @@
<param name="timeout">超时</param> <param name="timeout">超时</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
<summary>
获取资源
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)"> <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
<summary> <summary>
使用完毕后，归还资源 使用完毕后，归还资源
@ -3495,12 +3353,6 @@
</summary> </summary>
<param name="obj">资源对象</param> <param name="obj">资源对象</param>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnGetAsync(FreeSql.Internal.ObjectPool.Object{`0})">
<summary>
从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
</summary>
<param name="obj">资源对象</param>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})"> <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})">
<summary> <summary>
归还对象给对象池的时候触发 归还对象给对象池的时候触发

7
FreeSql/Interface/Curd/ISelect/ISelect1.cs
View File

@ -373,10 +373,13 @@ namespace FreeSql
/// <summary> /// <summary>
/// 实现 select .. from ( select ... from t ) a 这样的功能<para></para> /// 实现 select .. from ( select ... from t ) a 这样的功能<para></para>
/// 使用 AsTable 方法也可以达到效果 /// 使用 AsTable 方法也可以达到效果<para></para>
/// 示例：WithSql("select * from id=?id", new { id = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary> /// </summary>
/// <param name="sql">SQL语句</param> /// <param name="sql">SQL语句</param>
/// <param name="parms">参数</param>
/// <returns></returns> /// <returns></returns>
ISelect<T1> WithSql(string sql); ISelect<T1> WithSql(string sql, object parms = null);
} }
} }

3
FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs
View File

@ -256,13 +256,14 @@ namespace FreeSql.Internal.CommonProvider
return this; return this;
} }
public ISelect<T1> WithSql(string sql) public ISelect<T1> WithSql(string sql, object parms = null)
{ {
this.AsTable((type, old) => this.AsTable((type, old) =>
{ {
if (type == _tables.First().Table?.Type) return $"( {sql} )"; if (type == _tables.First().Table?.Type) return $"( {sql} )";
return old; return old;
}); });
if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
return this; return this;
} }