From 4a2dda66777c394a858292447fdaa1e24c40ab45 Mon Sep 17 00:00:00 2001 From: sunkaixuna <610262374@qq.com> Date: Wed, 1 Dec 2021 13:45:22 +0800 Subject: [PATCH] Add unit test --- .../SqlServerTest/SqlServerTest.csproj | 1 + Src/Asp.Net/SqlServerTest/UnitTest/Main.cs | 1 + Src/Asp.Net/SqlServerTest/UnitTest/UDelete.cs | 46 +++++++++++++++++++ .../DeleteProvider/DeleteableProvider.cs | 6 ++- 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Src/Asp.Net/SqlServerTest/UnitTest/UDelete.cs diff --git a/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj b/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj index 806c090e0..2afa6dff2 100644 --- a/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj +++ b/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj @@ -94,6 +94,7 @@ + diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/Main.cs b/Src/Asp.Net/SqlServerTest/UnitTest/Main.cs index 62de4e94d..1209b3f83 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/Main.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/Main.cs @@ -31,6 +31,7 @@ namespace OrmTest } public static void Init() { + DeleteTest(); Fastest2(); SplitTest(); Filter(); diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UDelete.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UDelete.cs new file mode 100644 index 000000000..78bb3a8e6 --- /dev/null +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UDelete.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public partial class NewUnitTest + { + + public static void DeleteTest() + { + Db.CodeFirst.InitTables(); + var list = new List() { + new UnitDel12311(){ + Date1=DateTime.Now, + ID=Guid.NewGuid(),Name="a" + }, + new UnitDel12311(){ + Date1=DateTime.Now, + ID=Guid.NewGuid(),Name="a" + } + }; + var db = Db; + //db.CurrentConnectionConfig.MoreSettings = new SqlSugar.ConnMoreSettings() + //{ + // DisableNvarchar=true + //}; + db.Insertable(list).ExecuteCommand(); + var r= db.Deleteable(list).ExecuteCommand(); + if (r == 0) + { + throw new Exception("unit test delete"); + } + } + public class UnitDel12311 + { + [SqlSugar.SugarColumn(IsPrimaryKey =true)] + public Guid ID { get; set; } + [SqlSugar.SugarColumn(IsPrimaryKey = true)] + public DateTime Date1 { get; set; } + public string Name { get; set; } + } + } +} diff --git a/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs index a78df51e3..b7fe77a85 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -156,10 +156,14 @@ namespace SqlSugar andString.AppendFormat(tempequals, primaryField.ToUpper(), entityValue); } } - else if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL&& (this.Context.CurrentConnectionConfig.MoreSettings==null||this.Context.CurrentConnectionConfig.MoreSettings?.PgSqlIsAutoToLower==true)) + else if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL && (this.Context.CurrentConnectionConfig.MoreSettings == null || this.Context.CurrentConnectionConfig.MoreSettings?.PgSqlIsAutoToLower == true)) { andString.AppendFormat("\"{0}\"={1} ", primaryField.ToLower(), new PostgreSQLExpressionContext().GetValue(entityValue)); } + else if (entityValue != null && UtilMethods.GetUnderType(entityValue.GetType()) == UtilConstants.DateType) + { + andString.AppendFormat("\"{0}\"={1} ", primaryField,$"'{entityValue.ObjToDate().ToString("yyyy-MM-dd HH:mm:ss.fff")}'"); + } else { andString.AppendFormat(tempequals, primaryField, entityValue);