- 补充 ForUpdate 增加 SkipLocked 参数；#2017

Author: 2881099

FreeSql/FreeSql.xml

@@ -335,8 +335,9 @@ public partial interface ISelect0<TSelect, T1> : ISelect0
         /// 神通: for update
         /// </summary>
         /// <param name="nowait">noawait</param>
+        /// <param name="skipLocked">skip locked</param>
         /// <returns></returns>
-        TSelect ForUpdate(bool nowait = false);
+        TSelect ForUpdate(bool nowait = false, bool skipLocked = false);
 
         /// <summary>
         /// 按原生sql语法分组，GroupBy("concat(name, @cc)", new { cc = 1 })<para></para>

FreeSql/Interface/Curd/ISelect/ISelect0.cs

@@ -1281,7 +1281,7 @@ public TSelect DisableGlobalFilter(params string[] name)
             }
             return this as TSelect;
         }
-        public TSelect ForUpdate(bool noawait = false)
+        public TSelect ForUpdate(bool noawait = false, bool skipLocked = false)
         {
             if (_transaction == null && _orm.Ado.TransactionCurrentThread != null) this.WithTransaction(_orm.Ado.TransactionCurrentThread);
             if (_transaction == null && _resolveHookTransaction != null) this.WithTransaction(_resolveHookTransaction());
@@ -1291,25 +1291,25 @@ public TSelect ForUpdate(bool noawait = false)
                 case DataType.MySql:
                 case DataType.OdbcMySql:
                 case DataType.CustomMySql:
-                    _tosqlAppendContent = $"{_tosqlAppendContent} for update";
+                    _tosqlAppendContent = $"{_tosqlAppendContent} for update{(skipLocked ? " skip locked" : "")}";
                     break;
                 case DataType.SqlServer:
                 case DataType.OdbcSqlServer:
                 case DataType.CustomSqlServer:
-                    _aliasRule = (_, old) => $"{old} With(UpdLock, RowLock{(noawait ? ", NoWait" : "")})";
+                    _aliasRule = (_, old) => $"{old} With(UpdLock, RowLock{(noawait ? ", NoWait" : "")}{(skipLocked ? ", ReadPast" : "")})";
                     break;
                 case DataType.PostgreSQL:
                 case DataType.OdbcPostgreSQL:
                 case DataType.CustomPostgreSQL:
                 case DataType.KingbaseES:
                 case DataType.Xugu:
-                    _tosqlAppendContent = $"{_tosqlAppendContent} for update{(noawait ? " nowait" : "")}";
+                    _tosqlAppendContent = $"{_tosqlAppendContent} for update{(noawait ? " nowait" : "")}{(skipLocked ? " skip locked" : "")}";
                     break;
                 case DataType.Oracle:
                 case DataType.OdbcOracle:
                 case DataType.CustomOracle:
                 case DataType.Dameng:
-                    _tosqlAppendContent = $"{_tosqlAppendContent} for update{(noawait ? " nowait" : "")}";
+                    _tosqlAppendContent = $"{_tosqlAppendContent} for update{(noawait ? " nowait" : "")}{(skipLocked ? " skip locked" : "")}";
                     break;
                 case DataType.Sqlite:
                     break;