- 补充 fsql.InsertOrUpdate UpdateColumns 数据存在时只更新指定的字段；

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -125,6 +125,13 @@
             清空状态数据
             </summary>
         </member>
+        <member name="M:FreeSql.DbSet`1.RemoveAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
+            <summary>
+            根据 lambda 条件删除数据
+            </summary>
+            <param name="predicate"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.DbSet`1.Add(`0)">
             <summary>
             添加

FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs

@@ -296,6 +296,7 @@ namespace FreeSql.Tests
         public void EnableAddOrUpdateNavigateList_OneToMany()
         {
             var repo = g.sqlite.GetRepository<Cagetory>();
+            repo.DbContextOptions.EnableAddOrUpdateNavigateList = true;
             var cts = new[] {
                 new Cagetory
                 {

FreeSql.Tests/FreeSql.Tests/UnitTest3.cs

@@ -159,6 +159,8 @@ namespace FreeSql.Tests
         [Fact]
         public void Test03()
         {
+            var sqlxx = g.pgsql.InsertOrUpdate<userinfo>().SetSource(new userinfo { userid = 10 }).UpdateColumns(a => new { a.birthday, a.CardNo }).ToSql();
+
             var aff1 = g.sqlite.GetRepository<Edi, long>().Delete(10086);
             var aff2 = g.sqlite.Delete<Edi>(10086).ExecuteAffrows();
             Assert.Equal(aff1, aff2);

FreeSql/FreeSql.xml

@@ -1165,6 +1165,20 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IInsertOrUpdate`1.UpdateColumns(System.Linq.Expressions.Expression{System.Func{`0,System.Object}})">
+            <summary>
+            当记录存在时，指定只更新的字段，UpdateColumns(a => a.Name) | UpdateColumns(a => new{a.Name,a.Time}) | UpdateColumns(a => new[]{"name","time"})
+            </summary>
+            <param name="columns">lambda选择列</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.IInsertOrUpdate`1.UpdateColumns(System.String[])">
+            <summary>
+            当记录存在时，指定只更新的字段
+            </summary>
+            <param name="columns">属性名，或者字段名</param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.IInsertOrUpdate`1.AsTable(System.Func{System.String,System.String})">
             <summary>
             设置表名规则，可用于分库/分表，参数1：默认表名；返回值：新表名；

FreeSql/Interface/Curd/IInsertOrUpdate.cs

@@ -42,6 +42,19 @@ namespace FreeSql
         /// <returns></returns>
         IInsertOrUpdate<T1> IfExistsDoNothing();
 
+        /// <summary>
+        /// 当记录存在时，指定只更新的字段，UpdateColumns(a => a.Name) | UpdateColumns(a => new{a.Name,a.Time}) | UpdateColumns(a => new[]{"name","time"})
+        /// </summary>
+        /// <param name="columns">lambda选择列</param>
+        /// <returns></returns>
+        IInsertOrUpdate<T1> UpdateColumns(Expression<Func<T1, object>> columns);
+        /// <summary>
+        /// 当记录存在时，指定只更新的字段
+        /// </summary>
+        /// <param name="columns">属性名，或者字段名</param>
+        /// <returns></returns>
+        IInsertOrUpdate<T1> UpdateColumns(string[] columns);
+
         /// <summary>
         /// 设置表名规则，可用于分库/分表，参数1：默认表名；返回值：新表名；
         /// </summary>

FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs

@@ -15,17 +15,18 @@ namespace FreeSql.Internal.CommonProvider
 
     public abstract partial class InsertOrUpdateProvider<T1> : IInsertOrUpdate<T1> where T1 : class
     {
-        protected IFreeSql _orm;
+        public IFreeSql _orm;
-        protected CommonUtils _commonUtils;
+        public CommonUtils _commonUtils;
-        protected CommonExpression _commonExpression;
+        public CommonExpression _commonExpression;
-        protected List<T1> _source = new List<T1>();
+        public List<T1> _source = new List<T1>();
-        protected bool _doNothing = false;
+        public bool _doNothing = false;
-        protected Dictionary<string, bool> _auditValueChangedDict = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
+        public Dictionary<string, bool> _updateIgnore = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
-        protected TableInfo _table;
+        public Dictionary<string, bool> _auditValueChangedDict = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
-        protected Func<string, string> _tableRule;
+        public TableInfo _table;
-        protected DbParameter[] _params;
+        public Func<string, string> _tableRule;
-        protected DbTransaction _transaction;
+        public DbParameter[] _params;
-        protected DbConnection _connection;
+        public DbTransaction _transaction;
+        public DbConnection _connection;
         public ColumnInfo IdentityColumn { get; }
 
         public InsertOrUpdateProvider(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
@@ -57,6 +58,17 @@ namespace FreeSql.Internal.CommonProvider
             return this;
         }
 
+        public IInsertOrUpdate<T1> UpdateColumns(Expression<Func<T1, object>> columns) => UpdateColumns(_commonExpression.ExpressionSelectColumns_MemberAccess_New_NewArrayInit(null, columns?.Body, false, null));
+        public IInsertOrUpdate<T1> UpdateColumns(string[] columns)
+        {
+            var cols = columns.Distinct().ToDictionary(a => a);
+            _updateIgnore.Clear();
+            foreach (var col in _table.Columns.Values)
+                if (cols.ContainsKey(col.Attribute.Name) == false && cols.ContainsKey(col.CsName) == false)
+                    _updateIgnore.Add(col.Attribute.Name, true);
+            return this;
+        }
+
         public static void AuditDataValue(object sender, IEnumerable<T1> data, IFreeSql orm, TableInfo table, Dictionary<string, bool> changedDict)
         {
             if (data?.Any() != true) return;

Providers/FreeSql.Provider.Dameng/Curd/DamengInsertOrUpdate.cs

@@ -37,7 +37,7 @@ namespace FreeSql.Dameng.Curd
                 WriteSourceSelectUnionAll(data, sb, dbParams);
                 sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{a.Attribute.Name}"))).Append(") \r\n");
 
-                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true);
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
                 if (_doNothing == false && cols.Any())
                     sb.Append("WHEN MATCHED THEN \r\n")
                         .Append("  update set ").Append(string.Join(", ", cols.Select(a =>

Providers/FreeSql.Provider.MySql/Curd/MySqlInsertOrUpdate.cs

@@ -44,7 +44,12 @@ namespace FreeSql.MySql.Curd
                 {
                     insert.InsertIdentity();
                     if (_doNothing == false)
-                        sql = new OnDuplicateKeyUpdate<T1>(insert).ToSql();
+                    {
+                        var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
+                        sql = new OnDuplicateKeyUpdate<T1>(insert)
+                            .UpdateColumns(cols.Select(a => a.Attribute.Name).ToArray())
+                            .ToSql();
+                    }
                     else
                     {
                         if (_table.Primarys.Any() == false) throw new Exception($"fsql.InsertOrUpdate + IfExistsDoNothing + MySql 要求实体类 {_table.CsName} 必须有主键");

Providers/FreeSql.Provider.Odbc/Dameng/Curd/OdbcDamengInsertOrUpdate.cs

@@ -37,7 +37,7 @@ namespace FreeSql.Odbc.Dameng
                 WriteSourceSelectUnionAll(data, sb, dbParams);
                 sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{a.Attribute.Name}"))).Append(") \r\n");
 
-                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true);
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
                 if (_doNothing == false && cols.Any())
                     sb.Append("WHEN MATCHED THEN \r\n")
                         .Append("  update set ").Append(string.Join(", ", cols.Select(a =>

Providers/FreeSql.Provider.Odbc/KingbaseES/Curd/OdbcKingbaseESInsertOrUpdate.cs

@@ -43,8 +43,9 @@ namespace FreeSql.Odbc.KingbaseES
                 else
                 {
                     var ocdu = new OdbcKingbaseESOnConflictDoUpdate<T1>(insert.InsertIdentity());
-                    ocdu.IgnoreColumns(_table.Columns.Values.Where(a => a.Attribute.CanUpdate == false).Select(a => a.Attribute.Name).ToArray());
+                    var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
-                    if (_doNothing == true || _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true).Any() == false)
+                    ocdu.UpdateColumns(cols.Select(a => a.Attribute.Name).ToArray());
+                    if (_doNothing == true || cols.Any() == false)
                         ocdu.DoNothing();
                     sql = ocdu.ToSql();
                 }

Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsertOrUpdate.cs

@@ -43,7 +43,12 @@ namespace FreeSql.Odbc.MySql
                 {
                     insert.InsertIdentity();
                     if (_doNothing == false)
-                        sql = new OdbcMySqlOnDuplicateKeyUpdate<T1>(insert).ToSql();
+                    {
+                        var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
+                        sql = new OdbcMySqlOnDuplicateKeyUpdate<T1>(insert)
+                            .UpdateColumns(cols.Select(a => a.Attribute.Name).ToArray())
+                            .ToSql();
+                    }
                     else
                     {
                         if (_table.Primarys.Any() == false) throw new Exception($"fsql.InsertOrUpdate + IfExistsDoNothing + MySql 要求实体类 {_table.CsName} 必须有主键");

Providers/FreeSql.Provider.Odbc/Oracle/Curd/OdbcOracleInsertOrUpdate.cs

@@ -37,7 +37,7 @@ namespace FreeSql.Odbc.Oracle
                 WriteSourceSelectUnionAll(data, sb, dbParams);
                 sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{a.Attribute.Name}"))).Append(") \r\n");
 
-                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true);
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
                 if (_doNothing == false && cols.Any())
                     sb.Append("WHEN MATCHED THEN \r\n")
                         .Append("  update set ").Append(string.Join(", ", cols.Select(a =>

Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLInsertOrUpdate.cs

@@ -41,8 +41,9 @@ namespace FreeSql.Odbc.PostgreSQL
                 else
                 {
                     var ocdu = new OdbcPostgreSQLOnConflictDoUpdate<T1>(insert.InsertIdentity());
-                    ocdu.IgnoreColumns(_table.Columns.Values.Where(a => a.Attribute.CanUpdate == false).Select(a => a.Attribute.Name).ToArray());
+                    var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
-                    if (_doNothing == true || _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true).Any() == false)
+                    ocdu.UpdateColumns(cols.Select(a => a.Attribute.Name).ToArray());
+                    if (_doNothing == true || cols.Any() == false)
                         ocdu.DoNothing();
                     sql = ocdu.ToSql();
                 }

Providers/FreeSql.Provider.Odbc/SqlServer/Curd/OdbcSqlServerInsertOrUpdate.cs

@@ -39,7 +39,7 @@ namespace FreeSql.Odbc.SqlServer
                 WriteSourceSelectUnionAll(data, sb, dbParams);
                 sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{a.Attribute.Name}"))).Append(") \r\n");
 
-                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true);
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
                 if (_doNothing == false && cols.Any())
                     sb.Append("WHEN MATCHED THEN \r\n")
                         .Append("  update set ").Append(string.Join(", ", cols.Select(a =>

Providers/FreeSql.Provider.Oracle/Curd/OracleInsertOrUpdate.cs

@@ -37,7 +37,7 @@ namespace FreeSql.Oracle.Curd
                 WriteSourceSelectUnionAll(data, sb, dbParams);
                 sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{a.Attribute.Name}"))).Append(") \r\n");
 
-                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true);
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
                 if (_doNothing == false && cols.Any())
                     sb.Append("WHEN MATCHED THEN \r\n")
                         .Append("  update set ").Append(string.Join(", ", cols.Select(a =>

Providers/FreeSql.Provider.PostgreSQL/Curd/PostgreSQLInsertOrUpdate.cs

@@ -41,8 +41,9 @@ namespace FreeSql.PostgreSQL.Curd
                 else
                 {
                     var ocdu = new OnConflictDoUpdate<T1>(insert.InsertIdentity());
-                    ocdu.IgnoreColumns(_table.Columns.Values.Where(a => a.Attribute.CanUpdate == false).Select(a => a.Attribute.Name).ToArray());
+                    var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
-                    if (_doNothing == true || _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true).Any() == false)
+                    ocdu.UpdateColumns(cols.Select(a => a.Attribute.Name).ToArray());
+                    if (_doNothing == true || cols.Any() == false)
                         ocdu.DoNothing();
                     sql = ocdu.ToSql();
                 }

Providers/FreeSql.Provider.ShenTong/Curd/ShenTongInsertOrUpdate.cs

@@ -37,7 +37,7 @@ namespace FreeSql.ShenTong.Curd
                 WriteSourceSelectUnionAll(data, sb, dbParams);
                 sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{a.Attribute.Name}"))).Append(") \r\n");
 
-                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true);
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
                 if (_doNothing == false && cols.Any())
                     sb.Append("WHEN MATCHED THEN \r\n")
                         .Append("  update set ").Append(string.Join(", ", cols.Select(a =>

Providers/FreeSql.Provider.SqlServer/Curd/SqlServerInsertOrUpdate.cs

@@ -39,7 +39,7 @@ namespace FreeSql.SqlServer.Curd
                 WriteSourceSelectUnionAll(data, sb, dbParams);
                 sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{a.Attribute.Name}"))).Append(") \r\n");
 
-                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true);
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
                 if (_doNothing == false && cols.Any())
                     sb.Append("WHEN MATCHED THEN \r\n")
                         .Append("  update set ").Append(string.Join(", ", cols.Select(a =>

Providers/FreeSql.Provider.Sqlite/Curd/SqliteInsertOrUpdate.cs

@@ -44,6 +44,7 @@ namespace FreeSql.Sqlite.Curd
                     insert.InsertIdentity();
                     if (_doNothing == false)
                     {
+                        if (_updateIgnore.Any()) throw new Exception($"fsql.InsertOrUpdate Sqlite 无法完成 UpdateColumns 操作");
                         sql = insert.ToSql();
                         if (sql?.StartsWith("INSERT INTO ") == true)
                             sql = $"REPLACE INTO {sql.Substring("INSERT INTO ".Length)}";