From a73e882f4e2f0ee4ef2d18e7ca98cd2b2bc85fab Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Fri, 6 Nov 2020 08:42:56 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20#454=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=81=97=E7=95=99=E7=9A=84=20bug=EF=BC=8C=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=20Aop.AuditValue=20=E4=BA=8B=E4=BB=B6=EF=BC=9B#521?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeSql.DbContext/FreeSql.DbContext.xml | 16 ---------------- FreeSql.Tests/FreeSql.Tests/Issues/521.cs | 15 +++++++++++++++ .../Internal/CommonProvider/UpdateProvider.cs | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 2d6d3409..b3c14870 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -130,13 +130,6 @@ 清空状态数据 - - - 根据 lambda 条件删除数据 - - - - 添加 @@ -509,14 +502,5 @@ - - - 批量注入 Repository,可以参考代码自行调整 - - - - - - diff --git a/FreeSql.Tests/FreeSql.Tests/Issues/521.cs b/FreeSql.Tests/FreeSql.Tests/Issues/521.cs index 890ca1f8..6e338e66 100644 --- a/FreeSql.Tests/FreeSql.Tests/Issues/521.cs +++ b/FreeSql.Tests/FreeSql.Tests/Issues/521.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Diagnostics; +using System.Reflection; using System.Text; using System.Threading; using Xunit; @@ -17,6 +18,18 @@ namespace FreeSql.Tests.Issues public void SelectTest() { IFreeSql fsql = g.sqlserver; + + //fsql.Aop.AuditValue += (s, e) => { + // if (e.Column.CsType == typeof(long) + // && e.Property.GetCustomAttribute(false) != null + // && e.Value?.ToString() == "0") + // { + // e.Value = 1; + // } + + //}; + + fsql.Delete().Where("1=1").ExecuteAffrows(); fsql.Insert(new ts521 { ID = 1000000000000000001 }).ExecuteAffrows(); @@ -28,6 +41,7 @@ namespace FreeSql.Tests.Issues class ts521 { [Key] + [Snowflake] public long ID { get; set; } [Description("名字")] @@ -44,5 +58,6 @@ namespace FreeSql.Tests.Issues [Column(IsVersion = true, InsertValueSql = "1")] public long Version { get; set; } } + public class SnowflakeAttribute: Attribute { } } } diff --git a/FreeSql/Internal/CommonProvider/UpdateProvider.cs b/FreeSql/Internal/CommonProvider/UpdateProvider.cs index 5d579daf..14fb2985 100644 --- a/FreeSql/Internal/CommonProvider/UpdateProvider.cs +++ b/FreeSql/Internal/CommonProvider/UpdateProvider.cs @@ -374,7 +374,7 @@ namespace FreeSql.Internal.CommonProvider changedDict.Add(col.Attribute.Name, true); } if (val == null && col.Attribute.MapType == typeof(string) && col.Attribute.IsNullable == false) - col.SetValue(data, val = ""); + col.SetValue(d, val = ""); } } }