From e67d1a88ce80943c2cb3d497ff3d8bcf76f15b92 Mon Sep 17 00:00:00 2001
From: sunkaixuna <610262374@qq.com>
Date: Sun, 17 Oct 2021 13:41:49 +0800
Subject: [PATCH] Update  core

---
 .../InsertableProvider/SubInserable.cs        | 12 ++++-
 .../SqlBuilderProvider/QueryBuilder.cs        | 46 ++++++++++++-------
 .../PostgreSQL/PostgreSQLProvider.cs          |  5 ++
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/SubInserable.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/SubInserable.cs
index ea925cbbb..1e7a99dc5 100644
--- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/SubInserable.cs
+++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/SubInserable.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data.SqlTypes;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
@@ -243,7 +244,16 @@ namespace SqlSugar
                 }
                 else
                 {
-                    insertDictionary.Add(item.DbColumnName, item.PropertyInfo.GetValue(insetObject));
+                    var value = item.PropertyInfo.GetValue(insetObject);
+                    if (value == null&&this.Context.CurrentConnectionConfig.DbType==DbType.PostgreSQL) 
+                    {
+                       var underType= UtilMethods.GetUnderType(item.PropertyInfo.PropertyType);
+                        if (underType == UtilConstants.DateType)
+                        {
+                            value = SqlDateTime.Null;
+                        }
+                    }
+                    insertDictionary.Add(item.DbColumnName, value);
                 }
             }
             return insertDictionary;
diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
index bbe53da77..7c578d414 100644
--- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
+++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
@@ -331,36 +331,30 @@ namespace SqlSugar
             BindingFlags flag = BindingFlags.Instance | BindingFlags.NonPublic;
             Type type = item.GetType();
             PropertyInfo field = type.GetProperty("exp", flag);
-            Type ChildType = type.GetProperty("type", flag).GetValue(item,null) as Type;
+            Type ChildType = type.GetProperty("type", flag).GetValue(item, null) as Type;
             var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(ChildType);
-            var exp=field.GetValue(item,null) as Expression;
+            var exp = field.GetValue(item, null) as Expression;
             var isMain = ChildType == this.EntityType;
             var isSingle = IsSingle();
-            if (ChildType != this.EntityType&&isSingle)
-            {
-                return;
-            }
-            var expValue = GetExpressionValue(exp, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple);
-            var sql = expValue.GetResultString();
             var itName = (exp as LambdaExpression).Parameters[0].Name;
             itName = this.Builder.GetTranslationColumnName(itName) + ".";
             var isEasyJoin = this.EasyJoinInfos.Count > 0;
-            if (WhereInfos.Count == 0)
-            {
-                sql =( " WHERE " + sql);
-            }else
-            {
-                sql = (" AND " + sql);
-            }
+
+            string sql = "";
             if (isSingle)
             {
-
+                if (ChildType != this.EntityType && isSingle)
+                {
+                    return;
+                }
+                sql = GetSql(exp, isSingle);
             }
             else if (isMain)
             {
                 if (TableShortName == null)
                     return;
                 var shortName = this.Builder.GetTranslationColumnName(TableShortName) + ".";
+                sql = GetSql(exp, isSingle);
                 sql = sql.Replace(itName, shortName);
             }
             else if (isEasyJoin)
@@ -368,11 +362,12 @@ namespace SqlSugar
                 var easyInfo = EasyJoinInfos.FirstOrDefault(it =>
                    it.Value.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) ||
                    it.Value.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase));
-                if (easyInfo.Key==null)
+                if (easyInfo.Key == null)
                 {
                     return;
                 }
                 var shortName = this.Builder.GetTranslationColumnName(easyInfo.Key.Trim()) + ".";
+                sql = GetSql(exp, isSingle);
                 sql = sql.Replace(itName, shortName);
             }
             else
@@ -385,11 +380,28 @@ namespace SqlSugar
                     return;
                 }
                 var shortName = this.Builder.GetTranslationColumnName(easyInfo.ShortName.Trim()) + ".";
+                sql = GetSql(exp, isSingle);
                 sql = sql.Replace(itName, shortName);
             }
             WhereInfos.Add(sql);
         }
 
+        private string GetSql(Expression exp, bool isSingle)
+        {
+            var expValue = GetExpressionValue(exp, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple);
+            var sql = expValue.GetResultString();
+            if (WhereInfos.Count == 0)
+            {
+                sql = (" WHERE " + sql);
+            }
+            else
+            {
+                sql = (" AND " + sql);
+            }
+
+            return sql;
+        }
+
         public virtual string GetExternalOrderBy(string externalOrderBy)
         {
             return Regex.Replace(externalOrderBy, @"\[\w+\]\.", "");
diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/PostgreSQLProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/PostgreSQLProvider.cs
index 5dfd3b842..1feef0909 100644
--- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/PostgreSQLProvider.cs
+++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/PostgreSQLProvider.cs
@@ -90,6 +90,11 @@ namespace SqlSugar
             foreach (var parameter in parameters)
             {
                 if (parameter.Value == null) parameter.Value = DBNull.Value;
+                if(parameter.Value is System.Data.SqlTypes.SqlDateTime&&parameter.DbType==System.Data.DbType.AnsiString)
+                {
+                    parameter.DbType = System.Data.DbType.DateTime;
+                    parameter.Value = DBNull.Value;
+                }
                 var sqlParameter = new NpgsqlParameter();
                 sqlParameter.ParameterName = parameter.ParameterName;
                 sqlParameter.Size = parameter.Size;