From 37cd18d7c4343d0cd582c639f9638a85a456da00 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Thu, 12 Nov 2020 06:43:45 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0=20Async=20CancellationTo?= =?UTF-8?q?ken=20IDelete=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeSql.DbContext/FreeSql.DbContext.xml | 16 ---------------- FreeSql/Interface/Curd/IDelete.cs | 5 +++-- .../CommonProvider/DeleteProviderAsync.cs | 7 ++++--- .../FreeSql.Provider.Dameng/Curd/DamengDelete.cs | 3 ++- .../Curd/FirebirdDelete.cs | 5 +++-- .../Curd/KingbaseESDelete.cs | 5 +++-- .../Curd/MsAccessDelete.cs | 3 ++- .../FreeSql.Provider.MySql/Curd/MySqlDelete.cs | 5 +++-- .../Dameng/Curd/OdbcDamengDelete.cs | 3 ++- .../Default/Curd/OdbcDelete.cs | 3 ++- .../KingbaseES/Curd/OdbcKingbaseESDelete.cs | 5 +++-- .../MySql/Curd/OdbcMySqlDelete.cs | 5 +++-- .../Oracle/Curd/OdbcOracleDelete.cs | 3 ++- .../PostgreSQL/Curd/OdbcPostgreSQLDelete.cs | 5 +++-- .../SqlServer/Curd/OdbcSqlServerDelete.cs | 5 +++-- .../FreeSql.Provider.Oracle/Curd/OracleDelete.cs | 3 ++- .../Curd/PostgreSQLDelete.cs | 5 +++-- .../Curd/ShenTongDelete.cs | 5 +++-- .../Curd/SqlServerDelete.cs | 5 +++-- .../FreeSql.Provider.Sqlite/Curd/SqliteDelete.cs | 3 ++- 20 files changed, 51 insertions(+), 48 deletions(-) diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 2d6d3409..b3c14870 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -130,13 +130,6 @@ 清空状态数据 - - - 根据 lambda 条件删除数据 - - - - 添加 @@ -509,14 +502,5 @@ - - - 批量注入 Repository，可以参考代码自行调整 - - - - - - diff --git a/FreeSql/Interface/Curd/IDelete.cs b/FreeSql/Interface/Curd/IDelete.cs index 4d9bd3e8..7a460d31 100644 --- a/FreeSql/Interface/Curd/IDelete.cs +++ b/FreeSql/Interface/Curd/IDelete.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Data.Common; using System.Linq.Expressions; +using System.Threading; using System.Threading.Tasks; namespace FreeSql @@ -109,8 +110,8 @@ namespace FreeSql #if net40 #else - Task ExecuteAffrowsAsync(); - Task> ExecuteDeletedAsync(); + Task ExecuteAffrowsAsync(CancellationToken cancellationToken = default); + Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default); #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/DeleteProviderAsync.cs b/FreeSql/Internal/CommonProvider/DeleteProviderAsync.cs index 380ee6f8..64af2765 100644 --- a/FreeSql/Internal/CommonProvider/DeleteProviderAsync.cs +++ b/FreeSql/Internal/CommonProvider/DeleteProviderAsync.cs @@ -5,6 +5,7 @@ using System.Data; using System.Data.Common; using System.Linq.Expressions; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Internal.CommonProvider @@ -13,7 +14,7 @@ namespace FreeSql.Internal.CommonProvider { #if net40 #else - async public Task ExecuteAffrowsAsync() + async public Task ExecuteAffrowsAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return 0; @@ -24,7 +25,7 @@ namespace FreeSql.Internal.CommonProvider Exception exception = null; try { - affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { @@ -39,7 +40,7 @@ namespace FreeSql.Internal.CommonProvider this.ClearData(); return affrows; } - public abstract Task> ExecuteDeletedAsync(); + public abstract Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default); #endif } } diff --git a/Providers/FreeSql.Provider.Dameng/Curd/DamengDelete.cs b/Providers/FreeSql.Provider.Dameng/Curd/DamengDelete.cs index 67c82634..800b2a10 100644 --- a/Providers/FreeSql.Provider.Dameng/Curd/DamengDelete.cs +++ b/Providers/FreeSql.Provider.Dameng/Curd/DamengDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Dameng.Curd @@ -22,7 +23,7 @@ namespace FreeSql.Dameng.Curd #if net40 #else - public override Task> ExecuteDeletedAsync() + public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { throw new NotImplementedException(); } diff --git a/Providers/FreeSql.Provider.Firebird/Curd/FirebirdDelete.cs b/Providers/FreeSql.Provider.Firebird/Curd/FirebirdDelete.cs index 8d00109a..4821de2b 100644 --- a/Providers/FreeSql.Provider.Firebird/Curd/FirebirdDelete.cs +++ b/Providers/FreeSql.Provider.Firebird/Curd/FirebirdDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Firebird.Curd @@ -56,7 +57,7 @@ namespace FreeSql.Firebird.Curd #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.Firebird.Curd Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESDelete.cs b/Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESDelete.cs index f44eebb4..b7b9c8a6 100644 --- a/Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESDelete.cs +++ b/Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.KingbaseES @@ -56,7 +57,7 @@ namespace FreeSql.KingbaseES #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.KingbaseES Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.MsAccess/Curd/MsAccessDelete.cs b/Providers/FreeSql.Provider.MsAccess/Curd/MsAccessDelete.cs index c0b00c49..3c5fd1fd 100644 --- a/Providers/FreeSql.Provider.MsAccess/Curd/MsAccessDelete.cs +++ b/Providers/FreeSql.Provider.MsAccess/Curd/MsAccessDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.MsAccess.Curd @@ -22,7 +23,7 @@ namespace FreeSql.MsAccess.Curd #if net40 #else - public override Task> ExecuteDeletedAsync() + public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { throw new NotImplementedException(); } diff --git a/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs b/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs index 1c04f9d4..ecc9038a 100644 --- a/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs +++ b/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.MySql.Curd @@ -56,7 +57,7 @@ namespace FreeSql.MySql.Curd #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.MySql.Curd Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengDelete.cs b/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengDelete.cs index 01b4db9f..a57a8a84 100644 --- a/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengDelete.cs +++ b/Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Odbc.Dameng @@ -22,7 +23,7 @@ namespace FreeSql.Odbc.Dameng #if net40 #else - public override Task> ExecuteDeletedAsync() + public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { throw new NotImplementedException(); } diff --git a/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcDelete.cs b/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcDelete.cs index 74350ebc..76e0495e 100644 --- a/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcDelete.cs +++ b/Providers/FreeSql.Provider.Odbc/Default/Curd/OdbcDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Odbc.Default @@ -19,7 +20,7 @@ namespace FreeSql.Odbc.Default #if net40 #else - public override Task> ExecuteDeletedAsync() => throw new NotImplementedException("FreeSql.Odbc.Default 未实现该功能"); + public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException("FreeSql.Odbc.Default 未实现该功能"); #endif } } diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/Curd/OdbcKingbaseESDelete.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/Curd/OdbcKingbaseESDelete.cs index 80e0e261..e5e2a6ad 100644 --- a/Providers/FreeSql.Provider.Odbc/KingbaseES/Curd/OdbcKingbaseESDelete.cs +++ b/Providers/FreeSql.Provider.Odbc/KingbaseES/Curd/OdbcKingbaseESDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Odbc.KingbaseES @@ -56,7 +57,7 @@ namespace FreeSql.Odbc.KingbaseES #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.Odbc.KingbaseES Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs index 5bf46d38..ba40ad77 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Odbc.MySql @@ -56,7 +57,7 @@ namespace FreeSql.Odbc.MySql #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.Odbc.MySql Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleDelete.cs b/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleDelete.cs index 992edefd..a5e87939 100644 --- a/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleDelete.cs +++ b/Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Odbc.Oracle @@ -22,7 +23,7 @@ namespace FreeSql.Odbc.Oracle #if net40 #else - public override Task> ExecuteDeletedAsync() + public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { throw new NotImplementedException(); } diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLDelete.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLDelete.cs index bf41c0da..e944faef 100644 --- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLDelete.cs +++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Odbc.PostgreSQL @@ -56,7 +57,7 @@ namespace FreeSql.Odbc.PostgreSQL #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.Odbc.PostgreSQL Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerDelete.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerDelete.cs index 186dab45..ed74709e 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerDelete.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Odbc.SqlServer @@ -61,7 +62,7 @@ namespace FreeSql.Odbc.SqlServer #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -89,7 +90,7 @@ namespace FreeSql.Odbc.SqlServer Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.Oracle/Curd/OracleDelete.cs b/Providers/FreeSql.Provider.Oracle/Curd/OracleDelete.cs index ddc12132..618819b8 100644 --- a/Providers/FreeSql.Provider.Oracle/Curd/OracleDelete.cs +++ b/Providers/FreeSql.Provider.Oracle/Curd/OracleDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Oracle.Curd @@ -22,7 +23,7 @@ namespace FreeSql.Oracle.Curd #if net40 #else - public override Task> ExecuteDeletedAsync() + public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { throw new NotImplementedException(); } diff --git a/Providers/FreeSql.Provider.PostgreSQL/Curd/PostgreSQLDelete.cs b/Providers/FreeSql.Provider.PostgreSQL/Curd/PostgreSQLDelete.cs index dc640615..febe1cd7 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/Curd/PostgreSQLDelete.cs +++ b/Providers/FreeSql.Provider.PostgreSQL/Curd/PostgreSQLDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.PostgreSQL.Curd @@ -56,7 +57,7 @@ namespace FreeSql.PostgreSQL.Curd #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.PostgreSQL.Curd Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.ShenTong/Curd/ShenTongDelete.cs b/Providers/FreeSql.Provider.ShenTong/Curd/ShenTongDelete.cs index a7d7aba2..326b0bb1 100644 --- a/Providers/FreeSql.Provider.ShenTong/Curd/ShenTongDelete.cs +++ b/Providers/FreeSql.Provider.ShenTong/Curd/ShenTongDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.ShenTong.Curd @@ -56,7 +57,7 @@ namespace FreeSql.ShenTong.Curd #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -79,7 +80,7 @@ namespace FreeSql.ShenTong.Curd Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerDelete.cs b/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerDelete.cs index 21a877d4..d7a9fe92 100644 --- a/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerDelete.cs +++ b/Providers/FreeSql.Provider.SqlServer/Curd/SqlServerDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.SqlServer.Curd @@ -61,7 +62,7 @@ namespace FreeSql.SqlServer.Curd #if net40 #else - async public override Task> ExecuteDeletedAsync() + async public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { var sql = this.ToSql(); if (string.IsNullOrEmpty(sql)) return new List(); @@ -89,7 +90,7 @@ namespace FreeSql.SqlServer.Curd Exception exception = null; try { - ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms); + ret = await _orm.Ado.QueryAsync(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken); } catch (Exception ex) { diff --git a/Providers/FreeSql.Provider.Sqlite/Curd/SqliteDelete.cs b/Providers/FreeSql.Provider.Sqlite/Curd/SqliteDelete.cs index 25c104ff..3a108707 100644 --- a/Providers/FreeSql.Provider.Sqlite/Curd/SqliteDelete.cs +++ b/Providers/FreeSql.Provider.Sqlite/Curd/SqliteDelete.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace FreeSql.Sqlite.Curd @@ -22,7 +23,7 @@ namespace FreeSql.Sqlite.Curd #if net40 #else - public override Task> ExecuteDeletedAsync() + public override Task> ExecuteDeletedAsync(CancellationToken cancellationToken = default) { throw new NotImplementedException(); }