Merge pull request #2198 from ly303550688/master

PG时间类型也需要转换，否则插入或更新会报错

Author: 2881099

FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs

@@ -21,6 +21,7 @@ class Topic
             public TestTypeInfo Type { get; set; }
             public string Title { get; set; }
             public DateTime CreateTime { get; set; }
+            public DateTime? UpdateTime { get; set; }
         }
         class TestTypeInfo
         {
@@ -2054,6 +2055,16 @@ public void ToTreeList()
                 .AsTreeCte().Any());
         }
 
+        [Fact]
+        public void WithMemoryTest()
+        {
+            var fsql = g.pgsql;
+            var topics = new List<Topic>() { new Topic { Id = 1, CreateTime = new DateTime(1900, 1, 1), UpdateTime = new DateTime(1900, 1, 2) } };
+            var sql = fsql.Select<Topic>().WithMemory(topics).ToSql();
+            Assert.Equal(@"SELECT a.""id"", a.""clicks"", a.""typeguid"", a.""title"", a.""createtime"", a.""updatetime"" 
+FROM ( SELECT 1 as ""id"", 0 as ""clicks"", 0 as ""typeguid"", NULL::varchar as ""title"", '1900-01-01 00:00:00.000000'::timestamp as ""createtime"", '1900-01-02 00:00:00.000000'::timestamp as ""updatetime"" ) a", sql);
+        }
+
         [Table(Name = "D_District")]
         public class BaseDistrict
         {

FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs

@@ -296,29 +296,32 @@ public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<Db
                     {
                         object val = col.GetDbValue(d);
                         var valsql = _commonUtils.RewriteColumn(col, _commonUtils.GetNoneParamaterSqlValue(dbParams, "cu", col, col.Attribute.MapType, val));
-                        if (didx == 0 && valsql == "NULL")
+                        if (didx == 0)//首行需要类型
                         {
-                            var dbtype = _orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype;
-                            if (!string.IsNullOrWhiteSpace(dbtype))
+                            if (valsql == "NULL" || col.DbTypeText == "TIMESTAMP")//时间类型转换
                             {
-                                switch (_orm.Ado.DataType)
+                                var dbtype = _orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype;
+                                if (!string.IsNullOrWhiteSpace(dbtype))
                                 {
-                                    case DataType.Oracle:
-                                    case DataType.OdbcOracle:
-                                    case DataType.CustomOracle:
-                                    case DataType.Dameng:
-                                        break; // Oracle 不支持 cast(null as xxx)，直接用 NULL
-                                    case DataType.MsAccess:
-                                    case DataType.Odbc:
-                                    case DataType.Custom:
-                                        break; // MsAccess 不支持 cast(null as xxx)，直接用 NULL
-                                    case DataType.PostgreSQL:
-                                    case DataType.OdbcPostgreSQL:
-                                    case DataType.CustomPostgreSQL:
-                                    case DataType.KingbaseES:
-                                    case DataType.ShenTong:
-                                        valsql = $"NULL::{_orm.CodeFirst.GetDbInfo(col.Attribute.MapType)?.dbtype}";
-                                        break; // #2047
+                                    switch (_orm.Ado.DataType)
+                                    {
+                                        case DataType.Oracle:
+                                        case DataType.OdbcOracle:
+                                        case DataType.CustomOracle:
+                                        case DataType.Dameng:
+                                            break; // Oracle 不支持 cast(null as xxx)，直接用 NULL
+                                        case DataType.MsAccess:
+                                        case DataType.Odbc:
+                                        case DataType.Custom:
+                                            break; // MsAccess 不支持 cast(null as xxx)，直接用 NULL
+                                        case DataType.PostgreSQL:
+                                        case DataType.OdbcPostgreSQL:
+                                        case DataType.CustomPostgreSQL:
+                                        case DataType.KingbaseES:
+                                        case DataType.ShenTong:
+                                            valsql = $"{valsql}::{dbtype}";
+                                            break; // #2047
+                                    }
                                 }
                             }
                         }
@@ -344,7 +347,7 @@ public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<Db
             }
         }
 
-        byte _SplitSourceByIdentityValueIsNullFlag = 0 ;//防止重复计算 SplitSource
+        byte _SplitSourceByIdentityValueIsNullFlag = 0;//防止重复计算 SplitSource
         /// <summary>
         /// 如果实体类有自增属性，分成两个 List，有值的Item1 merge，无值的Item2 insert
         /// </summary>