- 完善 IDelete WhereIf(bool, sql) 方法；

fyp111486 · Dec 7, 2020 · ff1354d · ff1354d
1 parent 671fb09
commit ff1354d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 185 deletions.
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Interface/Curd/IDelete.cs b/FreeSql/Interface/Curd/IDelete.cs
@@ -53,6 +53,15 @@ public interface IDelete<T1>
         /// <returns></returns>
         IDelete<T1> Where(string sql, object parms = null);
         /// <summary>
+        /// 原生sql语法条件，Where("id = @id", new { id = 1 })<para></para>
+        /// 提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
+        /// </summary>
+        /// <param name="condition">true 时生效</param>
+        /// <param name="sql">sql语法条件</param>
+        /// <param name="parms">参数</param>
+        /// <returns></returns>
+        IDelete<T1> WhereIf(bool condition, string sql, object parms = null);
+        /// <summary>
         /// 传入实体，将主键作为条件
         /// </summary>
         /// <param name="item">实体</param>

diff --git a/FreeSql/Internal/CommonProvider/DeleteProvider.cs b/FreeSql/Internal/CommonProvider/DeleteProvider.cs
@@ -98,9 +98,10 @@ public IDelete<T1> WhereIf(bool condition, Expression<Func<T1, bool>> exp)
             if (condition == false || exp == null) return this;
             return this.Where(_commonExpression.ExpressionWhereLambdaNoneForeignObject(null, _table, null, exp?.Body, null, _params));
         }
-        public IDelete<T1> Where(string sql, object parms = null)
+        public IDelete<T1> Where(string sql, object parms = null) => WhereIf(true, sql, parms);
+        public IDelete<T1> WhereIf(bool condition, string sql, object parms = null)
         {
-            if (string.IsNullOrEmpty(sql)) return this;
+            if (condition == false || string.IsNullOrEmpty(sql)) return this;
             if (++_whereTimes > 1) _where.Append(" AND ");
             _where.Append('(').Append(sql).Append(')');
             if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));