- 修复 fsql.InsertOrUpdate CanInsert=false,CanUpdate=true (mysql/pgsql）不生效的 bug；

Examples/base_entity/Program.cs

@@ -429,6 +429,15 @@ namespace base_entity
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+
+            var sqlt0a1 = fsql.InsertOrUpdate<抖店实时销售金额表>()
+                .SetSource(new 抖店实时销售金额表
+                {
+                    ID = 1,
+                    品牌名称 = "NIKE",
+                })
+                .ToSql();
+
             fsql.UseMessagePackMap();
 
             fsql.Delete<MessagePackMapInfo>().Where("1=1").ExecuteAffrows();
@@ -1605,4 +1614,42 @@ namespace base_entity
         }
     }
 
+    public class 抖店实时销售金额表
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column(Name = "ID", IsPrimary = true)]
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 店铺名称
+        /// </summary>
+        [Column(Name = "店铺名称")]
+        public string 店铺名称 { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        [Column(Name = "日期")]
+        public DateTime 日期 { get; set; }
+
+        /// <summary>
+        /// 品牌名称
+        /// </summary>
+        [Column(Name = "品牌名称")]
+        public string 品牌名称 { get; set; }
+
+        /// <summary>
+        /// 成交金额
+        /// </summary>
+        [Column(Name = "成交金额")]
+        public decimal? 成交金额 { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [Column(Name = "更新时间", CanInsert = false, CanUpdate = true, ServerTime = DateTimeKind.Local)]
+        public DateTime 更新时间 { get; set; }
+    }
 }

Examples/base_entity/base_entity.xml

@@ -79,6 +79,36 @@
             软删除
             </summary>
         </member>
+        <member name="P:base_entity.抖店实时销售金额表.ID">
+            <summary>
+            ID
+            </summary>
+        </member>
+        <member name="P:base_entity.抖店实时销售金额表.店铺名称">
+            <summary>
+            店铺名称
+            </summary>
+        </member>
+        <member name="P:base_entity.抖店实时销售金额表.日期">
+            <summary>
+            日期
+            </summary>
+        </member>
+        <member name="P:base_entity.抖店实时销售金额表.品牌名称">
+            <summary>
+            品牌名称
+            </summary>
+        </member>
+        <member name="P:base_entity.抖店实时销售金额表.成交金额">
+            <summary>
+            成交金额
+            </summary>
+        </member>
+        <member name="P:base_entity.抖店实时销售金额表.更新时间">
+            <summary>
+            更新时间
+            </summary>
+        </member>
         <member name="T:EMSServerModel.Model.Role">
             <summary>
             角色表

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -800,5 +800,14 @@
             <param name="that"></param>
             <returns></returns>
         </member>
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
+            <summary>
+            批量注入 Repository，可以参考代码自行调整
+            </summary>
+            <param name="services"></param>
+            <param name="globalDataFilter"></param>
+            <param name="assemblies"></param>
+            <returns></returns>
+        </member>
     </members>
 </doc>

Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlOnDuplicateKeyUpdate.cs

@@ -91,11 +91,18 @@ namespace FreeSql.Custom.MySql
                         sb.Append(field).Append(" = ").Append(field).Append(" + 1");
                     }
                     else if (_mysqlInsert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                    {
+                        if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                        {
+                            sb.Append(_mysqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                        }
+                        else
                         {
                             var caseWhen = _mysqlUpdate.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                             sb.Append(caseWhen);
                             if (caseWhen.EndsWith(" END")) _mysqlUpdate.InternalToSqlCaseWhenEnd(sb, col);
                         }
+                    }
                     else
                     {
                         var field = _mysqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);

Providers/FreeSql.Provider.Custom/PostgreSQL/Curd/CustomPostgreSQLOnConflictDoUpdate.cs

@@ -131,11 +131,18 @@ namespace FreeSql.Custom.PostgreSQL
                             sb.Append(field).Append(" = ").Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(_pgsqlInsert.InternalTable.DbName)).Append(".").Append(field).Append(" + 1");
                         }
                         else if (_pgsqlInsert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                        {
+                            if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                            {
+                                sb.Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                            }
+                            else
                             {
                                 var caseWhen = _pgsqlUpdate.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                                 sb.Append(caseWhen);
                                 if (caseWhen.EndsWith(" END")) _pgsqlUpdate.InternalToSqlCaseWhenEnd(sb, col);
                             }
+                        }
                         else
                         {
                             var field = _pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);

Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESOnConflictDoUpdate.cs

@@ -131,11 +131,18 @@ namespace FreeSql.KingbaseES
                             sb.Append(field).Append(" = ").Append(_insert.InternalCommonUtils.QuoteSqlName(_insert.InternalTable.DbName)).Append(".").Append(field).Append(" + 1");
                         }
                         else if (_insert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                        {
+                            if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                            {
+                                sb.Append(_insert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                            }
+                            else
                             {
                                 var caseWhen = _update.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                                 sb.Append(caseWhen);
                                 if (caseWhen.EndsWith(" END")) _update.InternalToSqlCaseWhenEnd(sb, col);
                             }
+                        }
                         else
                         {
                             var field = _insert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);

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

@@ -91,11 +91,18 @@ namespace FreeSql.MySql.Curd
                         sb.Append(field).Append(" = ").Append(field).Append(" + 1");
                     }
                     else if (_mysqlInsert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                    {
+                        if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                        {
+                            sb.Append(_mysqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                        }
+                        else
                         {
                             var caseWhen = _mysqlUpdate.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                             sb.Append(caseWhen);
                             if (caseWhen.EndsWith(" END")) _mysqlUpdate.InternalToSqlCaseWhenEnd(sb, col);
                         }
+                    }
                     else
                     {
                         var field = _mysqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);

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

@@ -131,11 +131,18 @@ namespace FreeSql.Odbc.KingbaseES
                             sb.Append(field).Append(" = ").Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(_pgsqlInsert.InternalTable.DbName)).Append(".").Append(field).Append(" + 1");
                         }
                         else if (_pgsqlInsert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                        {
+                            if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                            {
+                                sb.Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                            }
+                            else
                             {
                                 var caseWhen = _pgsqlUpdate.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                                 sb.Append(caseWhen);
                                 if (caseWhen.EndsWith(" END")) _pgsqlUpdate.InternalToSqlCaseWhenEnd(sb, col);
                             }
+                        }
                         else
                         {
                             var field = _pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);

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

@@ -91,11 +91,18 @@ namespace FreeSql.Odbc.MySql
                         sb.Append(field).Append(" = ").Append(field).Append(" + 1");
                     }
                     else if (_mysqlInsert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                    {
+                        if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                        {
+                            sb.Append(_mysqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                        }
+                        else
                         {
                             var caseWhen = _mysqlUpdate.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                             sb.Append(caseWhen);
                             if (caseWhen.EndsWith(" END")) _mysqlUpdate.InternalToSqlCaseWhenEnd(sb, col);
                         }
+                    }
                     else
                     {
                         var field = _mysqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);

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

@@ -131,11 +131,18 @@ namespace FreeSql.Odbc.PostgreSQL
                             sb.Append(field).Append(" = ").Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(_pgsqlInsert.InternalTable.DbName)).Append(".").Append(field).Append(" + 1");
                         }
                         else if (_pgsqlInsert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                        {
+                            if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                            {
+                                sb.Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                            }
+                            else
                             {
                                 var caseWhen = _pgsqlUpdate.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                                 sb.Append(caseWhen);
                                 if (caseWhen.EndsWith(" END")) _pgsqlUpdate.InternalToSqlCaseWhenEnd(sb, col);
                             }
+                        }
                         else
                         {
                             var field = _pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);

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

@@ -131,11 +131,18 @@ namespace FreeSql.PostgreSQL.Curd
                             sb.Append(field).Append(" = ").Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(_pgsqlInsert.InternalTable.DbName)).Append(".").Append(field).Append(" + 1");
                         }
                         else if (_pgsqlInsert.InternalIgnore.ContainsKey(col.Attribute.Name))
+                        {
+                            if (string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                            {
+                                sb.Append(_pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+                            }
+                            else
                             {
                                 var caseWhen = _pgsqlUpdate.InternalWhereCaseSource(col.CsName, sqlval => sqlval).Trim();
                                 sb.Append(caseWhen);
                                 if (caseWhen.EndsWith(" END")) _pgsqlUpdate.InternalToSqlCaseWhenEnd(sb, col);
                             }
+                        }
                         else
                         {
                             var field = _pgsqlInsert.InternalCommonUtils.QuoteSqlName(col.Attribute.Name);