From 8620404157b57bf7e860c3ade26b6acfd92b00f8 Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Tue, 10 Feb 2026 22:32:40 +0800
Subject: [PATCH 1/8] =?UTF-8?q?PG=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B9=9F=E9=9C=80=E8=A6=81=E8=BD=AC=E6=8D=A2=EF=BC=8C=E5=90=A6?=
 =?UTF-8?q?=E5=88=99=E6=8F=92=E5=85=A5=E6=88=96=E6=9B=B4=E6=96=B0=E4=BC=9A?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FreeSql/FreeSql.csproj                        |  2 +-
 .../CommonProvider/InsertOrUpdateProvider.cs  | 45 ++++++++++---------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
index ce40ea413..939142d1b 100644
--- a/FreeSql/FreeSql.csproj
+++ b/FreeSql/FreeSql.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.304</Version>
+		<Version>3.5.305-preview</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 		<!--<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
 		<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0')) or
diff --git a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
index 24c1fcd33..538277e9a 100644
--- a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
+++ b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
@@ -296,29 +296,32 @@ public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<Db
                     {
                         object val = col.GetDbValue(d);
                         var valsql = _commonUtils.RewriteColumn(col, _commonUtils.GetNoneParamaterSqlValue(dbParams, "cu", col, col.Attribute.MapType, val));
-                        if (didx == 0 && valsql == "NULL")
+                        if (didx == 0)//首行需要类型
                         {
-                            var dbtype = _orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype;
-                            if (!string.IsNullOrWhiteSpace(dbtype))
+                            if (valsql == "NULL" || col.CsType == typeof(DateTime))//时间类型转换
                             {
-                                switch (_orm.Ado.DataType)
+                                var dbtype = _orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype;
+                                if (!string.IsNullOrWhiteSpace(dbtype))
                                 {
-                                    case DataType.Oracle:
-                                    case DataType.OdbcOracle:
-                                    case DataType.CustomOracle:
-                                    case DataType.Dameng:
-                                        break; // Oracle 不支持 cast(null as xxx)，直接用 NULL
-                                    case DataType.MsAccess:
-                                    case DataType.Odbc:
-                                    case DataType.Custom:
-                                        break; // MsAccess 不支持 cast(null as xxx)，直接用 NULL
-                                    case DataType.PostgreSQL:
-                                    case DataType.OdbcPostgreSQL:
-                                    case DataType.CustomPostgreSQL:
-                                    case DataType.KingbaseES:
-                                    case DataType.ShenTong:
-                                        valsql = $"NULL::{_orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype}";
-                                        break; // #2047
+                                    switch (_orm.Ado.DataType)
+                                    {
+                                        case DataType.Oracle:
+                                        case DataType.OdbcOracle:
+                                        case DataType.CustomOracle:
+                                        case DataType.Dameng:
+                                            break; // Oracle 不支持 cast(null as xxx)，直接用 NULL
+                                        case DataType.MsAccess:
+                                        case DataType.Odbc:
+                                        case DataType.Custom:
+                                            break; // MsAccess 不支持 cast(null as xxx)，直接用 NULL
+                                        case DataType.PostgreSQL:
+                                        case DataType.OdbcPostgreSQL:
+                                        case DataType.CustomPostgreSQL:
+                                        case DataType.KingbaseES:
+                                        case DataType.ShenTong:
+                                            valsql = $"{valsql}::{_orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype}";
+                                            break; // #2047
+                                    }
                                 }
                             }
                         }
@@ -344,7 +347,7 @@ public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<Db
             }
         }
 
-        byte _SplitSourceByIdentityValueIsNullFlag = 0 ;//防止重复计算 SplitSource
+        byte _SplitSourceByIdentityValueIsNullFlag = 0;//防止重复计算 SplitSource
         /// <summary>
         /// 如果实体类有自增属性，分成两个 List，有值的Item1 merge，无值的Item2 insert
         /// </summary>

From 972116d29b5186fc68f66d84c47fb0208c4567b4 Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Tue, 10 Feb 2026 23:10:19 +0800
Subject: [PATCH 2/8] =?UTF-8?q?PG=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B9=9F=E9=9C=80=E8=A6=81=E8=BD=AC=E6=8D=A2=EF=BC=8C=E5=90=A6?=
 =?UTF-8?q?=E5=88=99=E6=8F=92=E5=85=A5=E6=88=96=E6=9B=B4=E6=96=B0=E4=BC=9A?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	FreeSql.DbContext/FreeSql.DbContext.xml
#	FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs
---
 FreeSql.DbContext/FreeSql.DbContext.xml       |  15 ++-
 .../PostgreSQL/Curd/PostgreSQLSelectTest.cs   |  11 ++
 FreeSql/FreeSql.xml                           | 109 ------------------
 .../CommonProvider/InsertOrUpdateProvider.cs  |   4 +-
 4 files changed, 24 insertions(+), 115 deletions(-)

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 2f95808f4..75a471a25 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -596,6 +596,12 @@
             <param name="data">可选参数：手工传递最终的 data 值进行对比<para></para>默认：如果不传递，则使用 BeginEdit 传入的 data 引用进行对比</param>
             <returns></returns>
         </member>
+        <member name="T:FreeSql.ExternalUnitOfWork">
+            <summary>
+            外部事务适配的工作单元
+            <para>用于适配第三方事务（如 EFCore、ADO.NET 原生事务）给 FreeSql 使用</para>
+            </summary>
+        </member>
         <member name="T:FreeSql.IUnitOfWork">
             <summary>
             工作单元
@@ -788,12 +794,13 @@
             <param name="that"></param>
             <returns></returns>
         </member>
-        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly[])">
+        <member name="M:FreeSqlDbContextExtensions.CreateUnitOfWork(IFreeSql,System.Data.Common.DbTransaction)">
             <summary>
-            批量注入 Repository，可以参考代码自行调整
+            创建基于外部事务的工作单元
+            <para>注意：该工作单元 Commit/Dispose 时不会关闭传入的 transaction，请自行管理 transaction 生命周期</para>
             </summary>
-            <param name="services"></param>
-            <param name="assemblies"></param>
+            <param name="fsql"></param>
+            <param name="transaction">外部传入的 DbTransaction</param>
             <returns></returns>
         </member>
     </members>
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs
index 8f0549d2d..22e531d82 100644
--- a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs
@@ -21,6 +21,7 @@ class Topic
             public TestTypeInfo Type { get; set; }
             public string Title { get; set; }
             public DateTime CreateTime { get; set; }
+            public DateTime? UpdateTime { get; set; }
         }
         class TestTypeInfo
         {
@@ -2054,6 +2055,16 @@ public void ToTreeList()
                 .AsTreeCte().Any());
         }
 
+        [Fact]
+        public void WithMemoryTest()
+        {
+            var fsql = g.pgsql;
+            var topics = new List<Topic>() { new Topic { Id = 1, CreateTime = new DateTime(1900, 1, 1), UpdateTime = new DateTime(1900, 1, 2) } };
+            var sql = fsql.Select<Topic>().WithMemory(topics).ToSql();
+            Assert.Equal(@"SELECT a.""id"", a.""clicks"", a.""typeguid"", a.""title"", a.""createtime"", a.""updatetime"" 
+FROM ( SELECT 1 as ""id"", 0 as ""clicks"", 0 as ""typeguid"", NULL::varchar as ""title"", '1900-01-01 00:00:00.000000'::timestamp as ""createtime"", '1900-01-02 00:00:00.000000'::timestamp as ""updatetime"" ) a", sql);
+        }
+
         [Table(Name = "D_District")]
         public class BaseDistrict
         {
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 7b3d7b06e..1f4f5d651 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -1097,93 +1097,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
-            <summary>
-            动态创建实体类型
-            </summary>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
-            <summary>
-            配置Class
-            </summary>
-            <param name="className">类名</param>
-            <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
-            <returns></returns>
-        </member>
-        <member name="P:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.TypeBuilder">
-            <summary>
-            获取类型构建器，可作为要构建的Type来引用
-            </summary>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
-            <summary>
-            配置属性
-            </summary>
-            <param name="propertyName">属性名称</param>
-            <param name="propertyType">属性类型</param>
-            <param name="attributes">属性标记的特性-支持多个</param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
-            <summary>
-            配置属性
-            </summary>
-            <param name="propertyName">属性名称</param>
-            <param name="propertyType">属性类型</param>
-            <param name="isOverride">该属性是否重写父类属性</param>
-            <param name="attributes">属性标记的特性-支持多个</param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
-            <summary>
-            配置属性
-            </summary>
-            <param name="propertyName">属性名称</param>
-            <param name="propertyType">属性类型</param>
-            <param name="isOverride">该属性是否重写父类属性</param>
-            <param name="defaultValue">属性默认值</param>
-            <param name="attributes">属性标记的特性-支持多个</param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
-            <summary>
-            配置父类
-            </summary>
-            <param name="superClass">父类类型</param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
-            <summary>
-            Override属性
-            </summary>
-            <param name="typeBuilder"></param>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
-            <summary>
-            Emit动态创建出Class - Type
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.BuildJustType">
-            <summary>
-            Emit动态创建出Class - Type，不附带获取TableInfo
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
-            <summary>
-            首字母小写
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
-            <summary>
-            首字母大写
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
             <summary>
             获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 ""
@@ -6009,28 +5922,6 @@
             对象池
             </summary>
         </member>
-        <member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
-            <summary>
-            动态构建Class Type
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
-            <summary>
-            根据字典，创建 table 对应的实体对象
-            </summary>
-            <param name="table"></param>
-            <param name="dict"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
-            <summary>
-            根据实体对象，创建 table 对应的字典
-            </summary>
-            <param name="table"></param>
-            <param name="instance"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
             <summary>
             C#： that >= between &amp;&amp; that &lt;= and<para></para>
diff --git a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
index 538277e9a..e1c14e6d6 100644
--- a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
+++ b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
@@ -298,7 +298,7 @@ public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<Db
                         var valsql = _commonUtils.RewriteColumn(col, _commonUtils.GetNoneParamaterSqlValue(dbParams, "cu", col, col.Attribute.MapType, val));
                         if (didx == 0)//首行需要类型
                         {
-                            if (valsql == "NULL" || col.CsType == typeof(DateTime))//时间类型转换
+                            if (valsql == "NULL" || col.DbTypeText == "TIMESTAMP")//时间类型转换
                             {
                                 var dbtype = _orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype;
                                 if (!string.IsNullOrWhiteSpace(dbtype))
@@ -319,7 +319,7 @@ public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<Db
                                         case DataType.CustomPostgreSQL:
                                         case DataType.KingbaseES:
                                         case DataType.ShenTong:
-                                            valsql = $"{valsql}::{_orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype}";
+                                            valsql = $"{valsql}::{dbtype}";
                                             break; // #2047
                                     }
                                 }

From 33a9c9bf83553c50a5b3d40923bd530cdacb36cd Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Tue, 10 Feb 2026 23:27:25 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FreeSql/FreeSql.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
index 939142d1b..7e3635f26 100644
--- a/FreeSql/FreeSql.csproj
+++ b/FreeSql/FreeSql.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.305-preview</Version>
+		<Version>3.5.305-preview20260210</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 		<!--<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
 		<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0')) or

From b12d50a6546b0116d937d2c5834ccabc54cf8dfa Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Wed, 13 May 2026 18:16:49 +0800
Subject: [PATCH 4/8] =?UTF-8?q?PgCopy=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PostgreSQL/Curd/PostgreSQLInsertTest.cs   | 15 ++++-
 .../PostgreSQLExtensions.cs                   | 55 +++++++++++--------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs
index 582c062ac..692a1f156 100644
--- a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs
@@ -147,16 +147,25 @@ class TopicPgCopy
             public TestTypeInfo Type { get; set; }
             public string Title { get; set; }
             public DateTime CreateTime { get; set; }
+
+            public byte[] RawData { get; set; }
         }
 
         [Fact]
         public void ExecutePgCopy()
         {
+            g.pgsql.Delete<TopicPgCopy>().Where(m => true).ExecuteAffrows();
             var maxId = g.pgsql.Select<TopicPgCopy>().Max(a => a.Id);
             var items = new List<TopicPgCopy>();
-            for (var a = 0; a < 10; a++) items.Add(new TopicPgCopy { Id = maxId + a + 1, Title = $"newtitle{a}", Clicks = a * 100, CreateTime = DateTime.Now });
-
-            g.pgsql.Insert(items).InsertIdentity().ExecutePgCopy();
+            for (var a = 0; a < 10; a++) items.Add(new TopicPgCopy
+            {
+                Id = maxId + a + 1,
+                Title = $"newtitle{a}",
+                Clicks = a * 100,
+                CreateTime = DateTime.Now
+            });
+            items[0].RawData = new byte[1024 * 1024 * 512];
+            g.pgsql.Insert(items).InsertIdentity().ExecutePgCopy(timeout: 3600);
 
             items = g.pgsql.Select<TopicPgCopy>().OrderByDescending(a => a.Id).Limit(1000).ToList();
             var sql = g.pgsql.Insert(items).InsertIdentity().NoneParameter().ToSql();
diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExtensions.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExtensions.cs
index ba0c4cd4b..0df4c0d3a 100644
--- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExtensions.cs
+++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExtensions.cs
@@ -36,46 +36,46 @@ public static partial class FreeSqlPostgreSQLGlobalExtensions
     /// <returns></returns>
     public static OnConflictDoUpdate<T1> OnConflictDoUpdate<T1>(this IInsert<T1> that, Expression<Func<T1, object>> columns = null) where T1 : class => new FreeSql.PostgreSQL.Curd.OnConflictDoUpdate<T1>(that.InsertIdentity(), columns);
 
-	/// <summary>
-	/// PostgreSQL<para></para>
+    /// <summary>
+    /// PostgreSQL<para></para>
     /// select distinct on(subject) * from score order by subject, score desc, name;
-	/// </summary>
-	public static ISelect<T1> DistinctOn<T1>(this ISelect<T1> query, Expression<Func<T1, object>> selector)
-	{
+    /// </summary>
+    public static ISelect<T1> DistinctOn<T1>(this ISelect<T1> query, Expression<Func<T1, object>> selector)
+    {
         var select = query as FreeSql.PostgreSQL.Curd.PostgreSQLSelect<T1>;
-		if (select == null) throw new Exception($"{nameof(DistinctOn)} 是 FreeSql.Provider.PostgreSQL 特有的功能");
-		var s0p = select as Select0Provider;
+        if (select == null) throw new Exception($"{nameof(DistinctOn)} 是 FreeSql.Provider.PostgreSQL 特有的功能");
+        var s0p = select as Select0Provider;
         var orderByOld = s0p._orderby;
         var orderByNew = "";
-		try
+        try
         {
             s0p._orderby = null;
             select.OrderBy(selector);
             orderByNew = s0p._orderby;
-		}
+        }
         finally
         {
             s0p._orderby = orderByOld;
         }
         if (orderByNew.StartsWith(" \r\nORDER BY "))
             s0p._select = $"{s0p._select} distinct on({orderByNew.Substring(12)}) ";
-		return select;
-	}
+        return select;
+    }
 
-	#region ExecutePgCopy
-	/// <summary>
-	/// 批量插入或更新（操作的字段数量超过 2000 时收益大）<para></para>
-	/// 实现原理：使用 PgCopy 插入临时表，再执行 INSERT INTO t1 select * from #temp ON CONFLICT(""id"") DO UPDATE SET ...
-	/// </summary>
-	/// <typeparam name="T"></typeparam>
-	/// <param name="that"></param>
-	/// <returns></returns>
-	public static int ExecutePgCopy<T>(this IInsertOrUpdate<T> that) where T : class
+    #region ExecutePgCopy
+    /// <summary>
+    /// 批量插入或更新（操作的字段数量超过 2000 时收益大）<para></para>
+    /// 实现原理：使用 PgCopy 插入临时表，再执行 INSERT INTO t1 select * from #temp ON CONFLICT(""id"") DO UPDATE SET ...
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="that"></param>
+    /// <returns></returns>
+    public static int ExecutePgCopy<T>(this IInsertOrUpdate<T> that, int? timeout = null) where T : class
     {
         var upsert = that as InsertOrUpdateProvider<T>;
         if (upsert._source.Any() != true || upsert._tempPrimarys.Any() == false) return 0;
         var state = ExecutePgCopyState(upsert);
-        return UpdateProvider.ExecuteBulkUpsert(upsert, state, insert => insert.ExecutePgCopy());
+        return UpdateProvider.ExecuteBulkUpsert(upsert, state, insert => insert.ExecutePgCopy(timeout));
     }
     static NativeTuple<string, string, string, string, string[]> ExecutePgCopyState<T>(InsertOrUpdateProvider<T> upsert) where T : class
     {
@@ -131,12 +131,12 @@ static NativeTuple<string, string, string, string, string[]> ExecutePgCopyState<
     /// <typeparam name="T"></typeparam>
     /// <param name="that"></param>
     /// <returns></returns>
-    public static int ExecutePgCopy<T>(this IUpdate<T> that) where T : class
+    public static int ExecutePgCopy<T>(this IUpdate<T> that, int? timeout = null) where T : class
     {
         var update = that as UpdateProvider<T>;
         if (update._source.Any() != true || update._tempPrimarys.Any() == false) return 0;
         var state = ExecutePgCopyState(update);
-        return UpdateProvider.ExecuteBulkUpdate(update, state, insert => insert.ExecutePgCopy());
+        return UpdateProvider.ExecuteBulkUpdate(update, state, insert => insert.ExecutePgCopy(timeout));
     }
     static NativeTuple<string, string, string, string, string[]> ExecutePgCopyState<T>(UpdateProvider<T> update) where T : class
     {
@@ -189,7 +189,8 @@ static NativeTuple<string, string, string, string, string[]> ExecutePgCopyState<
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="that"></param>
-    public static void ExecutePgCopy<T>(this IInsert<T> that) where T : class
+    /// <param name="timeout">超时时间，单位秒，Framework不支持</param>
+    public static void ExecutePgCopy<T>(this IInsert<T> that, int? timeout = null) where T : class
     {
         var insert = that as FreeSql.PostgreSQL.Curd.PostgreSQLInsert<T>;
         if (insert == null) throw new Exception(CoreErrorStrings.S_Features_Unique("ExecutePgCopy", "PostgreSQL"));
@@ -209,6 +210,12 @@ public static void ExecutePgCopy<T>(this IInsert<T> that) where T : class
             copyFromCommand.Append(") FROM STDIN BINARY");
             using (var writer = conn.BeginBinaryImport(copyFromCommand.ToString()))
             {
+#if !NETFRAMEWORK
+                if (timeout.HasValue)
+                {
+                    writer.Timeout = TimeSpan.FromSeconds(timeout.Value);
+                }
+#endif
                 foreach (DataRow item in dt.Rows)
                 {
                     writer.StartRow();

From bd1dd4a3d394776a0edb97bf964992b8c1c1acf5 Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Wed, 13 May 2026 18:17:27 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FreeSql.Provider.PostgreSQL.csproj                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
index 01a6d9dd2..bff9b4001 100644
--- a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
+++ b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.5.304</Version>
+		<Version>3.5.305-preview20260513</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

From bc968c7c199c5645f3d1b6a7ab71c8a12c2dbac6 Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Thu, 11 Jun 2026 14:04:31 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9mysql=E7=9A=84updated?=
 =?UTF-8?q?=E4=B8=BAupdate+select=E4=B8=A4=E4=B8=AA=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8Cmysql=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AE=9E=E7=8E=B0=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MySql/Curd/MySqlUpdateTest.cs             |  3 +-
 .../MySqlConnector/Curd/MySqlUpdateTest.cs    |  5 +-
 .../MySql/Curd/MySqlUpdateTest.cs             |  3 +-
 .../MySql/Curd/CustomMySqlUpdate.cs           | 84 +++++++++++++------
 .../Curd/MySqlUpdate.cs                       | 84 +++++++++++++------
 .../MySql/Curd/OdbcMySqlUpdate.cs             | 84 +++++++++++++------
 6 files changed, 181 insertions(+), 82 deletions(-)

diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlUpdateTest.cs
index 0f4d8f45c..98ae8016a 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlUpdateTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlUpdateTest.cs
@@ -301,7 +301,8 @@ public void ExecuteAffrows()
         [Fact]
         public void ExecuteUpdated()
         {
-
+            var list = g.mysql.Update<Topic>().Set(m => m.Clicks + 1)
+                 .Where(m => m.Id == 1).ExecuteUpdated();
         }
 
         [Fact]
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlUpdateTest.cs
index 332d157dd..94ec4c177 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlUpdateTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlUpdateTest.cs
@@ -154,7 +154,7 @@ public void Set()
 
             sql = update.Set(a => a.Clicks == a.Clicks * 10 / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
             Assert.Equal("UPDATE `tb_topic` SET `Clicks` = `Clicks` * 10 div 1 WHERE (`Id` = 1)", sql);
-            
+
             var dt2000 = DateTime.Parse("2000-01-01");
             sql = update.Set(a => a.Clicks == (a.CreateTime > dt2000 ? 1 : 2)).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
             Assert.Equal("UPDATE `tb_topic` SET `Clicks` = case when `CreateTime` > '2000-01-01 00:00:00.000' then 1 else 2 end WHERE (`Id` = 1)", sql);
@@ -363,7 +363,8 @@ public void ExecuteAffrows()
         [Fact]
         public void ExecuteUpdated()
         {
-
+            var list = g.mysql.Update<Topic>().Set(m => m.Clicks + 1)
+                 .Where(m => m.Id == 1).ExecuteUpdated();
         }
 
         [Fact]
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlUpdateTest.cs
index 02d2be2bc..d866ce5d0 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlUpdateTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlUpdateTest.cs
@@ -301,7 +301,8 @@ public void ExecuteAffrows()
         [Fact]
         public void ExecuteUpdated()
         {
-
+            var list = g.mysql.Update<Topic>().Set(m => m.Clicks + 1)
+                 .Where(m => m.Id == 1).ExecuteUpdated();
         }
 
         [Fact]
diff --git a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlUpdate.cs b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlUpdate.cs
index 53e436521..df25d8e3e 100644
--- a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlUpdate.cs
+++ b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlUpdate.cs
@@ -35,34 +35,50 @@ protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnIn
         {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             ToSqlFetch(sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.Concat(_paramsSource).ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in columns)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
+                var updateSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, updateSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-                    var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms);
-                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
-                    ret.AddRange(rettmp);
+                    var affrows = _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, updateSql, _commandTimeout, dbParms);
+                    ValidateVersionAndThrow(affrows, updateSql, dbParms);
+
+                    if (affrows > 0)
+                    {
+                        var whereIdx = updateSql.LastIndexOf(" \r\nWHERE ");
+                        if (whereIdx >= 0)
+                        {
+                            var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                            var selectSql = new StringBuilder()
+                                .Append("SELECT ").Append(sbSelectCols)
+                                .Append(" FROM ").Append(tableName).Append(updateSql.Substring(whereIdx))
+                                .ToString();
+
+                            var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, selectSql, dbParms);
+                            _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                            var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                            var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms);
+                            ret.AddRange(rettmp);
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -75,7 +91,7 @@ protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnIn
                     _orm.Aop.CurdAfterHandler?.Invoke(this, after);
                 }
             });
-            sbret?.Clear();
+            sbSelectCols?.Clear();
             return ret;
         }
 
@@ -125,34 +141,50 @@ async protected override Task<List<TReturn>> RawExecuteUpdatedAsync<TReturn>(IEn
         {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             await ToSqlFetchAsync(async sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.Concat(_paramsSource).ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in columns)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
+                var updateSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, updateSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-                    var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
-                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
-                    ret.AddRange(rettmp);
+                    var affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, updateSql, _commandTimeout, dbParms, cancellationToken);
+                    ValidateVersionAndThrow(affrows, updateSql, dbParms);
+
+                    if (affrows > 0)
+                    {
+                        var whereIdx = updateSql.LastIndexOf(" \r\nWHERE ");
+                        if (whereIdx >= 0)
+                        {
+                            var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                            var selectSql = new StringBuilder()
+                                .Append("SELECT ").Append(sbSelectCols)
+                                .Append(" FROM ").Append(tableName).Append(updateSql.Substring(whereIdx))
+                                .ToString();
+
+                            var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, selectSql, dbParms);
+                            _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                            var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                            var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms, cancellationToken);
+                            ret.AddRange(rettmp);
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -165,7 +197,7 @@ await ToSqlFetchAsync(async sb =>
                     _orm.Aop.CurdAfterHandler?.Invoke(this, after);
                 }
             });
-            sbret?.Clear();
+            sbSelectCols?.Clear();
             return ret;
         }
 #endif
diff --git a/Providers/FreeSql.Provider.MySql/Curd/MySqlUpdate.cs b/Providers/FreeSql.Provider.MySql/Curd/MySqlUpdate.cs
index bccb59111..951389348 100644
--- a/Providers/FreeSql.Provider.MySql/Curd/MySqlUpdate.cs
+++ b/Providers/FreeSql.Provider.MySql/Curd/MySqlUpdate.cs
@@ -35,34 +35,50 @@ protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnIn
         {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             ToSqlFetch(sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.Concat(_paramsSource).ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in columns)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
+                var updateSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, updateSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-                    var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms);
-                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
-                    ret.AddRange(rettmp);
+                    var affrows = _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, updateSql, _commandTimeout, dbParms);
+                    ValidateVersionAndThrow(affrows, updateSql, dbParms);
+
+                    if (affrows > 0)
+                    {
+                        var whereIdx = updateSql.LastIndexOf(" \r\nWHERE ");
+                        if (whereIdx >= 0)
+                        {
+                            var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                            var selectSql = new StringBuilder()
+                                .Append("SELECT ").Append(sbSelectCols)
+                                .Append(" FROM ").Append(tableName).Append(updateSql.Substring(whereIdx))
+                                .ToString();
+
+                            var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, selectSql, dbParms);
+                            _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                            var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                            var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms);
+                            ret.AddRange(rettmp);
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -75,7 +91,7 @@ protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnIn
                     _orm.Aop.CurdAfterHandler?.Invoke(this, after);
                 }
             });
-            sbret?.Clear();
+            sbSelectCols?.Clear();
             return ret;
         }
 
@@ -125,34 +141,50 @@ async protected override Task<List<TReturn>> RawExecuteUpdatedAsync<TReturn>(IEn
         {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             await ToSqlFetchAsync(async sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.Concat(_paramsSource).ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in columns)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
+                var updateSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, updateSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-                    var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
-                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
-                    ret.AddRange(rettmp);
+                    var affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, updateSql, _commandTimeout, dbParms, cancellationToken);
+                    ValidateVersionAndThrow(affrows, updateSql, dbParms);
+
+                    if (affrows > 0)
+                    {
+                        var whereIdx = updateSql.LastIndexOf(" \r\nWHERE ");
+                        if (whereIdx >= 0)
+                        {
+                            var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                            var selectSql = new StringBuilder()
+                                .Append("SELECT ").Append(sbSelectCols)
+                                .Append(" FROM ").Append(tableName).Append(updateSql.Substring(whereIdx))
+                                .ToString();
+
+                            var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, selectSql, dbParms);
+                            _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                            var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                            var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms, cancellationToken);
+                            ret.AddRange(rettmp);
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -165,7 +197,7 @@ await ToSqlFetchAsync(async sb =>
                     _orm.Aop.CurdAfterHandler?.Invoke(this, after);
                 }
             });
-            sbret?.Clear();
+            sbSelectCols?.Clear();
             return ret;
         }
 #endif
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlUpdate.cs b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlUpdate.cs
index 058a05764..09094e478 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlUpdate.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlUpdate.cs
@@ -35,34 +35,50 @@ protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnIn
         {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             ToSqlFetch(sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.Concat(_paramsSource).ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in columns)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
+                var updateSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, updateSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-                    var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms);
-                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
-                    ret.AddRange(rettmp);
+                    var affrows = _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, updateSql, _commandTimeout, dbParms);
+                    ValidateVersionAndThrow(affrows, updateSql, dbParms);
+
+                    if (affrows > 0)
+                    {
+                        var whereIdx = updateSql.LastIndexOf(" \r\nWHERE ");
+                        if (whereIdx >= 0)
+                        {
+                            var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                            var selectSql = new StringBuilder()
+                                .Append("SELECT ").Append(sbSelectCols)
+                                .Append(" FROM ").Append(tableName).Append(updateSql.Substring(whereIdx))
+                                .ToString();
+
+                            var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, selectSql, dbParms);
+                            _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                            var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                            var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms);
+                            ret.AddRange(rettmp);
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -75,7 +91,7 @@ protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnIn
                     _orm.Aop.CurdAfterHandler?.Invoke(this, after);
                 }
             });
-            sbret?.Clear();
+            sbSelectCols?.Clear();
             return ret;
         }
 
@@ -125,34 +141,50 @@ async protected override Task<List<TReturn>> RawExecuteUpdatedAsync<TReturn>(IEn
         {
             var ret = new List<TReturn>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             await ToSqlFetchAsync(async sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.Concat(_paramsSource).ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in columns)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
+                var updateSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, updateSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
-                    var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
-                    ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
-                    ret.AddRange(rettmp);
+                    var affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, updateSql, _commandTimeout, dbParms, cancellationToken);
+                    ValidateVersionAndThrow(affrows, updateSql, dbParms);
+
+                    if (affrows > 0)
+                    {
+                        var whereIdx = updateSql.LastIndexOf(" \r\nWHERE ");
+                        if (whereIdx >= 0)
+                        {
+                            var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                            var selectSql = new StringBuilder()
+                                .Append("SELECT ").Append(sbSelectCols)
+                                .Append(" FROM ").Append(tableName).Append(updateSql.Substring(whereIdx))
+                                .ToString();
+
+                            var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, selectSql, dbParms);
+                            _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                            var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
+                            var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms, cancellationToken);
+                            ret.AddRange(rettmp);
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -165,7 +197,7 @@ await ToSqlFetchAsync(async sb =>
                     _orm.Aop.CurdAfterHandler?.Invoke(this, after);
                 }
             });
-            sbret?.Clear();
+            sbSelectCols?.Clear();
             return ret;
         }
 #endif

From 33a71f2f34ab92e6f04c6c1dc653264a19e791f4 Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Fri, 12 Jun 2026 07:47:54 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MySql/Curd/MySqlDeleteTest.cs             |  7 +-
 .../MySqlConnector/Curd/MySqlDeleteTest.cs    |  7 +-
 .../MySql/Curd/MySqlDeleteTest.cs             |  9 ++-
 .../MySql/Curd/CustomMySqlDelete.cs           | 66 +++++++++++++------
 .../Curd/MySqlDelete.cs                       | 66 +++++++++++++------
 .../MySql/Curd/OdbcMySqlDelete.cs             | 66 +++++++++++++------
 6 files changed, 153 insertions(+), 68 deletions(-)

diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlDeleteTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlDeleteTest.cs
index 19b06e8ce..1a141a796 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlDeleteTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlDeleteTest.cs
@@ -77,13 +77,16 @@ public void ExecuteAffrows()
             var id = g.mysql.Insert<Topic>(new Topic { Title = "xxxx" }).ExecuteIdentity();
             Assert.Equal(1, delete.Where(a => a.Id == id).ExecuteAffrows());
         }
+
         [Fact]
         public void ExecuteDeleted()
         {
-
-            //delete.Where(a => a.Id > 0).ExecuteDeleted();
+            g.mysql.Insert<Topic>(new Topic { Clicks = 1, Title = "ExecuteDeleted", CreateTime = DateTime.Now }).ExecuteAffrows();
+            var deleted = g.mysql.Delete<Topic>().Where(m => m.Title == "ExecuteDeleted").ExecuteDeleted();
+            Assert.True(deleted.Count > 0);
         }
 
+
         [Fact]
         public void AsTable()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlDeleteTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlDeleteTest.cs
index 2954f27e4..6d24c70f8 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlDeleteTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlDeleteTest.cs
@@ -1,4 +1,4 @@
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -80,8 +80,9 @@ public void ExecuteAffrows()
         [Fact]
         public void ExecuteDeleted()
         {
-
-            //delete.Where(a => a.Id > 0).ExecuteDeleted();
+            g.mysql.Insert<Topic>(new Topic { Clicks = 1, Title = "ExecuteDeleted", CreateTime = DateTime.Now }).ExecuteAffrows();
+            var deleted = g.mysql.Delete<Topic>().Where(m => m.Title == "ExecuteDeleted").ExecuteDeleted();
+            Assert.True(deleted.Count > 0);
         }
 
         [Fact]
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlDeleteTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlDeleteTest.cs
index f4b3a11de..8ece0955e 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlDeleteTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlDeleteTest.cs
@@ -1,4 +1,4 @@
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -77,13 +77,16 @@ public void ExecuteAffrows()
             var id = g.mysql.Insert<Topic>(new Topic { Title = "xxxx" }).ExecuteIdentity();
             Assert.Equal(1, delete.Where(a => a.Id == id).ExecuteAffrows());
         }
+
         [Fact]
         public void ExecuteDeleted()
         {
-
-            //delete.Where(a => a.Id > 0).ExecuteDeleted();
+            g.mysql.Insert<Topic>(new Topic { Clicks = 1, Title = "ExecuteDeleted", CreateTime = DateTime.Now }).ExecuteAffrows();
+            var deleted = g.mysql.Delete<Topic>().Where(m => m.Title == "ExecuteDeleted").ExecuteDeleted();
+            Assert.True(deleted.Count > 0);
         }
 
+
         [Fact]
         public void AsTable()
         {
diff --git a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlDelete.cs b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlDelete.cs
index 6645c100c..ba45c4885 100644
--- a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlDelete.cs
+++ b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlDelete.cs
@@ -23,31 +23,44 @@ public override List<T1> ExecuteDeleted()
         {
             var ret = new List<T1>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             ToSqlFetch(sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in _table.Columns.Values)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var deleteSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, deleteSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms));
+                    // 必须在 DELETE 之前 SELECT，否则数据已被删除无法查询
+                    var whereIdx = deleteSql.LastIndexOf(" WHERE ");
+                    if (whereIdx >= 0)
+                    {
+                        var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                        var selectSql = new StringBuilder()
+                            .Append("SELECT ").Append(sbSelectCols)
+                            .Append(" FROM ").Append(tableName).Append(deleteSql.Substring(whereIdx))
+                            .ToString();
+
+                        var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, selectSql, dbParms);
+                        _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                        ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms));
+                    }
+                    _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, deleteSql, _commandTimeout, dbParms);
                 }
                 catch (Exception ex)
                 {
@@ -63,7 +76,7 @@ public override List<T1> ExecuteDeleted()
             if (dbParms != null)
             {
                 this.ClearData();
-                sbret.Clear();
+                sbSelectCols?.Clear();
             }
             return ret;
         }
@@ -74,31 +87,44 @@ async public override Task<List<T1>> ExecuteDeletedAsync(CancellationToken cance
         {
             var ret = new List<T1>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             await ToSqlFetchAsync(async sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in _table.Columns.Values)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var deleteSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, deleteSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken));
+                    // 必须在 DELETE 之前 SELECT，否则数据已被删除无法查询
+                    var whereIdx = deleteSql.LastIndexOf(" WHERE ");
+                    if (whereIdx >= 0)
+                    {
+                        var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                        var selectSql = new StringBuilder()
+                            .Append("SELECT ").Append(sbSelectCols)
+                            .Append(" FROM ").Append(tableName).Append(deleteSql.Substring(whereIdx))
+                            .ToString();
+
+                        var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, selectSql, dbParms);
+                        _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                        ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms, cancellationToken));
+                    }
+                    await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, deleteSql, _commandTimeout, dbParms, cancellationToken);
                 }
                 catch (Exception ex)
                 {
@@ -114,7 +140,7 @@ await ToSqlFetchAsync(async sb =>
             if (dbParms != null)
             {
                 this.ClearData();
-                sbret.Clear();
+                sbSelectCols?.Clear();
             }
             return ret;
         }
diff --git a/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs b/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs
index 5d38e44a8..b963d7615 100644
--- a/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs
+++ b/Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs
@@ -23,31 +23,44 @@ public override List<T1> ExecuteDeleted()
         {
             var ret = new List<T1>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             ToSqlFetch(sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in _table.Columns.Values)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var deleteSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, deleteSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms));
+                    // 必须在 DELETE 之前 SELECT，否则数据已被删除无法查询
+                    var whereIdx = deleteSql.LastIndexOf(" WHERE ");
+                    if (whereIdx >= 0)
+                    {
+                        var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                        var selectSql = new StringBuilder()
+                            .Append("SELECT ").Append(sbSelectCols)
+                            .Append(" FROM ").Append(tableName).Append(deleteSql.Substring(whereIdx))
+                            .ToString();
+
+                        var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, selectSql, dbParms);
+                        _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                        ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms));
+                    }
+                    _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, deleteSql, _commandTimeout, dbParms);
                 }
                 catch (Exception ex)
                 {
@@ -63,7 +76,7 @@ public override List<T1> ExecuteDeleted()
             if (dbParms != null)
             {
                 this.ClearData();
-                sbret.Clear();
+                sbSelectCols?.Clear();
             }
             return ret;
         }
@@ -74,31 +87,44 @@ async public override Task<List<T1>> ExecuteDeletedAsync(CancellationToken cance
         {
             var ret = new List<T1>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             await ToSqlFetchAsync(async sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in _table.Columns.Values)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var deleteSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, deleteSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken));
+                    // 必须在 DELETE 之前 SELECT，否则数据已被删除无法查询
+                    var whereIdx = deleteSql.LastIndexOf(" WHERE ");
+                    if (whereIdx >= 0)
+                    {
+                        var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                        var selectSql = new StringBuilder()
+                            .Append("SELECT ").Append(sbSelectCols)
+                            .Append(" FROM ").Append(tableName).Append(deleteSql.Substring(whereIdx))
+                            .ToString();
+
+                        var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, selectSql, dbParms);
+                        _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                        ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms, cancellationToken));
+                    }
+                    await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, deleteSql, _commandTimeout, dbParms, cancellationToken);
                 }
                 catch (Exception ex)
                 {
@@ -114,7 +140,7 @@ await ToSqlFetchAsync(async sb =>
             if (dbParms != null)
             {
                 this.ClearData();
-                sbret.Clear();
+                sbSelectCols?.Clear();
             }
             return ret;
         }
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs
index 24aa2168e..153ae043c 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs
@@ -23,31 +23,44 @@ public override List<T1> ExecuteDeleted()
         {
             var ret = new List<T1>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             ToSqlFetch(sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in _table.Columns.Values)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var deleteSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, deleteSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms));
+                    // 必须在 DELETE 之前 SELECT，否则数据已被删除无法查询
+                    var whereIdx = deleteSql.LastIndexOf(" WHERE ");
+                    if (whereIdx >= 0)
+                    {
+                        var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                        var selectSql = new StringBuilder()
+                            .Append("SELECT ").Append(sbSelectCols)
+                            .Append(" FROM ").Append(tableName).Append(deleteSql.Substring(whereIdx))
+                            .ToString();
+
+                        var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, selectSql, dbParms);
+                        _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                        ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms));
+                    }
+                    _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, deleteSql, _commandTimeout, dbParms);
                 }
                 catch (Exception ex)
                 {
@@ -63,7 +76,7 @@ public override List<T1> ExecuteDeleted()
             if (dbParms != null)
             {
                 this.ClearData();
-                sbret.Clear();
+                sbSelectCols?.Clear();
             }
             return ret;
         }
@@ -74,31 +87,44 @@ async public override Task<List<T1>> ExecuteDeletedAsync(CancellationToken cance
         {
             var ret = new List<T1>();
             DbParameter[] dbParms = null;
-            StringBuilder sbret = null;
+            StringBuilder sbSelectCols = null;
             await ToSqlFetchAsync(async sb =>
             {
                 if (dbParms == null)
                 {
                     dbParms = _params.ToArray();
-                    sbret = new StringBuilder();
-                    sbret.Append(" RETURNING ");
-
+                    sbSelectCols = new StringBuilder();
                     var colidx = 0;
                     foreach (var col in _table.Columns.Values)
                     {
-                        if (colidx > 0) sbret.Append(", ");
-                        sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        if (colidx > 0) sbSelectCols.Append(", ");
+                        sbSelectCols.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
                         ++colidx;
                     }
                 }
-                var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var deleteSql = sb.ToString();
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, deleteSql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken));
+                    // 必须在 DELETE 之前 SELECT，否则数据已被删除无法查询
+                    var whereIdx = deleteSql.LastIndexOf(" WHERE ");
+                    if (whereIdx >= 0)
+                    {
+                        var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+                        var selectSql = new StringBuilder()
+                            .Append("SELECT ").Append(sbSelectCols)
+                            .Append(" FROM ").Append(tableName).Append(deleteSql.Substring(whereIdx))
+                            .ToString();
+
+                        var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, selectSql, dbParms);
+                        _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                        ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, selectSql, _commandTimeout, dbParms, cancellationToken));
+                    }
+                    await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, deleteSql, _commandTimeout, dbParms, cancellationToken);
                 }
                 catch (Exception ex)
                 {
@@ -114,7 +140,7 @@ await ToSqlFetchAsync(async sb =>
             if (dbParms != null)
             {
                 this.ClearData();
-                sbret.Clear();
+                sbSelectCols?.Clear();
             }
             return ret;
         }

From 32552754ce62993b858e73cae9f982cbd1265b41 Mon Sep 17 00:00:00 2001
From: yangl <303550688@qq.com>
Date: Fri, 12 Jun 2026 07:58:38 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=8F=92=E5=85=A5=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MySql/Curd/MySqlInsertTest.cs             |   6 +-
 .../MySqlConnector/Curd/MySqlInsertTest.cs    |   6 +-
 .../MySql/Curd/MySqlInsertTest.cs             |   8 +-
 .../MySql/Curd/CustomMySqlInsert.cs           | 148 +++++++++++++++---
 .../Curd/MySqlInsert.cs                       | 148 +++++++++++++++---
 .../MySql/Curd/OdbcMySqlInsert.cs             | 148 +++++++++++++++---
 6 files changed, 382 insertions(+), 82 deletions(-)

diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlInsertTest.cs
index 14e91a102..f664831d2 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Custom/MySql/Curd/MySqlInsertTest.cs
@@ -123,9 +123,9 @@ public void ExecuteIdentity()
         public void ExecuteInserted()
         {
             var items = new List<Topic>();
-            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
-
-            //insert.AppendData(items.First()).ExecuteInserted();
+            for (var a = 0; a < 3; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            var list = g.mysql.Insert(items).ExecuteInserted();
+            Assert.True(list.Count == 3);
         }
 
         [Fact]
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs
index 4e10ac87a..d304997ec 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs
@@ -153,9 +153,9 @@ public void ExecuteIdentity()
         public void ExecuteInserted()
         {
             var items = new List<Topic>();
-            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
-
-            //insert.AppendData(items.First()).ExecuteInserted();
+            for (var a = 0; a < 3; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            var list = g.mysql.Insert(items).ExecuteInserted();
+            Assert.True(list.Count == 3);
         }
 
         [Fact]
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlInsertTest.cs
index 08cd06adf..cb4e68270 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlInsertTest.cs
@@ -1,4 +1,4 @@
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -123,9 +123,9 @@ public void ExecuteIdentity()
         public void ExecuteInserted()
         {
             var items = new List<Topic>();
-            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
-
-            //insert.AppendData(items.First()).ExecuteInserted();
+            for (var a = 0; a < 3; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            var list = g.mysql.Insert(items).ExecuteInserted();
+            Assert.True(list.Count == 3);
         }
 
         [Fact]
diff --git a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs
index 505ada97c..71bc66cfe 100644
--- a/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs
+++ b/Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs
@@ -87,24 +87,74 @@ protected override List<T1> RawExecuteInserted()
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return new List<T1>();
 
-            var sb = new StringBuilder();
-            sb.Append(sql).Append(" RETURNING ");
-
-            var colidx = 0;
-            foreach (var col in _table.Columns.Values)
-            {
-                if (colidx > 0) sb.Append(", ");
-                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
-                ++colidx;
-            }
-            sql = sb.ToString();
             var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
             _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
             var ret = new List<T1>();
             Exception exception = null;
             try
             {
-                ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                var affrows = _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+
+                if (affrows > 0)
+                {
+                    var pk = _table.Primarys.FirstOrDefault();
+                    var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+
+                    var sbSelect = new StringBuilder();
+                    sbSelect.Append("SELECT ");
+                    var colidx = 0;
+                    foreach (var col in _table.Columns.Values)
+                    {
+                        if (colidx > 0) sbSelect.Append(", ");
+                        sbSelect.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)))
+                                .Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        ++colidx;
+                    }
+                    sbSelect.Append(" FROM ").Append(tableName);
+
+                    if (pk != null && pk.Attribute.IsIdentity && _insertIdentity == false)
+                    {
+                        var lastIdObj = _orm.Ado.ExecuteScalar(_connection, _transaction, CommandType.Text,
+                            "SELECT LAST_INSERT_ID();", _commandTimeout, null);
+                        if (lastIdObj != null && lastIdObj != DBNull.Value)
+                        {
+                            var lastId = Convert.ToInt64(lastIdObj);
+                            sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" >= ").Append(lastId)
+                                    .Append(" ORDER BY ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" LIMIT ").Append(affrows);
+                        }
+                        else
+                        {
+                            return ret;
+                        }
+                    }
+                    else if (pk != null && _source.Any())
+                    {
+                        var pkValues = _source.Select(a => pk.GetDbValue(a)).Distinct().ToArray();
+                        if (pkValues.Length == 0) return ret;
+
+                        sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                .Append(" IN (");
+                        for (var i = 0; i < pkValues.Length; i++)
+                        {
+                            if (i > 0) sbSelect.Append(", ");
+                            sbSelect.Append(_commonUtils.FormatSql("{0}", pkValues[i]));
+                        }
+                        sbSelect.Append(")");
+                    }
+                    else
+                    {
+                        return ret;
+                    }
+
+                    var selectSql = sbSelect.ToString();
+                    var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, selectSql, null);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                    ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction,
+                        CommandType.Text, selectSql, _commandTimeout, null);
+                }
             }
             catch (Exception ex)
             {
@@ -167,24 +217,74 @@ async protected override Task<List<T1>> RawExecuteInsertedAsync(CancellationToke
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return new List<T1>();
 
-            var sb = new StringBuilder();
-            sb.Append(sql).Append(" RETURNING ");
-
-            var colidx = 0;
-            foreach (var col in _table.Columns.Values)
-            {
-                if (colidx > 0) sb.Append(", ");
-                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
-                ++colidx;
-            }
-            sql = sb.ToString();
             var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
             _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
             var ret = new List<T1>();
             Exception exception = null;
             try
             {
-                ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+                var affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+
+                if (affrows > 0)
+                {
+                    var pk = _table.Primarys.FirstOrDefault();
+                    var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+
+                    var sbSelect = new StringBuilder();
+                    sbSelect.Append("SELECT ");
+                    var colidx = 0;
+                    foreach (var col in _table.Columns.Values)
+                    {
+                        if (colidx > 0) sbSelect.Append(", ");
+                        sbSelect.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)))
+                                .Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        ++colidx;
+                    }
+                    sbSelect.Append(" FROM ").Append(tableName);
+
+                    if (pk != null && pk.Attribute.IsIdentity && _insertIdentity == false)
+                    {
+                        var lastIdObj = await _orm.Ado.ExecuteScalarAsync(_connection, _transaction, CommandType.Text,
+                            "SELECT LAST_INSERT_ID();", _commandTimeout, null, cancellationToken);
+                        if (lastIdObj != null && lastIdObj != DBNull.Value)
+                        {
+                            var lastId = Convert.ToInt64(lastIdObj);
+                            sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" >= ").Append(lastId)
+                                    .Append(" ORDER BY ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" LIMIT ").Append(affrows);
+                        }
+                        else
+                        {
+                            return ret;
+                        }
+                    }
+                    else if (pk != null && _source.Any())
+                    {
+                        var pkValues = _source.Select(a => pk.GetDbValue(a)).Distinct().ToArray();
+                        if (pkValues.Length == 0) return ret;
+
+                        sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                .Append(" IN (");
+                        for (var i = 0; i < pkValues.Length; i++)
+                        {
+                            if (i > 0) sbSelect.Append(", ");
+                            sbSelect.Append(_commonUtils.FormatSql("{0}", pkValues[i]));
+                        }
+                        sbSelect.Append(")");
+                    }
+                    else
+                    {
+                        return ret;
+                    }
+
+                    var selectSql = sbSelect.ToString();
+                    var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, selectSql, null);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                    ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction,
+                        CommandType.Text, selectSql, _commandTimeout, null, cancellationToken);
+                }
             }
             catch (Exception ex)
             {
diff --git a/Providers/FreeSql.Provider.MySql/Curd/MySqlInsert.cs b/Providers/FreeSql.Provider.MySql/Curd/MySqlInsert.cs
index 82e44fe09..94b0f1a40 100644
--- a/Providers/FreeSql.Provider.MySql/Curd/MySqlInsert.cs
+++ b/Providers/FreeSql.Provider.MySql/Curd/MySqlInsert.cs
@@ -75,24 +75,74 @@ protected override List<T1> RawExecuteInserted()
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return new List<T1>();
 
-            var sb = new StringBuilder();
-            sb.Append(sql).Append(" RETURNING ");
-
-            var colidx = 0;
-            foreach (var col in _table.Columns.Values)
-            {
-                if (colidx > 0) sb.Append(", ");
-                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
-                ++colidx;
-            }
-            sql = sb.ToString();
             var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
             _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
             var ret = new List<T1>();
             Exception exception = null;
             try
             {
-                ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                var affrows = _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+
+                if (affrows > 0)
+                {
+                    var pk = _table.Primarys.FirstOrDefault();
+                    var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+
+                    var sbSelect = new StringBuilder();
+                    sbSelect.Append("SELECT ");
+                    var colidx = 0;
+                    foreach (var col in _table.Columns.Values)
+                    {
+                        if (colidx > 0) sbSelect.Append(", ");
+                        sbSelect.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)))
+                                .Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        ++colidx;
+                    }
+                    sbSelect.Append(" FROM ").Append(tableName);
+
+                    if (pk != null && pk.Attribute.IsIdentity && _insertIdentity == false)
+                    {
+                        var lastIdObj = _orm.Ado.ExecuteScalar(_connection, _transaction, CommandType.Text,
+                            "SELECT LAST_INSERT_ID();", _commandTimeout, null);
+                        if (lastIdObj != null && lastIdObj != DBNull.Value)
+                        {
+                            var lastId = Convert.ToInt64(lastIdObj);
+                            sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" >= ").Append(lastId)
+                                    .Append(" ORDER BY ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" LIMIT ").Append(affrows);
+                        }
+                        else
+                        {
+                            return ret;
+                        }
+                    }
+                    else if (pk != null && _source.Any())
+                    {
+                        var pkValues = _source.Select(a => pk.GetDbValue(a)).Distinct().ToArray();
+                        if (pkValues.Length == 0) return ret;
+
+                        sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                .Append(" IN (");
+                        for (var i = 0; i < pkValues.Length; i++)
+                        {
+                            if (i > 0) sbSelect.Append(", ");
+                            sbSelect.Append(_commonUtils.FormatSql("{0}", pkValues[i]));
+                        }
+                        sbSelect.Append(")");
+                    }
+                    else
+                    {
+                        return ret;
+                    }
+
+                    var selectSql = sbSelect.ToString();
+                    var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, selectSql, null);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                    ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction,
+                        CommandType.Text, selectSql, _commandTimeout, null);
+                }
             }
             catch (Exception ex)
             {
@@ -144,24 +194,74 @@ async protected override Task<List<T1>> RawExecuteInsertedAsync(CancellationToke
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return new List<T1>();
 
-            var sb = new StringBuilder();
-            sb.Append(sql).Append(" RETURNING ");
-
-            var colidx = 0;
-            foreach (var col in _table.Columns.Values)
-            {
-                if (colidx > 0) sb.Append(", ");
-                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
-                ++colidx;
-            }
-            sql = sb.ToString();
             var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
             _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
             var ret = new List<T1>();
             Exception exception = null;
             try
             {
-                ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+                var affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+
+                if (affrows > 0)
+                {
+                    var pk = _table.Primarys.FirstOrDefault();
+                    var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+
+                    var sbSelect = new StringBuilder();
+                    sbSelect.Append("SELECT ");
+                    var colidx = 0;
+                    foreach (var col in _table.Columns.Values)
+                    {
+                        if (colidx > 0) sbSelect.Append(", ");
+                        sbSelect.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)))
+                                .Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        ++colidx;
+                    }
+                    sbSelect.Append(" FROM ").Append(tableName);
+
+                    if (pk != null && pk.Attribute.IsIdentity && _insertIdentity == false)
+                    {
+                        var lastIdObj = await _orm.Ado.ExecuteScalarAsync(_connection, _transaction, CommandType.Text,
+                            "SELECT LAST_INSERT_ID();", _commandTimeout, null, cancellationToken);
+                        if (lastIdObj != null && lastIdObj != DBNull.Value)
+                        {
+                            var lastId = Convert.ToInt64(lastIdObj);
+                            sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" >= ").Append(lastId)
+                                    .Append(" ORDER BY ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" LIMIT ").Append(affrows);
+                        }
+                        else
+                        {
+                            return ret;
+                        }
+                    }
+                    else if (pk != null && _source.Any())
+                    {
+                        var pkValues = _source.Select(a => pk.GetDbValue(a)).Distinct().ToArray();
+                        if (pkValues.Length == 0) return ret;
+
+                        sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                .Append(" IN (");
+                        for (var i = 0; i < pkValues.Length; i++)
+                        {
+                            if (i > 0) sbSelect.Append(", ");
+                            sbSelect.Append(_commonUtils.FormatSql("{0}", pkValues[i]));
+                        }
+                        sbSelect.Append(")");
+                    }
+                    else
+                    {
+                        return ret;
+                    }
+
+                    var selectSql = sbSelect.ToString();
+                    var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, selectSql, null);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                    ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction,
+                        CommandType.Text, selectSql, _commandTimeout, null, cancellationToken);
+                }
             }
             catch (Exception ex)
             {
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs
index 25adfbe3b..e19c04529 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs
@@ -87,24 +87,74 @@ protected override List<T1> RawExecuteInserted()
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return new List<T1>();
 
-            var sb = new StringBuilder();
-            sb.Append(sql).Append(" RETURNING ");
-
-            var colidx = 0;
-            foreach (var col in _table.Columns.Values)
-            {
-                if (colidx > 0) sb.Append(", ");
-                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
-                ++colidx;
-            }
-            sql = sb.ToString();
             var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
             _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
             var ret = new List<T1>();
             Exception exception = null;
             try
             {
-                ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                var affrows = _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+
+                if (affrows > 0)
+                {
+                    var pk = _table.Primarys.FirstOrDefault();
+                    var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+
+                    var sbSelect = new StringBuilder();
+                    sbSelect.Append("SELECT ");
+                    var colidx = 0;
+                    foreach (var col in _table.Columns.Values)
+                    {
+                        if (colidx > 0) sbSelect.Append(", ");
+                        sbSelect.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)))
+                                .Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        ++colidx;
+                    }
+                    sbSelect.Append(" FROM ").Append(tableName);
+
+                    if (pk != null && pk.Attribute.IsIdentity && _insertIdentity == false)
+                    {
+                        var lastIdObj = _orm.Ado.ExecuteScalar(_connection, _transaction, CommandType.Text,
+                            "SELECT LAST_INSERT_ID();", _commandTimeout, null);
+                        if (lastIdObj != null && lastIdObj != DBNull.Value)
+                        {
+                            var lastId = Convert.ToInt64(lastIdObj);
+                            sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" >= ").Append(lastId)
+                                    .Append(" ORDER BY ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" LIMIT ").Append(affrows);
+                        }
+                        else
+                        {
+                            return ret;
+                        }
+                    }
+                    else if (pk != null && _source.Any())
+                    {
+                        var pkValues = _source.Select(a => pk.GetDbValue(a)).Distinct().ToArray();
+                        if (pkValues.Length == 0) return ret;
+
+                        sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                .Append(" IN (");
+                        for (var i = 0; i < pkValues.Length; i++)
+                        {
+                            if (i > 0) sbSelect.Append(", ");
+                            sbSelect.Append(_commonUtils.FormatSql("{0}", pkValues[i]));
+                        }
+                        sbSelect.Append(")");
+                    }
+                    else
+                    {
+                        return ret;
+                    }
+
+                    var selectSql = sbSelect.ToString();
+                    var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, selectSql, null);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                    ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction,
+                        CommandType.Text, selectSql, _commandTimeout, null);
+                }
             }
             catch (Exception ex)
             {
@@ -167,24 +217,74 @@ async protected override Task<List<T1>> RawExecuteInsertedAsync(CancellationToke
             var sql = this.ToSql();
             if (string.IsNullOrEmpty(sql)) return new List<T1>();
 
-            var sb = new StringBuilder();
-            sb.Append(sql).Append(" RETURNING ");
-
-            var colidx = 0;
-            foreach (var col in _table.Columns.Values)
-            {
-                if (colidx > 0) sb.Append(", ");
-                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
-                ++colidx;
-            }
-            sql = sb.ToString();
             var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
             _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
             var ret = new List<T1>();
             Exception exception = null;
             try
             {
-                ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+                var affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+
+                if (affrows > 0)
+                {
+                    var pk = _table.Primarys.FirstOrDefault();
+                    var tableName = _commonUtils.QuoteSqlName(TableRuleInvoke());
+
+                    var sbSelect = new StringBuilder();
+                    sbSelect.Append("SELECT ");
+                    var colidx = 0;
+                    foreach (var col in _table.Columns.Values)
+                    {
+                        if (colidx > 0) sbSelect.Append(", ");
+                        sbSelect.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)))
+                                .Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                        ++colidx;
+                    }
+                    sbSelect.Append(" FROM ").Append(tableName);
+
+                    if (pk != null && pk.Attribute.IsIdentity && _insertIdentity == false)
+                    {
+                        var lastIdObj = await _orm.Ado.ExecuteScalarAsync(_connection, _transaction, CommandType.Text,
+                            "SELECT LAST_INSERT_ID();", _commandTimeout, null, cancellationToken);
+                        if (lastIdObj != null && lastIdObj != DBNull.Value)
+                        {
+                            var lastId = Convert.ToInt64(lastIdObj);
+                            sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" >= ").Append(lastId)
+                                    .Append(" ORDER BY ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                    .Append(" LIMIT ").Append(affrows);
+                        }
+                        else
+                        {
+                            return ret;
+                        }
+                    }
+                    else if (pk != null && _source.Any())
+                    {
+                        var pkValues = _source.Select(a => pk.GetDbValue(a)).Distinct().ToArray();
+                        if (pkValues.Length == 0) return ret;
+
+                        sbSelect.Append(" WHERE ").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name))
+                                .Append(" IN (");
+                        for (var i = 0; i < pkValues.Length; i++)
+                        {
+                            if (i > 0) sbSelect.Append(", ");
+                            sbSelect.Append(_commonUtils.FormatSql("{0}", pkValues[i]));
+                        }
+                        sbSelect.Append(")");
+                    }
+                    else
+                    {
+                        return ret;
+                    }
+
+                    var selectSql = sbSelect.ToString();
+                    var before2 = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, selectSql, null);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before2);
+
+                    ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction,
+                        CommandType.Text, selectSql, _commandTimeout, null, cancellationToken);
+                }
             }
             catch (Exception ex)
             {