From a6b337d12bf0671c34b64cfc8fad520efac87d50 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 1 Sep 2022 14:08:02 +0800 Subject: [PATCH] Update .net core project --- .../ResolveItems/MethodCallExpressionResolve.cs | 4 ++-- .../Realization/Oracle/SqlBuilder/OracleExpressionContext.cs | 4 +++- .../PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs | 4 ++++ Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs | 4 ++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs index bdb3da9c6..849ed2f2b 100644 --- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs +++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs @@ -1112,11 +1112,11 @@ namespace SqlSugar } else if (IsSqlite() && formatString == "yyyy-MM-dd HH:mm:ss") { - return $"strftime('%Y-%m-%d %H:%i:%S', {value})"; + return $"strftime('%Y-%m-%d %H:%M:%S', {value})"; } else if (IsSqlite() && formatString == "yyyy-MM-dd hh:mm:ss") { - return $"strftime('%Y-%m-%d %H:%i:%S', {value})"; + return $"strftime('%Y-%m-%d %H:%M:%S', {value})"; } else if (IsSqlite() && formatString == "yyyy-MM") { diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleExpressionContext.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleExpressionContext.cs index 7f5baa210..1dbc8c6d7 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleExpressionContext.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleExpressionContext.cs @@ -260,7 +260,9 @@ namespace SqlSugar } public override string DateIsSameDay(MethodCallExpressionModel model) { - throw new NotSupportedException("Oracle NotSupportedException DateIsSameDay"); + var parameter = model.Args[0]; + var parameter2 = model.Args[1]; + return string.Format(" ( cast({0} as date)= cast( {1} as date) ) ", parameter.MemberName, parameter2.MemberName); ; } public override string DateIsSameByType(MethodCallExpressionModel model) { diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs index 4ddb2f6e0..c69e035cd 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs @@ -262,6 +262,10 @@ namespace SqlSugar var parameter3 = model.Args[2]; DateType dateType =(DateType)parameter3.MemberValue; var format = "yyyy-MM-dd"; + if (dateType == DateType.Quarter) + { + return string.Format(" (date_trunc('quarter',{0})=date_trunc('quarter',{1}) ) ", parameter.MemberName, parameter2.MemberName,format); + } switch (dateType) { case DateType.Year: diff --git a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs index a11519f5f..55f0cc17a 100644 --- a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs +++ b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilMethods.cs @@ -823,6 +823,10 @@ namespace SqlSugar { result = result.Replace(item.ParameterName, item.Value.ObjToString()); } + else if (item.Value is DateTime) + { + result = result.Replace(item.ParameterName, "'"+item.Value.ObjToDate().ToString("yyyy-MM-dd HH:mm:ss.fff")+"'"); + } else if (item.Value is byte[]) { result = result.Replace(item.ParameterName, "0x" + BitConverter.ToString((byte[])item.Value));