Mysql updated修改实现方式，改成通用的兼容mysql的实现

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()
         {

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]

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]

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]

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]

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]

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()
         {

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]

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]

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;
         }