mirror of
https://github.com/nsnail/FreeSql.git
synced 2026-05-13 23:06:17 +08:00
- 补充 同线程时间 fsql.Transaction 事务等级参数的传入；
This commit is contained in:
28810
+164
-183
@@ -1960,10 +1960,18 @@
|
||||
</summary>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
</member>
|
||||
<member name="M:FreeSql.IAdo.Transaction(System.Action,System.TimeSpan)">
|
||||
<member name="M:FreeSql.IAdo.Transaction(System.TimeSpan,System.Action)">
|
||||
<summary>
|
||||
撘��臭��∴�銝齿𣈲���甇伐�
|
||||
</summary>
|
||||
<param name="timeout">頞�𧒄嚗峕𧊋�扯�摰���芸𢆡�𣂷漱</param>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
</member>
|
||||
<member name="M:FreeSql.IAdo.Transaction(System.Data.IsolationLevel,System.TimeSpan,System.Action)">
|
||||
<summary>
|
||||
撘��臭��∴�銝齿𣈲���甇伐�
|
||||
</summary>
|
||||
<param name="isolationLevel"></param>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
<param name="timeout">頞�𧒄嚗峕𧊋�扯�摰���芸𢆡�𣂷漱</param>
|
||||
</member>
|
||||
@@ -2256,187 +2264,7 @@
|
||||
</member>
|
||||
<member name="P:FreeSql.IAop.CurdAfter">
|
||||
<summary>
|
||||
增删查改，执行命令完成后触发
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.IAop.SyncStructureBefore">
|
||||
<summary>
|
||||
CodeFirst迁移，执行之前触发
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.IAop.SyncStructureAfter">
|
||||
<summary>
|
||||
CodeFirst迁移，执行完成触发
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.IAop.AuditValue">
|
||||
<summary>
|
||||
Insert/Update自动值处理
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ParseExpressionEventArgs.FreeParse">
|
||||
<summary>
|
||||
内置解析功能，可辅助您进行解析
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ParseExpressionEventArgs.Expression">
|
||||
<summary>
|
||||
需要您解析的表达式
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ParseExpressionEventArgs.Result">
|
||||
<summary>
|
||||
解析后的内容
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ConfigEntityEventArgs.EntityType">
|
||||
<summary>
|
||||
实体类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ConfigEntityEventArgs.ModifyResult">
|
||||
<summary>
|
||||
实体配置
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ConfigEntityEventArgs.ModifyIndexResult">
|
||||
<summary>
|
||||
索引配置
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ConfigEntityPropertyEventArgs.EntityType">
|
||||
<summary>
|
||||
实体类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ConfigEntityPropertyEventArgs.Property">
|
||||
<summary>
|
||||
实体的属性
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.ConfigEntityPropertyEventArgs.ModifyResult">
|
||||
<summary>
|
||||
实体的属性配置
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdBeforeEventArgs.Identifier">
|
||||
<summary>
|
||||
标识符，可将 CurdBefore 与 CurdAfter 进行匹配
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdBeforeEventArgs.CurdType">
|
||||
<summary>
|
||||
操作类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdBeforeEventArgs.EntityType">
|
||||
<summary>
|
||||
实体类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdBeforeEventArgs.Table">
|
||||
<summary>
|
||||
实体类型的元数据
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdBeforeEventArgs.Sql">
|
||||
<summary>
|
||||
执行的 SQL
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdBeforeEventArgs.DbParms">
|
||||
<summary>
|
||||
参数化命令
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdAfterEventArgs.Exception">
|
||||
<summary>
|
||||
发生的错误
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdAfterEventArgs.ExecuteResult">
|
||||
<summary>
|
||||
执行SQL命令，返回的结果
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdAfterEventArgs.ElapsedTicks">
|
||||
<summary>
|
||||
耗时（单位：Ticks）
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.CurdAfterEventArgs.ElapsedMilliseconds">
|
||||
<summary>
|
||||
耗时（单位：毫秒）
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.SyncStructureBeforeEventArgs.Identifier">
|
||||
<summary>
|
||||
标识符，可将 SyncStructureBeforeEventArgs 与 SyncStructureAfterEventArgs 进行匹配
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.SyncStructureBeforeEventArgs.EntityTypes">
|
||||
<summary>
|
||||
实体类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.SyncStructureAfterEventArgs.Sql">
|
||||
<summary>
|
||||
执行的 SQL
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.SyncStructureAfterEventArgs.Exception">
|
||||
<summary>
|
||||
发生的错误
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.SyncStructureAfterEventArgs.ElapsedTicks">
|
||||
<summary>
|
||||
耗时（单位：Ticks）
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.SyncStructureAfterEventArgs.ElapsedMilliseconds">
|
||||
<summary>
|
||||
耗时（单位：毫秒）
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.AuditValueEventArgs.AuditValueType">
|
||||
<summary>
|
||||
类型
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.AuditValueEventArgs.Column">
|
||||
<summary>
|
||||
属性列的元数据
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.AuditValueEventArgs.Property">
|
||||
<summary>
|
||||
反射的属性信息
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.Aop.AuditValueEventArgs.Value">
|
||||
<summary>
|
||||
获取实体的属性值，也可以设置实体的属性新值
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.ICodeFirst.IsAutoSyncStructure">
|
||||
<summary>
|
||||
【开发环境必备】自动同步实体结构到数据库，程序运行中检查实体表是否存在，然后创建或修改
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.ICodeFirst.IsSyncStructureToLower">
|
||||
<summary>
|
||||
转小写同步结构
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.ICodeFirst.IsSyncStructureToUpper">
|
||||
<summary>
|
||||
转大写同步结构
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:FreeSql.ICodeFirst.IsConfigEntityFromDbFirst">
|
||||
<summary>
|
||||
将数据库的主键、自增、索引设置导入，适用 DbFirst 模式，无须在实体类型上设置 [Column(IsPrimary)] 或者 ConfigEntity。此功能目前可用于 mysql/sqlserver/postgresql/oracle。<para></para>
|
||||
�𤥁�� ConfigEntity��迨�蠘��桀��舐鍂鈭� mysql/sqlserver/postgresql/oracle��<para></para>
|
||||
�砍��賭�敶勗� IFreeSql 擐𡝗活霈輸䔮���笔漲��<para></para>
|
||||
�乩蝙�� CodeFirst �𥕦遣蝝Ｗ��𠬍���凒�亙銁�唳旿摨㮖�撱箔�蝝Ｗ�嚗諹𥅾�䭾𧋦�蠘�銝衤�甈� CodeFirst 餈�宏�嗆㺭�桀�銝𠰴�撱箇�蝝Ｗ�撠�◤�𣳇膄
|
||||
</summary>
|
||||
@@ -2970,10 +2798,163 @@
|
||||
</summary>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Transaction(System.Action,System.TimeSpan)">
|
||||
<member name="M:IFreeSql.Transaction(System.TimeSpan,System.Action)">
|
||||
<summary>
|
||||
撘��臭��∴�銝齿𣈲���甇伐�
|
||||
</summary>
|
||||
<param name="timeout">頞�𧒄嚗峕𧊋�扯�摰���芸𢆡�𣂷漱</param>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.TimeSpan,System.Action)">
|
||||
<summary>
|
||||
撘��臭��∴�銝齿𣈲���甇伐�
|
||||
�
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:System.Linq.Expressions.LambadaExpressionExtensions.And``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}},System.Boolean,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
|
||||
<summary>
|
||||
雿輻鍂 and �潭𦻖銝支葵 lambda 銵刻噢撘�
|
||||
</summary>
|
||||
<typeparam name="T"></typeparam>
|
||||
<param name="exp1"></param>
|
||||
<param name="condition">true �嗥���</param>
|
||||
<param name="exp2"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:System.Linq.Expressions.LambadaExpressionExtensions.Or``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
|
||||
<summary>
|
||||
雿輻鍂 or �潭𦻖銝支葵 lambda 銵刻噢撘�
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:System.Linq.Expressions.LambadaExpressionExtensions.Or``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}},System.Boolean,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
|
||||
<summary>
|
||||
雿輻鍂 or �潭𦻖銝支葵 lambda 銵刻噢撘�
|
||||
</summary>
|
||||
<typeparam name="T"></typeparam>
|
||||
<param name="exp1"></param>
|
||||
<param name="condition">true �嗥���</param>
|
||||
<param name="exp2"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:System.Linq.Expressions.LambadaExpressionExtensions.Not``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}},System.Boolean)">
|
||||
<summary>
|
||||
撠� lambda 銵刻噢撘誩���
|
||||
</summary>
|
||||
<typeparam name="T"></typeparam>
|
||||
<param name="exp"></param>
|
||||
<param name="condition">true �嗥���</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:FreeUtil.NewMongodbId">
|
||||
<summary>
|
||||
���蝐颱撮Mongodb��bjectId�匧�����滚�Guid
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Insert``1">
|
||||
<summary>
|
||||
�鍦��唳旿
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Insert``1(``0)">
|
||||
<summary>
|
||||
�鍦��唳旿嚗䔶��亙�雿�
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<param name="source"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Insert``1(``0[])">
|
||||
<summary>
|
||||
�鍦��唳旿嚗䔶��亙�雿𤘪㺭蝏�
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<param name="source"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Insert``1(System.Collections.Generic.List{``0})">
|
||||
<summary>
|
||||
�鍦��唳旿嚗䔶��亙�雿㯄���
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<param name="source"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Insert``1(System.Collections.Generic.IEnumerable{``0})">
|
||||
<summary>
|
||||
�鍦��唳旿嚗䔶��亙�雿㯄���
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<param name="source"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Update``1">
|
||||
<summary>
|
||||
靽格㺿�唳旿
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Update``1(System.Object)">
|
||||
<summary>
|
||||
靽格㺿�唳旿嚗䔶��亙𢆡��笆鞊∪�嚗帋蜓�桀�� | new[]{銝駁睸��1,銝駁睸��2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<param name="dywhere">銝駁睸�潦��蜓�桀�潮������雿瓐���雿㯄�����鈡�滚笆鞊～��鈡�滚笆鞊⊿���</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Select``1">
|
||||
<summary>
|
||||
�亥砭�唳旿
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Select``1(System.Object)">
|
||||
<summary>
|
||||
�亥砭�唳旿嚗䔶��亙𢆡��笆鞊∪�嚗帋蜓�桀�� | new[]{銝駁睸��1,銝駁睸��2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<param name="dywhere">銝駁睸�潦��蜓�桀�潮������雿瓐���雿㯄�����鈡�滚笆鞊～��鈡�滚笆鞊⊿���</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Delete``1">
|
||||
<summary>
|
||||
�𣳇膄�唳旿
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Delete``1(System.Object)">
|
||||
<summary>
|
||||
�𣳇膄�唳旿嚗䔶��亙𢆡��笆鞊∪�嚗帋蜓�桀�� | new[]{銝駁睸��1,銝駁睸��2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
|
||||
</summary>
|
||||
<typeparam name="T1"></typeparam>
|
||||
<param name="dywhere">銝駁睸�潦��蜓�桀�潮������雿瓐���雿㯄�����鈡�滚笆鞊～��鈡�滚笆鞊⊿���</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Transaction(System.Action)">
|
||||
<summary>
|
||||
撘��臭��∴�銝齿𣈲���甇伐�嚗�60蝘埝𧊋�扯�摰���芸𢆡�𣂷漱
|
||||
</summary>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Transaction(System.TimeSpan,System.Action)">
|
||||
<summary>
|
||||
撘��臭��∴�銝齿𣈲���甇伐�
|
||||
</summary>
|
||||
<param name="timeout">頞�𧒄嚗峕𧊋�扯�摰���芸𢆡�𣂷漱</param>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
</member>
|
||||
<member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.TimeSpan,System.Action)">
|
||||
<summary>
|
||||
撘��臭��∴�銝齿𣈲���甇伐�
|
||||
</summary>
|
||||
<param name="isolationLevel"></param>
|
||||
<param name="handler">鈭见𦛚雿� () => {}</param>
|
||||
<param name="timeout">頞�𧒄嚗峕𧊋�扯�摰���芸𢆡�𣂷漱</param>
|
||||
</member>
|
||||
|
||||
@@ -41,9 +41,16 @@ namespace FreeSql
|
||||
/// <summary>
|
||||
/// 开启事务（不支持异步）
|
||||
/// </summary>
|
||||
/// <param name="timeout">超时，未执行完将自动提交</param>
|
||||
/// <param name="handler">事务体 () => {}</param>
|
||||
void Transaction(TimeSpan timeout, Action handler);
|
||||
/// <summary>
|
||||
/// 开启事务（不支持异步）
|
||||
/// </summary>
|
||||
/// <param name="isolationLevel"></param>
|
||||
/// <param name="handler">事务体 () => {}</param>
|
||||
/// <param name="timeout">超时，未执行完将自动提交</param>
|
||||
void Transaction(Action handler, TimeSpan timeout);
|
||||
void Transaction(IsolationLevel isolationLevel, TimeSpan timeout, Action handler);
|
||||
/// <summary>
|
||||
/// 当前线程的事务
|
||||
/// </summary>
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using FreeSql.Internal;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq.Expressions;
|
||||
|
||||
public interface IFreeSql<TMark> : IFreeSql { }
|
||||
@@ -93,9 +94,16 @@ public interface IFreeSql : IDisposable
|
||||
/// <summary>
|
||||
/// 开启事务（不支持异步）
|
||||
/// </summary>
|
||||
/// <param name="timeout">超时，未执行完将自动提交</param>
|
||||
/// <param name="handler">事务体 () => {}</param>
|
||||
void Transaction(TimeSpan timeout, Action handler);
|
||||
/// <summary>
|
||||
/// 开启事务（不支持异步）
|
||||
/// </summary>
|
||||
/// <param name="isolationLevel"></param>
|
||||
/// <param name="handler">事务体 () => {}</param>
|
||||
/// <param name="timeout">超时，未执行完将自动提交</param>
|
||||
void Transaction(Action handler, TimeSpan timeout);
|
||||
void Transaction(IsolationLevel isolationLevel, TimeSpan timeout, Action handler);
|
||||
|
||||
/// <summary>
|
||||
/// 数据库访问对象
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
using SafeObjectPool;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.Common;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
@@ -33,7 +34,7 @@ namespace FreeSql.Internal.CommonProvider
|
||||
|
||||
public DbTransaction TransactionCurrentThread => _trans.TryGetValue(Thread.CurrentThread.ManagedThreadId, out var conn) && conn.Transaction?.Connection != null ? conn.Transaction : null;
|
||||
|
||||
public void BeginTransaction(TimeSpan timeout)
|
||||
public void BeginTransaction(TimeSpan timeout, IsolationLevel? isolationLevel)
|
||||
{
|
||||
if (TransactionCurrentThread != null) return;
|
||||
|
||||
@@ -44,7 +45,7 @@ namespace FreeSql.Internal.CommonProvider
|
||||
try
|
||||
{
|
||||
conn = MasterPool.Get();
|
||||
tran = new Transaction2(conn, conn.Value.BeginTransaction(), timeout);
|
||||
tran = new Transaction2(conn, isolationLevel == null ? conn.Value.BeginTransaction() : conn.Value.BeginTransaction(isolationLevel.Value), timeout);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -102,15 +103,15 @@ namespace FreeSql.Internal.CommonProvider
|
||||
public void CommitTransaction() => CommitTransaction(true);
|
||||
public void RollbackTransaction() => CommitTransaction(false);
|
||||
|
||||
public void Transaction(Action handler)
|
||||
{
|
||||
Transaction(handler, TimeSpan.FromSeconds(60));
|
||||
}
|
||||
public void Transaction(Action handler, TimeSpan timeout)
|
||||
public void Transaction(Action handler) => TransactionInternal(null, TimeSpan.FromSeconds(60), handler);
|
||||
public void Transaction(TimeSpan timeout, Action handler) => TransactionInternal(null, timeout, handler);
|
||||
public void Transaction(IsolationLevel isolationLevel, TimeSpan timeout, Action handler) => TransactionInternal(isolationLevel, timeout, handler);
|
||||
|
||||
void TransactionInternal(IsolationLevel? isolationLevel, TimeSpan timeout, Action handler)
|
||||
{
|
||||
try
|
||||
{
|
||||
BeginTransaction(timeout);
|
||||
BeginTransaction(timeout, isolationLevel);
|
||||
handler();
|
||||
CommitTransaction();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user