tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2026-05-14 23:36:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

update summary

Browse Source
This commit is contained in:
2881099
2020-11-26 18:38:15 +08:00
parent 8373411f63
commit 1bbf00a3e2
11 changed files with 77 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FreeSql/Interface/Curd/IDelete.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace FreeSql
/// <returns></returns>
IDelete<T1> WhereIf(bool condition, Expression<Func<T1, bool>> exp);
/// <summary>
/// 原生sql语法条件，Where("id = ?id", new { id = 1 })<para></para>
/// 原生sql语法条件，Where("id = @id", new { id = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法条件</param>
FreeSql/Interface/Curd/ISelect/ISelect0.cs
+9 -9
View File
@@ -238,7 +238,7 @@ namespace FreeSql
TSelect RightJoin<T2>(Expression<Func<T1, T2, bool>> exp);
/// <summary>
/// 左联查询，使用原生sql语法，LeftJoin("type b on b.id = a.id and b.clicks > ?clicks", new { clicks = 1 })<para></para>
/// 左联查询，使用原生sql语法，LeftJoin("type b on b.id = a.id and b.clicks > @clicks", new { clicks = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法条件</param>
@@ -246,7 +246,7 @@ namespace FreeSql
/// <returns></returns>
TSelect LeftJoin(string sql, object parms = null);
/// <summary>
/// 联接查询，使用原生sql语法，InnerJoin("type b on b.id = a.id and b.clicks > ?clicks", new { clicks = 1 })<para></para>
/// 联接查询，使用原生sql语法，InnerJoin("type b on b.id = a.id and b.clicks > @clicks", new { clicks = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法条件</param>
@@ -254,7 +254,7 @@ namespace FreeSql
/// <returns></returns>
TSelect InnerJoin(string sql, object parms = null);
/// <summary>
/// 右联查询，使用原生sql语法，RightJoin("type b on b.id = a.id and b.clicks > ?clicks", new { clicks = 1 })<para></para>
/// 右联查询，使用原生sql语法，RightJoin("type b on b.id = a.id and b.clicks > @clicks", new { clicks = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法条件</param>
@@ -270,7 +270,7 @@ namespace FreeSql
TSelect RawJoin(string sql);
/// <summary>
/// 原生sql语法条件，Where("id = ?id", new { id = 1 })<para></para>
/// 原生sql语法条件，Where("id = @id", new { id = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法条件</param>
@@ -278,7 +278,7 @@ namespace FreeSql
/// <returns></returns>
TSelect Where(string sql, object parms = null);
/// <summary>
/// 原生sql语法条件，WhereIf(true, "id = ?id", new { id = 1 })<para></para>
/// 原生sql语法条件，WhereIf(true, "id = @id", new { id = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="condition">true 时生效</param>
@@ -318,7 +318,7 @@ namespace FreeSql
TSelect ForUpdate(bool nowait = false);
/// <summary>
/// 按原生sql语法分组，GroupBy("concat(name, ?cc)", new { cc = 1 })<para></para>
/// 按原生sql语法分组，GroupBy("concat(name, @cc)", new { cc = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法</param>
@@ -326,7 +326,7 @@ namespace FreeSql
/// <returns></returns>
TSelect GroupBy(string sql, object parms = null);
/// <summary>
/// 按原生sql语法聚合条件过滤，Having("count(name) = ?cc", new { cc = 1 })<para></para>
/// 按原生sql语法聚合条件过滤，Having("count(name) = @cc", new { cc = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法条件</param>
@@ -335,7 +335,7 @@ namespace FreeSql
TSelect Having(string sql, object parms = null);
/// <summary>
/// 按原生sql语法排序，OrderBy("count(name) + ?cc desc", new { cc = 1 })<para></para>
/// 按原生sql语法排序，OrderBy("count(name) + @cc desc", new { cc = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法</param>
@@ -343,7 +343,7 @@ namespace FreeSql
/// <returns></returns>
TSelect OrderBy(string sql, object parms = null);
/// <summary>
/// 按原生sql语法排序，OrderBy(true, "count(name) + ?cc desc", new { cc = 1 })<para></para>
/// 按原生sql语法排序，OrderBy(true, "count(name) + @cc desc", new { cc = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="condition">true 时生效</param>
FreeSql/Interface/Curd/ISelect/ISelect1.cs
+1 -1
View File
@@ -360,7 +360,7 @@ namespace FreeSql
/// <summary>
/// 实现 select .. from ( select ... from t ) a 这样的功能<para></para>
/// 使用 AsTable 方法也可以达到效果<para></para>
/// 示例：WithSql("select * from id=?id", new { id = 1 })<para></para>
/// 示例：WithSql("select * from id=@id", new { id = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">SQL语句</param>
FreeSql/Interface/Curd/ISelect/ISelect2`16.cs
+1 -9
View File
@@ -1,5 +1,4 @@
using FreeSql.Internal.Model;
using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -10,13 +9,6 @@ using System.Threading.Tasks;
namespace FreeSql
{
public interface ISelect<T1, T2> : ISelect0<ISelect<T1, T2>, T1> where T2 : class
{
FreeSql/Interface/Curd/IUpdate.cs
+2 -2
View File
@@ -151,7 +151,7 @@ namespace FreeSql
/// <returns></returns>
IUpdate<T1> SetIf<TMember>(bool condition, Expression<Func<T1, TMember>> exp);
/// <summary>
/// 设置值，自定义SQL语法，SetRaw("title = ?title", new { title = "newtitle" })<para></para>
/// 设置值，自定义SQL语法，SetRaw("title = @title", new { title = "newtitle" })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法</param>
@@ -185,7 +185,7 @@ namespace FreeSql
/// <returns></returns>
IUpdate<T1> WhereIf(bool condition, Expression<Func<T1, bool>> exp);
/// <summary>
/// 原生sql语法条件，Where("id = ?id", new { id = 1 })<para></para>
/// 原生sql语法条件，Where("id = @id", new { id = 1 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="sql">sql语法条件</param>
FreeSql/Interface/IAdo.cs
+21 -21
View File
@@ -64,7 +64,7 @@ namespace FreeSql
DbParameter[] GetDbParamtersByObject(object obj);
/// <summary>
/// SQL 命令执行类，fsql.Ado.CommandFluent("select * from user where age > ?age", new { age = 25 })<para></para>
/// SQL 命令执行类，fsql.Ado.CommandFluent("select * from user where age > @age", new { age = 25 })<para></para>
/// .WithConnection(connection)<para></para>
/// .WithTransaction(transaction)<para></para>
/// .WithParameter("age", 25)<para></para>
@@ -98,7 +98,7 @@ namespace FreeSql
void ExecuteReader(DbTransaction transaction, Action<FetchCallbackArgs<DbDataReader>> fetchHandler, CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
void ExecuteReader(DbConnection connection, DbTransaction transaction, Action<FetchCallbackArgs<DbDataReader>> fetchHandler, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
/// <summary>
/// 查询，ExecuteReader(dr => {}, "select * from user where age > ?age", new { age = 25 })<para></para>
/// 查询，ExecuteReader(dr => {}, "select * from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="fetchHandler"></param>
@@ -117,7 +117,7 @@ namespace FreeSql
object[][] ExecuteArray(DbTransaction transaction, CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
object[][] ExecuteArray(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
/// <summary>
/// 查询，ExecuteArray("select * from user where age > ?age", new { age = 25 })<para></para>
/// 查询，ExecuteArray("select * from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -136,7 +136,7 @@ namespace FreeSql
DataSet ExecuteDataSet(DbTransaction transaction, CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
DataSet ExecuteDataSet(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
/// <summary>
/// 查询，ExecuteDataSet("select * from user where age > ?age; select 2", new { age = 25 })<para></para>
/// 查询，ExecuteDataSet("select * from user where age > @age; select 2", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -155,7 +155,7 @@ namespace FreeSql
DataTable ExecuteDataTable(DbTransaction transaction, CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
DataTable ExecuteDataTable(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
/// <summary>
/// 查询，ExecuteDataTable("select * from user where age > ?age", new { age = 25 })<para></para>
/// 查询，ExecuteDataTable("select * from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -174,7 +174,7 @@ namespace FreeSql
int ExecuteNonQuery(DbTransaction transaction, CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
int ExecuteNonQuery(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
/// <summary>
/// 在【主库】执行，ExecuteNonQuery("delete from user where age > ?age", new { age = 25 })<para></para>
/// 在【主库】执行，ExecuteNonQuery("delete from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -193,7 +193,7 @@ namespace FreeSql
object ExecuteScalar(DbTransaction transaction, CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
object ExecuteScalar(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
/// <summary>
/// 在【主库】执行，ExecuteScalar("select 1 from user where age > ?age", new { age = 25 })<para></para>
/// 在【主库】执行，ExecuteScalar("select 1 from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -204,7 +204,7 @@ namespace FreeSql
object ExecuteScalar(DbConnection connection, DbTransaction transaction, string cmdText, object parms = null);
/// <summary>
/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 })
/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="cmdType"></param>
@@ -217,7 +217,7 @@ namespace FreeSql
List<T> Query<T>(Type resultType, DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
T QuerySingle<T>(CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
/// <summary>
/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age", new { age = 25 })<para></para>
/// 执行SQL返回对象集合，Query&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>
@@ -230,7 +230,7 @@ namespace FreeSql
T QuerySingle<T>(string cmdText, object parms = null);
/// <summary>
/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
/// 执行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>
/// <typeparam name="T2"></typeparam>
@@ -242,7 +242,7 @@ namespace FreeSql
NativeTuple<List<T1>, List<T2>> Query<T1, T2>(DbTransaction transaction, CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
NativeTuple<List<T1>, List<T2>> Query<T1, T2>(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, params DbParameter[] cmdParms);
/// <summary>
/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new { age = 25 })<para></para>
/// 执行SQL返回对象集合，Query&lt;User&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>
@@ -298,7 +298,7 @@ namespace FreeSql
Task ExecuteReaderAsync(DbTransaction transaction, Func<FetchCallbackArgs<DbDataReader>, Task> readerHander, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task ExecuteReaderAsync(DbConnection connection, DbTransaction transaction, Func<FetchCallbackArgs<DbDataReader>, Task> readerHander, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > ?age", new { age = 25 })<para></para>
/// 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="readerHander"></param>
@@ -319,7 +319,7 @@ namespace FreeSql
Task<object[][]> ExecuteArrayAsync(DbTransaction transaction, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task<object[][]> ExecuteArrayAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 查询，ExecuteArrayAsync("select * from user where age > ?age", new { age = 25 })<para></para>
/// 查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -340,7 +340,7 @@ namespace FreeSql
Task<DataSet> ExecuteDataSetAsync(DbTransaction transaction, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task<DataSet> ExecuteDataSetAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 查询，ExecuteDataSetAsync("select * from user where age > ?age; select 2", new { age = 25 })<para></para>
/// 查询，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>
@@ -361,7 +361,7 @@ namespace FreeSql
Task<DataTable> ExecuteDataTableAsync(DbTransaction transaction, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task<DataTable> ExecuteDataTableAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 查询，ExecuteDataTableAsync("select * from user where age > ?age", new { age = 25 })<para></para>
/// 查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -382,7 +382,7 @@ namespace FreeSql
Task<int> ExecuteNonQueryAsync(DbTransaction transaction, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task<int> ExecuteNonQueryAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > ?age", new { age = 25 })<para></para>
/// 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -403,7 +403,7 @@ namespace FreeSql
Task<object> ExecuteScalarAsync(DbTransaction transaction, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task<object> ExecuteScalarAsync(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > ?age", new { age = 25 })<para></para>
/// 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 })<para></para>
/// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
/// </summary>
/// <param name="cmdText"></param>
@@ -415,7 +415,7 @@ namespace FreeSql
Task<object> ExecuteScalarAsync(DbConnection connection, DbTransaction transaction, string cmdText, object parms = null, CancellationToken cancellationToken = default);
/// <summary>
/// 执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new SqlParameter { ParameterName = "age", Value = 25 })
/// 执行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>
@@ -429,7 +429,7 @@ namespace FreeSql
Task<List<T>> QueryAsync<T>(Type resultType, DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task<T> QuerySingleAsync<T>(string cmdText, object parms = null, CancellationToken cancellationToken = default);
/// <summary>
/// 执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > ?age", new { age = 25 })<para></para>
/// 执行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>
@@ -443,7 +443,7 @@ namespace FreeSql
Task<T> QuerySingleAsync<T>(CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > ?age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
/// 执行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>
/// <typeparam name="T2"></typeparam>
@@ -456,7 +456,7 @@ namespace FreeSql
Task<NativeTuple<List<T1>, List<T2>>> QueryAsync<T1, T2>(DbTransaction transaction, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
Task<NativeTuple<List<T1>, List<T2>>> QueryAsync<T1, T2>(DbConnection connection, DbTransaction transaction, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default);
/// <summary>
/// 执行SQL返回对象集合，Query&lt;User, Address&gt;("select * from user where age > ?age; select * from address", new { age = 25 })<para></para>
/// 执行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>