完善 CodeFirst

FreeSql.Tests/PostgreSQL/Curd/PostgreSQLDeleteTest.cs

@@ -0,0 +1,72 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQL {
+	public class PostgreSQLDeleteTest {
+
+		IDelete<Topic> delete => g.pgsql.Delete<Topic>();
+
+		[Table(Name = "tb_topic_del")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+
+		[Fact]
+		public void Dywhere() {
+			Assert.Null(g.pgsql.Delete<Topic>().ToSql());
+			var sql = g.pgsql.Delete<Topic>(new[] { 1, 2 }).ToSql();
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (\"id\" = 1 OR \"id\" = 2)", sql);
+
+			sql = g.pgsql.Delete<Topic>(new Topic { Id = 1, Title = "test" }).ToSql();
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (\"id\" = 1)", sql);
+
+			sql = g.pgsql.Delete<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).ToSql();
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (\"id\" = 1 OR \"id\" = 2)", sql);
+
+			sql = g.pgsql.Delete<Topic>(new { id = 1 }).ToSql();
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (\"id\" = 1)", sql);
+		}
+
+		[Fact]
+		public void Where() {
+			var sql = delete.Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (\"id\" = 1)", sql);
+
+			sql = delete.Where("id = ?id", new { id = 1 }).ToSql().Replace("\r\n", "");
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (id = ?id)", sql);
+
+			var item = new Topic { Id = 1, Title = "newtitle" };
+			sql = delete.Where(item).ToSql().Replace("\r\n", "");
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (\"id\" = 1)", sql);
+
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			sql = delete.Where(items).ToSql().Replace("\r\n", "");
+			Assert.Equal("DELETE FROM \"tb_topic_del\" WHERE (\"id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+		}
+		[Fact]
+		public void WhereExists() {
+
+		}
+		[Fact]
+		public void ExecuteAffrows() {
+
+			var id = g.pgsql.Insert<Topic>(new Topic { Title = "xxxx" }).ExecuteIdentity();
+			Assert.Equal(1, delete.Where(a => a.Id == id).ExecuteAffrows());
+		}
+		[Fact]
+		public void ExecuteDeleted() {
+
+			delete.Where(a => a.Id > 0).ExecuteDeleted();
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs

@@ -0,0 +1,85 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQL {
+	public class PostgreSQLInsertTest {
+
+		IInsert<Topic> insert => g.pgsql.Insert<Topic>();
+
+		[Table(Name = "tb_topic_insert")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+ 
+		[Fact]
+		public void AppendData() {
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			var sql = insert.AppendData(items.First()).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"clicks\", \"title\", \"createtime\") VALUES(@clicks0, @title0, @createtime0)", sql);
+
+			sql = insert.AppendData(items).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"clicks\", \"title\", \"createtime\") VALUES(@clicks0, @title0, @createtime0), (@clicks1, @title1, @createtime1), (@clicks2, @title2, @createtime2), (@clicks3, @title3, @createtime3), (@clicks4, @title4, @createtime4), (@clicks5, @title5, @createtime5), (@clicks6, @title6, @createtime6), (@clicks7, @title7, @createtime7), (@clicks8, @title8, @createtime8), (@clicks9, @title9, @createtime9)", sql);
+
+			sql = insert.AppendData(items).InsertColumns(a => a.Title).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"title\") VALUES(@title0), (@title1), (@title2), (@title3), (@title4), (@title5), (@title6), (@title7), (@title8), (@title9)", sql);
+
+			sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"clicks\", \"title\") VALUES(@clicks0, @title0), (@clicks1, @title1), (@clicks2, @title2), (@clicks3, @title3), (@clicks4, @title4), (@clicks5, @title5), (@clicks6, @title6), (@clicks7, @title7), (@clicks8, @title8), (@clicks9, @title9)", sql);
+		}
+
+		[Fact]
+		public void InsertColumns() {
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			var sql = insert.AppendData(items).InsertColumns(a => a.Title).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"title\") VALUES(@title0), (@title1), (@title2), (@title3), (@title4), (@title5), (@title6), (@title7), (@title8), (@title9)", sql);
+
+			sql = insert.AppendData(items).InsertColumns(a =>new { a.Title, a.Clicks }).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"clicks\", \"title\") VALUES(@clicks0, @title0), (@clicks1, @title1), (@clicks2, @title2), (@clicks3, @title3), (@clicks4, @title4), (@clicks5, @title5), (@clicks6, @title6), (@clicks7, @title7), (@clicks8, @title8), (@clicks9, @title9)", sql);
+		}
+		[Fact]
+		public void IgnoreColumns() {
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			var sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"clicks\", \"title\") VALUES(@clicks0, @title0), (@clicks1, @title1), (@clicks2, @title2), (@clicks3, @title3), (@clicks4, @title4), (@clicks5, @title5), (@clicks6, @title6), (@clicks7, @title7), (@clicks8, @title8), (@clicks9, @title9)", sql);
+
+			sql = insert.AppendData(items).IgnoreColumns(a => new { a.Title, a.CreateTime }).ToSql();
+			Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"clicks\") VALUES(@clicks0), (@clicks1), (@clicks2), (@clicks3), (@clicks4), (@clicks5), (@clicks6), (@clicks7), (@clicks8), (@clicks9)", sql);
+		}
+		[Fact]
+		public void ExecuteAffrows() {
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows());
+			Assert.Equal(10, insert.AppendData(items).ExecuteAffrows());
+		}
+		[Fact]
+		public void ExecuteIdentity() {
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			Assert.NotEqual(0, insert.AppendData(items.First()).ExecuteIdentity());
+		}
+		[Fact]
+		public void ExecuteInserted() {
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			insert.AppendData(items.First()).ExecuteInserted();
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs

@@ -0,0 +1,556 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQL {
+	public class PostgreSQLSelectTest {
+
+		ISelect<Topic> select => g.pgsql.Select<Topic>();
+
+		[Table(Name = "tb_topic")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public int TestTypeInfoGuid { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+		class TestTypeInfo {
+			public int Guid { get; set; }
+			public int ParentId { get; set; }
+			public TestTypeParentInfo Parent { get; set; }
+			public string Name { get; set; }
+		}
+		class TestTypeParentInfo {
+			public int Id { get; set; }
+			public string Name { get; set; }
+
+			public List<TestTypeInfo> Types { get; set; }
+		}
+
+		[Fact]
+		public void ToList() {
+			var t1 = g.pgsql.Select<TestInfo>().Where("").Where(a => a.Id > 0).Skip(100).Limit(200).ToSql();
+			var t2 = g.pgsql.Select<TestInfo>().As("b").Where("").Where(a => a.Id > 0).Skip(100).Limit(200).ToSql();
+
+
+			var sql1 = select.LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid).ToSql();
+			var sql2 = select.LeftJoin<TestTypeInfo>((a, b) => a.TestTypeInfoGuid == b.Guid && b.Name == "111").ToSql();
+			var sql3 = select.LeftJoin("TestTypeInfo b on b.Guid = a.TypeGuid").ToSql();
+
+			//g.pgsql.Select<TestInfo, TestTypeInfo, TestTypeParentInfo>().Join((a, b, c) => new Model.JoinResult3(
+			//   Model.JoinType.LeftJoin, a.TypeGuid == b.Guid,
+			//   Model.JoinType.InnerJoin, c.Id == b.ParentId && c.Name == "xxx")
+			//);
+
+			//var sql4 = select.From<TestTypeInfo, TestTypeParentInfo>((a, b, c) => new SelectFrom()
+			//	.InnerJoin(a.TypeGuid == b.Guid)
+			//	.LeftJoin(c.Id == b.ParentId)
+			//	.Where(b.Name == "xxx"))
+			//.Where(a => a.Id == 1).ToSql();
+
+			var sql4 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				.InnerJoin(a => a.TestTypeInfoGuid == b.Guid)
+				.LeftJoin(a => c.Id == b.ParentId)
+				.Where(a => b.Name == "xxx")).ToSql();
+			//.Where(a => a.Id == 1).ToSql();
+
+
+			var list111 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				.InnerJoin(a => a.TestTypeInfoGuid == b.Guid)
+				.LeftJoin(a => c.Id == b.ParentId)
+				.Where(a => b.Name != "xxx"));
+			var list111sql = list111.ToSql();
+			var list111data = list111.ToList((a, b, c) => new {
+					a.Id,
+					title_substring = a.Title.Substring(0, 1),
+					a.Type,
+					ccc = new { a.Id, a.Title },
+					tp = a.Type,
+					tp2 = new {
+						a.Id,
+						tp2 = a.Type.Name
+					},
+					tp3 = new {
+						a.Id,
+						tp33 = new {
+							a.Id
+						}
+					}
+				});
+
+			var ttt122 = g.pgsql.Select<TestTypeParentInfo>().Where(a => a.Id > 0).ToSql();
+			var sql5 = g.pgsql.Select<TestInfo>().From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s).Where((a, b, c) => a.Id == b.ParentId).ToSql();
+			var t11112 = g.pgsql.Select<TestInfo>().ToList(a => new {
+				a.Id,
+				a.Title,
+				a.Type,
+				ccc = new { a.Id, a.Title },
+				tp = a.Type,
+				tp2 = new {
+					a.Id,
+					tp2 = a.Type.Name
+				},
+				tp3 = new {
+					a.Id,
+					tp33 = new {
+						a.Id
+					}
+				}
+
+			});
+
+			var t100 = g.pgsql.Select<TestInfo>().Where("").Where(a => a.Id > 0).Skip(100).Limit(200).Caching(50).ToList();
+			var t101 = g.pgsql.Select<TestInfo>().As("b").Where("").Where(a => a.Id > 0).Skip(100).Limit(200).Caching(50).ToList();
+
+
+			var t1111 = g.pgsql.Select<TestInfo>().ToList(a => new { a.Id, a.Title, a.Type });
+
+			var t2222 = g.pgsql.Select<TestInfo>().ToList(a => new { a.Id, a.Title, a.Type.Name });
+		}
+		[Fact]
+		public void ToOne() {
+		}
+		[Fact]
+		public void ToSql() {
+		}
+		[Fact]
+		public void Any() {
+			var count = select.Where(a => 1 == 1).Count();
+			Assert.False(select.Where(a => 1 == 2).Any());
+			Assert.Equal(count > 0, select.Where(a => 1 == 1).Any());
+		}
+		[Fact]
+		public void Count() {
+			var count = select.Where(a => 1 == 1).Count();
+			select.Where(a => 1 == 1).Count(out var count2);
+			Assert.Equal(count, count2);
+			Assert.Equal(0, select.Where(a => 1 == 2).Count());
+		}
+		[Fact]
+		public void Master() {
+			Assert.StartsWith(" SELECT", select.Master().Where(a => 1 == 1).ToSql());
+		}
+		[Fact]
+		public void Caching() {
+			var result1 = select.Where(a => 1 == 1).Caching(20, "testcaching").ToList();
+			var testcaching1 = g.pgsql.Cache.Get("testcaching");
+			Assert.NotNull(testcaching1);
+			var result2 = select.Where(a => 1 == 1).Caching(20, "testcaching").ToList();
+			var testcaching2 = g.pgsql.Cache.Get("testcaching");
+			Assert.NotNull(testcaching2);
+			Assert.Equal(result1.Count, result1.Count);
+		}
+		[Fact]
+		public void From() {
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				 .LeftJoin(a => a.TestTypeInfoGuid == b.Guid)
+				 .LeftJoin(a => b.ParentId == c.Id)
+				);
+			var sql = query2.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" b ON a.\"testtypeinfoguid\" = b.\"guid\" LEFT JOIN \"testtypeparentinfo\" c ON b.\"parentid\" = c.\"id\"", sql);
+			query2.ToList();
+		}
+		[Fact]
+		public void LeftJoin() {
+			//<2F><><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a.Type<70><65>a.Type.Parent <20><><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query = select.LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid);
+			var sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid && a.Type.Name == "xxx");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" AND a__Type.\"name\" = 'xxx'", sql);
+			query.ToList();
+
+			query = select.LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeparentinfo\" a__Type__Parent ON 1 = 1 LEFT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" AND a__Type.\"name\" = 'xxx' WHERE (a__Type__Parent.\"id\" = 10)", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD>û<EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "xxx");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" AND b.\"name\" = 'xxx'", sql);
+			query.ToList();
+
+			query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeparentinfo\" b__Parent ON 1 = 1 LEFT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" AND b.\"name\" = 'xxx' WHERE (b__Parent.\"id\" = 10)", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select
+				.LeftJoin(a => a.Type.Guid == a.TestTypeInfoGuid)
+				.LeftJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" LEFT JOIN \"testtypeparentinfo\" a__Type__Parent ON a__Type__Parent.\"id\" = a__Type.\"parentid\"", sql);
+			query.ToList();
+
+			query = select
+				.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid)
+				.LeftJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" LEFT JOIN \"testtypeparentinfo\" c ON c.\"id\" = b.\"parentid\"", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD>û<EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>b<EFBFBD><62>c<EFBFBD><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵ
+			var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				 .LeftJoin(a => a.TestTypeInfoGuid == b.Guid)
+				 .LeftJoin(a => b.ParentId == c.Id));
+			sql = query2.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" b ON a.\"testtypeinfoguid\" = b.\"guid\" LEFT JOIN \"testtypeparentinfo\" c ON b.\"parentid\" = c.\"id\"", sql);
+			query2.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
+			query = select.LeftJoin("\"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\"");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.LeftJoin("\"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\" and b.\"name\" = @bname", new { bname = "xxx" });
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\" and b.\"name\" = @bname", sql);
+			query.ToList();
+		}
+		[Fact]
+		public void InnerJoin() {
+			//<2F><><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a.Type<70><65>a.Type.Parent <20><><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query = select.InnerJoin(a => a.Type.Guid == a.TestTypeInfoGuid);
+			var sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.InnerJoin(a => a.Type.Guid == a.TestTypeInfoGuid && a.Type.Name == "xxx");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" AND a__Type.\"name\" = 'xxx'", sql);
+			query.ToList();
+
+			query = select.InnerJoin(a => a.Type.Guid == a.TestTypeInfoGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeparentinfo\" a__Type__Parent ON 1 = 1 INNER JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" AND a__Type.\"name\" = 'xxx' WHERE (a__Type__Parent.\"id\" = 10)", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD>û<EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "xxx");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" AND b.\"name\" = 'xxx'", sql);
+			query.ToList();
+
+			query = select.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeparentinfo\" b__Parent ON 1 = 1 INNER JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" AND b.\"name\" = 'xxx' WHERE (b__Parent.\"id\" = 10)", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select
+				.InnerJoin(a => a.Type.Guid == a.TestTypeInfoGuid)
+				.InnerJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" INNER JOIN \"testtypeparentinfo\" a__Type__Parent ON a__Type__Parent.\"id\" = a__Type.\"parentid\"", sql);
+			query.ToList();
+
+			query = select
+				.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid)
+				.InnerJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" INNER JOIN \"testtypeparentinfo\" c ON c.\"id\" = b.\"parentid\"", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD>û<EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>b<EFBFBD><62>c<EFBFBD><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵ
+			var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				 .InnerJoin(a => a.TestTypeInfoGuid == b.Guid)
+				 .InnerJoin(a => b.ParentId == c.Id));
+			sql = query2.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" b ON a.\"testtypeinfoguid\" = b.\"guid\" INNER JOIN \"testtypeparentinfo\" c ON b.\"parentid\" = c.\"id\"", sql);
+			query2.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
+			query = select.InnerJoin("\"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\"");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.InnerJoin("\"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\" and b.\"name\" = @bname", new { bname = "xxx" });
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a INNER JOIN \"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\" and b.\"name\" = @bname", sql);
+			query.ToList();
+
+		}
+		[Fact]
+		public void RightJoin() {
+			//<2F><><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a.Type<70><65>a.Type.Parent <20><><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query = select.RightJoin(a => a.Type.Guid == a.TestTypeInfoGuid);
+			var sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.RightJoin(a => a.Type.Guid == a.TestTypeInfoGuid && a.Type.Name == "xxx");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" AND a__Type.\"name\" = 'xxx'", sql);
+			query.ToList();
+
+			query = select.RightJoin(a => a.Type.Guid == a.TestTypeInfoGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeparentinfo\" a__Type__Parent ON 1 = 1 RIGHT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" AND a__Type.\"name\" = 'xxx' WHERE (a__Type__Parent.\"id\" = 10)", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD>û<EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select.RightJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.RightJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "xxx");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" AND b.\"name\" = 'xxx'", sql);
+			query.ToList();
+
+			query = select.RightJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a LEFT JOIN \"testtypeparentinfo\" b__Parent ON 1 = 1 RIGHT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" AND b.\"name\" = 'xxx' WHERE (b__Parent.\"id\" = 10)", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select
+				.RightJoin(a => a.Type.Guid == a.TestTypeInfoGuid)
+				.RightJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" a__Type ON a__Type.\"guid\" = a.\"testtypeinfoguid\" RIGHT JOIN \"testtypeparentinfo\" a__Type__Parent ON a__Type__Parent.\"id\" = a__Type.\"parentid\"", sql);
+			query.ToList();
+
+			query = select
+				.RightJoin<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid)
+				.RightJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" b ON b.\"guid\" = a.\"testtypeinfoguid\" RIGHT JOIN \"testtypeparentinfo\" c ON c.\"id\" = b.\"parentid\"", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD>û<EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>b<EFBFBD><62>c<EFBFBD><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵ
+			var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				 .RightJoin(a => a.TestTypeInfoGuid == b.Guid)
+				 .RightJoin(a => b.ParentId == c.Id));
+			sql = query2.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" b ON a.\"testtypeinfoguid\" = b.\"guid\" RIGHT JOIN \"testtypeparentinfo\" c ON b.\"parentid\" = c.\"id\"", sql);
+			query2.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
+			query = select.RightJoin("\"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\"");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\"", sql);
+			query.ToList();
+
+			query = select.RightJoin("\"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\" and b.\"name\" = @bname", new { bname = "xxx" });
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a RIGHT JOIN \"testtypeinfo\" b on b.\"guid\" = a.\"testtypeinfoguid\" and b.\"name\" = @bname", sql);
+			query.ToList();
+
+		}
+		[Fact]
+		public void Where() {
+			//<2F><><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a.Type<70><65>a.Type.Parent <20><><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query = select.Where(a => a.Id == 10);
+			var sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"id\" = 10)", sql);
+			query.ToList();
+
+			query = select.Where(a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"id\" = 10 AND a.\"id\" > 10 OR a.\"clicks\" > 100)", sql);
+			query.ToList();
+
+			query = select.Where(a => a.Id == 10).Where(a => a.Clicks > 100);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"id\" = 10) AND (a.\"clicks\" > 100)", sql);
+			query.ToList();
+
+			query = select.Where(a => a.Type.Name == "typeTitle");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" a__Type WHERE (a__Type.\"name\" = 'typeTitle')", sql);
+			query.ToList();
+
+			query = select.Where(a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TestTypeInfoGuid);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" a__Type WHERE (a__Type.\"name\" = 'typeTitle' AND a__Type.\"guid\" = a.\"testtypeinfoguid\")", sql);
+			query.ToList();
+
+			query = select.Where(a => a.Type.Parent.Name == "tparent");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" a__Type, \"testtypeparentinfo\" a__Type__Parent WHERE (a__Type__Parent.\"name\" = 'tparent')", sql);
+			query.ToList();
+			
+			//<2F><><EFBFBD>û<EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԣ<EFBFBD><D4A3>򵥶<EFBFBD><F2B5A5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select.Where<TestTypeInfo>((a, b) => b.Guid == a.TestTypeInfoGuid && b.Name == "typeTitle");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" b WHERE (b.\"guid\" = a.\"testtypeinfoguid\" AND b.\"name\" = 'typeTitle')", sql);
+			query.ToList();
+
+			query = select.Where<TestTypeInfo>((a, b) => b.Name == "typeTitle" && b.Guid == a.TestTypeInfoGuid);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" b WHERE (b.\"name\" = 'typeTitle' AND b.\"guid\" = a.\"testtypeinfoguid\")", sql);
+			query.ToList();
+
+			query = select.Where<TestTypeInfo, TestTypeParentInfo>((a, b, c) => c.Name == "tparent");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeparentinfo\" c WHERE (c.\"name\" = 'tparent')", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB> From <20><>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				.Where(a => a.Id == 10 && c.Name == "xxx")
+				.Where(a => b.ParentId == 20));
+			sql = query2.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeparentinfo\" c, \"testtypeinfo\" b WHERE (a.\"id\" = 10 AND c.\"name\" = 'xxx') AND (b.\"parentid\" = 20)", sql);
+			query2.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
+			query = select.Where("a.\"clicks\" > 100 and a.\"id\" = @id", new { id = 10 });
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"clicks\" > 100 and a.\"id\" = @id)", sql);
+			query.ToList();
+		}
+		[Fact]
+		public void WhereIf() {
+			//<2F><><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a.Type<70><65>a.Type.Parent <20><><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query = select.WhereIf(true, a => a.Id == 10);
+			var sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"id\" = 10)", sql);
+			query.ToList();
+
+			query = select.WhereIf(true, a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"id\" = 10 AND a.\"id\" > 10 OR a.\"clicks\" > 100)", sql);
+			query.ToList();
+
+			query = select.WhereIf(true, a => a.Id == 10).WhereIf(true, a => a.Clicks > 100);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"id\" = 10) AND (a.\"clicks\" > 100)", sql);
+			query.ToList();
+
+			query = select.WhereIf(true, a => a.Type.Name == "typeTitle");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" a__Type WHERE (a__Type.\"name\" = 'typeTitle')", sql);
+			query.ToList();
+
+			query = select.WhereIf(true, a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TestTypeInfoGuid);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" a__Type WHERE (a__Type.\"name\" = 'typeTitle' AND a__Type.\"guid\" = a.\"testtypeinfoguid\")", sql);
+			query.ToList();
+
+			query = select.WhereIf(true, a => a.Type.Parent.Name == "tparent");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a__Type.\"guid\", a__Type.\"parentid\", a__Type.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeinfo\" a__Type, \"testtypeparentinfo\" a__Type__Parent WHERE (a__Type__Parent.\"name\" = 'tparent')", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB> From <20><>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				.WhereIf(true, a => a.Id == 10 && c.Name == "xxx")
+				.WhereIf(true, a => b.ParentId == 20));
+			sql = query2.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", b.\"guid\", b.\"parentid\", b.\"name\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a, \"testtypeparentinfo\" c, \"testtypeinfo\" b WHERE (a.\"id\" = 10 AND c.\"name\" = 'xxx') AND (b.\"parentid\" = 20)", sql);
+			query2.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
+			query = select.WhereIf(true, "a.\"clicks\" > 100 and a.\"id\" = @id", new { id = 10 });
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a WHERE (a.\"clicks\" > 100 and a.\"id\" = @id)", sql);
+			query.ToList();
+
+			// ==========================================WhereIf(false)
+
+			//<2F><><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a.Type<70><65>a.Type.Parent <20><><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query = select.WhereIf(false, a => a.Id == 10);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query.ToList();
+
+			query = select.WhereIf(false, a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query.ToList();
+
+			query = select.WhereIf(false, a => a.Id == 10).WhereIf(false, a => a.Clicks > 100);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query.ToList();
+
+			query = select.WhereIf(false, a => a.Type.Name == "typeTitle");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query.ToList();
+
+			query = select.WhereIf(false, a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TestTypeInfoGuid);
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query.ToList();
+
+			query = select.WhereIf(false, a => a.Type.Parent.Name == "tparent");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query.ToList();
+
+			//<2F><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB> From <20><>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				.WhereIf(false, a => a.Id == 10 && c.Name == "xxx")
+				.WhereIf(false, a => b.ParentId == 20));
+			sql = query2.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query2.ToList();
+
+			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
+			query = select.WhereIf(false, "a.\"clicks\" > 100 and a.\"id\" = @id", new { id = 10 });
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.\"id\", a.\"clicks\", a.\"testtypeinfoguid\", a.\"title\", a.\"createtime\" FROM \"tb_topic\" a", sql);
+			query.ToList();
+		}
+		[Fact]
+		public void GroupBy() {
+		}
+		[Fact]
+		public void Having() {
+		}
+		[Fact]
+		public void OrderBy() {
+		}
+		[Fact]
+		public void Skip_Offset() {
+		}
+		[Fact]
+		public void Take_Limit() {
+		}
+		[Fact]
+		public void Page() {
+		}
+		[Fact]
+		public void Sum() {
+		}
+		[Fact]
+		public void Min() {
+		}
+		[Fact]
+		public void Max() {
+		}
+		[Fact]
+		public void Avg() {
+		}
+		[Fact]
+		public void As() {
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/Curd/PostgreSQLUpdateTest.cs

@@ -0,0 +1,107 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQL {
+	public class PostgreSQLUpdateTest {
+		IUpdate<Topic> update => g.pgsql.Update<Topic>();
+
+		[Table(Name = "tb_topic")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int? Clicks { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+ 
+		[Fact]
+		public void Dywhere() {
+			Assert.Null(g.pgsql.Update<Topic>().ToSql());
+			Assert.Equal("UPDATE \"tb_topic\" SET title='test' \r\nWHERE (\"id\" = 1 OR \"id\" = 2)", g.pgsql.Update<Topic>(new[] { 1, 2 }).SetRaw("title='test'").ToSql());
+			Assert.Equal("UPDATE \"tb_topic\" SET title='test1' \r\nWHERE (\"id\" = 1)", g.pgsql.Update<Topic>(new Topic { Id = 1, Title = "test" }).SetRaw("title='test1'").ToSql());
+			Assert.Equal("UPDATE \"tb_topic\" SET title='test1' \r\nWHERE (\"id\" = 1 OR \"id\" = 2)", g.pgsql.Update<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).SetRaw("title='test1'").ToSql());
+			Assert.Equal("UPDATE \"tb_topic\" SET title='test1' \r\nWHERE (\"id\" = 1)", g.pgsql.Update<Topic>(new { id = 1 }).SetRaw("title='test1'").ToSql());
+		}
+
+		[Fact]
+		public void SetSource() {
+			var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"clicks\" = @p_0, \"title\" = @p_1, \"createtime\" = @p_2 WHERE (\"id\" = 1)", sql);
+
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+			sql = update.SetSource(items).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"clicks\" = CASE \"id\" WHEN 1 THEN @p_0 WHEN 2 THEN @p_1 WHEN 3 THEN @p_2 WHEN 4 THEN @p_3 WHEN 5 THEN @p_4 WHEN 6 THEN @p_5 WHEN 7 THEN @p_6 WHEN 8 THEN @p_7 WHEN 9 THEN @p_8 WHEN 10 THEN @p_9 END, \"title\" = CASE \"id\" WHEN 1 THEN @p_10 WHEN 2 THEN @p_11 WHEN 3 THEN @p_12 WHEN 4 THEN @p_13 WHEN 5 THEN @p_14 WHEN 6 THEN @p_15 WHEN 7 THEN @p_16 WHEN 8 THEN @p_17 WHEN 9 THEN @p_18 WHEN 10 THEN @p_19 END, \"createtime\" = CASE \"id\" WHEN 1 THEN @p_20 WHEN 2 THEN @p_21 WHEN 3 THEN @p_22 WHEN 4 THEN @p_23 WHEN 5 THEN @p_24 WHEN 6 THEN @p_25 WHEN 7 THEN @p_26 WHEN 8 THEN @p_27 WHEN 9 THEN @p_28 WHEN 10 THEN @p_29 END WHERE (\"id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+			sql = update.SetSource(items).IgnoreColumns(a => new { a.Clicks, a.CreateTime }).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"title\" = CASE \"id\" WHEN 1 THEN @p_0 WHEN 2 THEN @p_1 WHEN 3 THEN @p_2 WHEN 4 THEN @p_3 WHEN 5 THEN @p_4 WHEN 6 THEN @p_5 WHEN 7 THEN @p_6 WHEN 8 THEN @p_7 WHEN 9 THEN @p_8 WHEN 10 THEN @p_9 END WHERE (\"id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+			sql = update.SetSource(items).Set(a => a.CreateTime, new DateTime(2020,1,1)).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"createtime\" = @p_0 WHERE (\"id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+		}
+		[Fact]
+		public void IgnoreColumns() {
+			var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => new { a.Clicks, a.CreateTime }).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"title\" = @p_0 WHERE (\"id\" = 1)", sql);
+		}
+		[Fact]
+		public void Set() {
+			var sql = update.Where(a => a.Id == 1).Set(a => a.Title, "newtitle").ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"title\" = @p_0 WHERE (\"id\" = 1)", sql);
+
+			sql = update.Where(a => a.Id == 1).Set(a => a.Title, "newtitle").Set(a => a.CreateTime, new DateTime(2020, 1, 1)).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"title\" = @p_0, \"createtime\" = @p_1 WHERE (\"id\" = 1)", sql);
+
+			sql = update.Set(a => a.Clicks * 10 / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"clicks\" = coalesce(\"clicks\", 0) * 10 / 1 WHERE (\"id\" = 1)", sql);
+
+			sql = update.Set(a => a.Id - 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"id\" = \"id\" - 10 WHERE (\"id\" = 1)", sql);
+
+			int incrv = 10;
+			sql = update.Set(a => a.Clicks * incrv / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"clicks\" = coalesce(\"clicks\", 0) * 10 / 1 WHERE (\"id\" = 1)", sql);
+
+			sql = update.Set(a => a.Id - incrv).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET \"id\" = \"id\" - 10 WHERE (\"id\" = 1)", sql);
+		}
+		[Fact]
+		public void SetRaw() {
+			var sql = update.Where(a => a.Id == 1).SetRaw("clicks = clicks + @incrClick", new { incrClick = 1 }).ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET clicks = clicks + @incrClick WHERE (\"id\" = 1)", sql);
+		}
+		[Fact]
+		public void Where() {
+			var sql = update.Where(a => a.Id == 1).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (\"id\" = 1)", sql);
+
+			sql = update.Where("id = @id", new { id = 1 }).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (id = @id)", sql);
+
+			var item = new Topic { Id = 1, Title = "newtitle" };
+			sql = update.Where(item).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (\"id\" = 1)", sql);
+
+			var items = new List<Topic>();
+			for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+			sql = update.Where(items).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+			Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (\"id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+		}
+		[Fact]
+		public void WhereExists() {
+
+		}
+		[Fact]
+		public void ExecuteAffrows() {
+
+		}
+		[Fact]
+		public void ExecuteUpdated() {
+
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs

@@ -0,0 +1,54 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQL {
+	public class PostgreSQLAdoTest {
+		[Fact]
+		public void Pool() {
+			var t1 = g.pgsql.Ado.MasterPool.StatisticsFullily;
+		}
+
+		[Fact]
+		public void SlavePools() {
+			var t2 = g.pgsql.Ado.SlavePools.Count;
+		}
+
+		[Fact]
+		public void IsTracePerformance() {
+			Assert.True(g.pgsql.Ado.IsTracePerformance);
+		}
+
+		[Fact]
+		public void ExecuteReader() {
+			
+		}
+		[Fact]
+		public void ExecuteArray() {
+			
+		}
+		[Fact]
+		public void ExecuteNonQuery() {
+			
+		}
+		[Fact]
+		public void ExecuteScalar() {
+			
+		}
+
+		[Fact]
+		public void Query() {
+			var t3 = g.pgsql.Ado.Query<xxx>("select * from song");
+
+			var t4 = g.pgsql.Ado.Query<(int, string, string)>("select * from song");
+
+			var t5 = g.pgsql.Ado.Query<dynamic>("select * from song");
+		}
+
+		class xxx {
+			public int Id { get; set; }
+			public string Path { get; set; }
+			public string Title2 { get; set; }
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/PostgreSQLCodeFirstTest.cs

@@ -1,8 +1,14 @@
 using FreeSql.DataAnnotations;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Npgsql.LegacyPostgis;
+using NpgsqlTypes;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
 using Xunit;
 
 namespace FreeSql.Tests.PostgreSQL {
@@ -16,12 +22,14 @@ namespace FreeSql.Tests.PostgreSQL {
 			var id = g.pgsql.Insert<TopicAddField>().AppendData(new TopicAddField { }).ExecuteIdentity();
 		}
 
-		[Table(Name = "TopicAddField", OldName = "ccc.TopicAddField")]
+		[Table(Name = "ccc.TopicAddField", OldName = "TopicAddField")]
 		public class TopicAddField {
 			[Column(IsIdentity = true)]
 			public int Id { get; set; }
 
 			public string name { get; set; } = "xxx";
+
+			public int clicks { get; set; } = 10;
 			//public int name { get; set; } = 3000;
 
 			//[Column(DbType = "varchar(200) not null", OldName = "title")]
@@ -38,6 +46,7 @@ namespace FreeSql.Tests.PostgreSQL {
 		public void GetComparisonDDLStatements() {
 
 			var sql = g.pgsql.CodeFirst.GetComparisonDDLStatements<TableAllType>();
+			g.pgsql.Select<TableAllType>();
 		}
 
 		
@@ -46,7 +55,6 @@ namespace FreeSql.Tests.PostgreSQL {
 			[Column(IsIdentity = true, IsPrimary = true)]
 			public int Id { get; set; }
 
-			[Column(Name = "testFieldBool1111")]
 			public bool testFieldBool { get; set; }
 			public sbyte testFieldSByte { get; set; }
 			public short testFieldShort { get; set; }
@@ -61,10 +69,21 @@ namespace FreeSql.Tests.PostgreSQL {
 			public decimal testFieldDecimal { get; set; }
 			public TimeSpan testFieldTimeSpan { get; set; }
 			public DateTime testFieldDateTime { get; set; }
-			public DateTimeOffset testFieldDateTimeOffset { get; set; }
 			public byte[] testFieldBytes { get; set; }
 			public string testFieldString { get; set; }
 			public Guid testFieldGuid { get; set; }
+			public NpgsqlPoint testFieldNpgsqlPoint { get; set; }
+			public NpgsqlLine testFieldNpgsqlLine { get; set; }
+			public NpgsqlLSeg testFieldNpgsqlLSeg { get; set; }
+			public NpgsqlBox testFieldNpgsqlBox { get; set; }
+			public NpgsqlPath testFieldNpgsqlPath { get; set; }
+			public NpgsqlPolygon testFieldNpgsqlPolygon { get; set; }
+			public NpgsqlCircle testFieldNpgsqlCircle { get; set; }
+			public (IPAddress Address, int Subnet) testFieldCidr { get; set; }
+			public NpgsqlRange<int> testFieldInt4range { get; set; }
+			public NpgsqlRange<long> testFieldInt8range { get; set; }
+			public NpgsqlRange<decimal> testFieldNumrange { get; set; }
+			public NpgsqlRange<DateTime> testFieldTsrange { get; set; }
 
 			public bool? testFieldBoolNullable { get; set; }
 			public sbyte? testFieldSByteNullable { get; set; }
@@ -80,13 +99,120 @@ namespace FreeSql.Tests.PostgreSQL {
 			public decimal? testFieldDecimalNullable { get; set; }
 			public TimeSpan? testFieldTimeSpanNullable { get; set; }
 			public DateTime? testFieldDateTimeNullable { get; set; }
-			public DateTimeOffset? testFieldDateTimeNullableOffset { get; set; }
 			public Guid? testFieldGuidNullable { get; set; }
+			public NpgsqlPoint? testFieldNpgsqlPointNullable { get; set; }
+			public NpgsqlLine? testFieldNpgsqlLineNullable { get; set; }
+			public NpgsqlLSeg? testFieldNpgsqlLSegNullable { get; set; }
+			public NpgsqlBox? testFieldNpgsqlBoxNullable { get; set; }
+			public NpgsqlPath? testFieldNpgsqlPathNullable { get; set; }
+			public NpgsqlPolygon? testFieldNpgsqlPolygonNullable { get; set; }
+			public NpgsqlCircle? testFieldNpgsqlCircleNullable { get; set; }
+			public (IPAddress Address, int Subnet)? testFieldCidrNullable { get; set; }
+			public NpgsqlRange<int>? testFieldInt4rangeNullable { get; set; }
+			public NpgsqlRange<long>? testFieldInt8rangeNullable { get; set; }
+			public NpgsqlRange<decimal>? testFieldNumrangeNullable { get; set; }
+			public NpgsqlRange<DateTime>? testFieldTsrangeNullable { get; set; }
+
+			public BitArray testFieldBitArray { get; set; }
+			public IPAddress testFieldInet { get; set; }
+			public PhysicalAddress testFieldMacaddr { get; set; }
+			public JToken testFieldJToken { get; set; }
+			public JObject testFieldJObject { get; set; }
+			public JArray testFieldJArray { get; set; }
+			public Dictionary<string, string> testFieldHStore { get; set; }
+			public PostgisPoint testFieldPostgisPoint { get; set; }
+			public PostgisLineString testFieldPostgisLineString { get; set; }
+			public PostgisPolygon testFieldPostgisPolygon { get; set; }
+			public PostgisMultiPoint testFieldPostgisMultiPoint { get; set; }
+			public PostgisMultiLineString testFieldPostgisPostgisMultiLineString { get; set; }
+			public PostgisMultiPolygon testFieldPostgisPostgisMultiPolygon { get; set; }
+			public PostgisGeometry testFieldPostgisGeometry { get; set; }
+			public PostgisGeometryCollection testFieldPostgisGeometryCollection { get; set; }
 
 			public TableAllTypeEnumType1 testFieldEnum1 { get; set; }
 			public TableAllTypeEnumType1? testFieldEnum1Nullable { get; set; }
 			public TableAllTypeEnumType2 testFieldEnum2 { get; set; }
 			public TableAllTypeEnumType2? testFieldEnum2Nullable { get; set; }
+
+			/* array */
+			public bool[] testFieldBoolArray { get; set; }
+			public sbyte[] testFieldSByteArray { get; set; }
+			public short[] testFieldShortArray { get; set; }
+			public int[] testFieldIntArray { get; set; }
+			public long[] testFieldLongArray { get; set; }
+			public byte[] testFieldByteArray { get; set; }
+			public ushort[] testFieldUShortArray { get; set; }
+			public uint[] testFieldUIntArray { get; set; }
+			public ulong[] testFieldULongArray { get; set; }
+			public double[] testFieldDoubleArray { get; set; }
+			public float[] testFieldFloatArray { get; set; }
+			public decimal[] testFieldDecimalArray { get; set; }
+			public TimeSpan[] testFieldTimeSpanArray { get; set; }
+			public DateTime[] testFieldDateTimeArray { get; set; }
+			public byte[][] testFieldBytesArray { get; set; }
+			public string[] testFieldStringArray { get; set; }
+			public Guid[] testFieldGuidArray { get; set; }
+			public NpgsqlPoint[] testFieldNpgsqlPointArray { get; set; }
+			public NpgsqlLine[] testFieldNpgsqlLineArray { get; set; }
+			public NpgsqlLSeg[] testFieldNpgsqlLSegArray { get; set; }
+			public NpgsqlBox[] testFieldNpgsqlBoxArray { get; set; }
+			public NpgsqlPath[] testFieldNpgsqlPathArray { get; set; }
+			public NpgsqlPolygon[] testFieldNpgsqlPolygonArray { get; set; }
+			public NpgsqlCircle[] testFieldNpgsqlCircleArray { get; set; }
+			public (IPAddress Address, int Subnet)[] testFieldCidrArray { get; set; }
+			public NpgsqlRange<int>[] testFieldInt4rangeArray { get; set; }
+			public NpgsqlRange<long>[] testFieldInt8rangeArray { get; set; }
+			public NpgsqlRange<decimal>[] testFieldNumrangeArray { get; set; }
+			public NpgsqlRange<DateTime>[] testFieldTsrangeArray { get; set; }
+
+			public bool?[] testFieldBoolArrayNullable { get; set; }
+			public sbyte?[] testFieldSByteArrayNullable { get; set; }
+			public short?[] testFieldShortArrayNullable { get; set; }
+			public int?[] testFieldIntArrayNullable { get; set; }
+			public long?[] testFielLongArrayNullable { get; set; }
+			public byte?[] testFieldByteArrayNullable { get; set; }
+			public ushort?[] testFieldUShortArrayNullable { get; set; }
+			public uint?[] testFieldUIntArrayNullable { get; set; }
+			public ulong?[] testFieldULongArrayNullable { get; set; }
+			public double?[] testFieldDoubleArrayNullable { get; set; }
+			public float?[] testFieldFloatArrayNullable { get; set; }
+			public decimal?[] testFieldDecimalArrayNullable { get; set; }
+			public TimeSpan?[] testFieldTimeSpanArrayNullable { get; set; }
+			public DateTime?[] testFieldDateTimeArrayNullable { get; set; }
+			public Guid?[] testFieldGuidArrayNullable { get; set; }
+			public NpgsqlPoint?[] testFieldNpgsqlPointArrayNullable { get; set; }
+			public NpgsqlLine?[] testFieldNpgsqlLineArrayNullable { get; set; }
+			public NpgsqlLSeg?[] testFieldNpgsqlLSegArrayNullable { get; set; }
+			public NpgsqlBox?[] testFieldNpgsqlBoxArrayNullable { get; set; }
+			public NpgsqlPath?[] testFieldNpgsqlPathArrayNullable { get; set; }
+			public NpgsqlPolygon?[] testFieldNpgsqlPolygonArrayNullable { get; set; }
+			public NpgsqlCircle?[] testFieldNpgsqlCircleArrayNullable { get; set; }
+			public (IPAddress Address, int Subnet)?[] testFieldCidrArrayNullable { get; set; }
+			public NpgsqlRange<int>?[] testFieldInt4rangeArrayNullable { get; set; }
+			public NpgsqlRange<long>?[] testFieldInt8rangeArrayNullable { get; set; }
+			public NpgsqlRange<decimal>?[] testFieldNumrangeArrayNullable { get; set; }
+			public NpgsqlRange<DateTime>?[] testFieldTsrangeArrayNullable { get; set; }
+
+			public BitArray[] testFieldBitArrayArray { get; set; }
+			public IPAddress[] testFieldInetArray { get; set; }
+			public PhysicalAddress[] testFieldMacaddrArray { get; set; }
+			public JToken[] testFieldJTokenArray { get; set; }
+			public JObject[] testFieldJObjectArray { get; set; }
+			public JArray[] testFieldJArrayArray { get; set; }
+			public Dictionary<string, string>[] testFieldHStoreArray { get; set; }
+			public PostgisPoint[] testFieldPostgisPointArray { get; set; }
+			public PostgisLineString[] testFieldPostgisLineStringArray { get; set; }
+			public PostgisPolygon[] testFieldPostgisPolygonArray { get; set; }
+			public PostgisMultiPoint[] testFieldPostgisMultiPointArray { get; set; }
+			public PostgisMultiLineString[] testFieldPostgisPostgisMultiLineStringArray { get; set; }
+			public PostgisMultiPolygon[] testFieldPostgisPostgisMultiPolygonArray { get; set; }
+			public PostgisGeometry[] testFieldPostgisGeometryArray { get; set; }
+			public PostgisGeometryCollection[] testFieldPostgisGeometryCollectionArray { get; set; }
+
+			public TableAllTypeEnumType1[] testFieldEnum1Array { get; set; }
+			public TableAllTypeEnumType1?[] testFieldEnum1ArrayNullable { get; set; }
+			public TableAllTypeEnumType2[] testFieldEnum2Array { get; set; }
+			public TableAllTypeEnumType2?[] testFieldEnum2ArrayNullable { get; set; }
 		}
 
 		public enum TableAllTypeEnumType1 { e1, e2, e3, e5 }

FreeSql.Tests/PostgreSQL/PostgreSQLExpression/ConvertTest.cs

@@ -0,0 +1,114 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQLExpression {
+	public class ConvertTest {
+
+		ISelect<Topic> select => g.pgsql.Select<Topic>();
+
+		[Table(Name = "tb_topic")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public int TestTypeInfoGuid { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+		class TestTypeInfo {
+			public int Guid { get; set; }
+			public int ParentId { get; set; }
+			public TestTypeParentInfo Parent { get; set; }
+			public string Name { get; set; }
+		}
+		class TestTypeParentInfo {
+			public int Id { get; set; }
+			public string Name { get; set; }
+
+			public List<TestTypeInfo> Types { get; set; }
+		}
+
+		[Fact]
+		public void ToBoolean() {
+			var data = new List<object>();
+			data.Add(select.Where(a => (Convert.ToBoolean(a.Clicks) ? 1 : 2) > 0).ToList());
+			//SELECT a.`Id`, a.`Clicks`, a.`TestTypeInfoGuid`, a.`Title`, a.`CreateTime` 
+			//FROM `tb_topic` a 
+			//WHERE ((a.`Clicks` not in ('0','false')))
+		}
+		[Fact]
+		public void ToByte() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToByte(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToChar() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToBoolean(a.Clicks)).ToList());
+		}
+		[Fact]
+		public void ToDateTime() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToDateTime(a.CreateTime.ToString()).Year > 0).ToList());
+		}
+		[Fact]
+		public void ToDecimal() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToDecimal(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToDouble() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToDouble(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToInt16() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToInt16(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToInt32() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToInt32(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToInt64() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToInt64(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToSByte() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToSByte(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToSingle() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToSingle(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void this_ToString() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToString(a.Clicks).Equals("")).ToList());
+		}
+		[Fact]
+		public void ToUInt16() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToUInt16(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToUInt32() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToUInt32(a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void ToUInt64() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Convert.ToUInt64(a.Clicks) > 0).ToList());
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/PostgreSQLExpression/DateTimeTest.cs

@@ -0,0 +1,622 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQLExpression {
+	public class DateTimeTest {
+
+		ISelect<Topic> select => g.pgsql.Select<Topic>();
+
+		[Table(Name = "tb_topic111333")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public int TestTypeInfoGuid { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+		[Table(Name = "TestTypeInfo333")]
+		class TestTypeInfo {
+			public int Guid { get; set; }
+			public int ParentId { get; set; }
+			public TestTypeParentInfo Parent { get; set; }
+			public string Name { get; set; }
+			public DateTime Time { get; set; }
+		}
+		[Table(Name = "TestTypeParentInfo23123")]
+		class TestTypeParentInfo {
+			public int Id { get; set; }
+			public string Name { get; set; }
+
+			public List<TestTypeInfo> Types { get; set; }
+			public DateTime Time2 { get; set; }
+		}
+		[Fact]
+		public void Now() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Date == DateTime.Now.Date).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(now(), '%Y-%m-%d') as datetime))
+		}
+		[Fact]
+		public void UtcNow() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Date == DateTime.UtcNow.Date).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(utc_timestamp(), '%Y-%m-%d') as datetime))
+		}
+		[Fact]
+		public void MinValue() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Date == DateTime.MinValue.Date).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(cast('0001/1/1 0:00:00' as datetime), '%Y-%m-%d') as datetime))
+		}
+		[Fact]
+		public void MaxValue() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Date == DateTime.MaxValue.Date).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(cast('9999/12/31 23:59:59' as datetime), '%Y-%m-%d') as datetime))
+		}
+		[Fact]
+		public void Date() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Date == DateTime.Now.Date).ToList());
+			data.Add(select.Where(a => a.Type.Time.Date > DateTime.Now.Date).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Date > DateTime.Now.Date).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(now(), '%Y-%m-%d') as datetime));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (cast(date_format(a__Type.`Time`, '%Y-%m-%d') as datetime) > cast(date_format(now(), '%Y-%m-%d') as datetime));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (cast(date_format(a__Type__Parent.`Time2`, '%Y-%m-%d') as datetime) > cast(date_format(now(), '%Y-%m-%d') as datetime));
+			data.Add(select.Where(a => DateTime.Now.Subtract(a.CreateTime.Date).TotalSeconds > 0).ToList());
+			data.Add(select.Where(a => DateTime.Now.Subtract(a.Type.Time.Date).TotalSeconds > 0).ToList());
+			data.Add(select.Where(a => DateTime.Now.Subtract(a.Type.Parent.Time2.Date).TotalSeconds > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (((timestampdiff(microsecond, cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (((timestampdiff(microsecond, cast(date_format(a__Type.`Time`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (((timestampdiff(microsecond, cast(date_format(a__Type__Parent.`Time2`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0)
+		}
+		[Fact]
+		public void TimeOfDay() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay == DateTime.Now.TimeOfDay).ToList());
+			data.Add(select.Where(a => a.Type.Time.TimeOfDay > DateTime.Now.TimeOfDay).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.TimeOfDay > DateTime.Now.TimeOfDay).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE ((timestampdiff(microsecond, date_format(a__Type.`Time`, '1970-1-1 %H:%i:%s.%f'), a__Type.`Time`) + 62135596800000000) > (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE ((timestampdiff(microsecond, date_format(a__Type__Parent.`Time2`, '1970-1-1 %H:%i:%s.%f'), a__Type__Parent.`Time2`) + 62135596800000000) > (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000))
+		}
+		[Fact]
+		public void DayOfWeek() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+			data.Add(select.Where(a => a.Type.Time.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE ((dayofweek(a.`CreateTime`) - 1) > (dayofweek(now()) - 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE ((dayofweek(a__Type.`Time`) - 1) > (dayofweek(now()) - 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE ((dayofweek(a__Type__Parent.`Time2`) - 1) > (dayofweek(now()) - 1))
+		}
+		[Fact]
+		public void Day() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Day > DateTime.Now.Day).ToList());
+			data.Add(select.Where(a => a.Type.Time.Day > DateTime.Now.Day).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Day > DateTime.Now.Day).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (dayofmonth(a.`CreateTime`) > dayofmonth(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (dayofmonth(a__Type.`Time`) > dayofmonth(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (dayofmonth(a__Type__Parent.`Time2`) > dayofmonth(now()))
+		}
+		[Fact]
+		public void DayOfYear() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.DayOfYear > DateTime.Now.DayOfYear).ToList());
+			data.Add(select.Where(a => a.Type.Time.DayOfYear > DateTime.Now.DayOfYear).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.DayOfYear > DateTime.Now.DayOfYear).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (dayofyear(a.`CreateTime`) > dayofyear(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (dayofyear(a__Type.`Time`) > dayofyear(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (dayofyear(a__Type__Parent.`Time2`) > dayofyear(now()))
+		}
+		[Fact]
+		public void Month() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Month > DateTime.Now.Month).ToList());
+			data.Add(select.Where(a => a.Type.Time.Month > DateTime.Now.Month).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Month > DateTime.Now.Month).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (month(a.`CreateTime`) > month(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (month(a__Type.`Time`) > month(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (month(a__Type__Parent.`Time2`) > month(now()))
+		}
+		[Fact]
+		public void Year() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Year > DateTime.Now.Year).ToList());
+			data.Add(select.Where(a => a.Type.Time.Year > DateTime.Now.Year).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Year > DateTime.Now.Year).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (year(a.`CreateTime`) > year(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (year(a__Type.`Time`) > year(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (year(a__Type__Parent.`Time2`) > year(now()))
+		}
+		[Fact]
+		public void Hour() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Hour > DateTime.Now.Hour).ToList());
+			data.Add(select.Where(a => a.Type.Time.Hour > DateTime.Now.Hour).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Hour > DateTime.Now.Hour).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (hour(a.`CreateTime`) > hour(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (hour(a__Type.`Time`) > hour(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (hour(a__Type__Parent.`Time2`) > hour(now()))
+		}
+		[Fact]
+		public void Minute() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Minute > DateTime.Now.Minute).ToList());
+			data.Add(select.Where(a => a.Type.Time.Minute > DateTime.Now.Minute).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Minute > DateTime.Now.Minute).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (minute(a.`CreateTime`) > minute(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (minute(a__Type.`Time`) > minute(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (minute(a__Type__Parent.`Time2`) > minute(now()))
+		}
+		[Fact]
+		public void Second() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Second > DateTime.Now.Second).ToList());
+			data.Add(select.Where(a => a.Type.Time.Second > DateTime.Now.Second).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Second > DateTime.Now.Second).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (second(a.`CreateTime`) > second(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (second(a__Type.`Time`) > second(now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (second(a__Type__Parent.`Time2`) > second(now()))
+		}
+		[Fact]
+		public void Millisecond() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Millisecond > DateTime.Now.Millisecond).ToList());
+			data.Add(select.Where(a => a.Type.Time.Millisecond > DateTime.Now.Millisecond).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Millisecond > DateTime.Now.Millisecond).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (floor(microsecond(a.`CreateTime`) / 1000) > floor(microsecond(now()) / 1000));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (floor(microsecond(a__Type.`Time`) / 1000) > floor(microsecond(now()) / 1000));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (floor(microsecond(a__Type__Parent.`Time2`) / 1000) > floor(microsecond(now()) / 1000))
+		}
+		[Fact]
+		public void Ticks() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Ticks > DateTime.Now.Ticks).ToList());
+			data.Add(select.Where(a => a.Type.Time.Ticks > DateTime.Now.Ticks).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Ticks > DateTime.Now.Ticks).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE ((timestampdiff(microsecond, '1970-1-1', a.`CreateTime`) * 10 + 621355968000000000) > (timestampdiff(microsecond, '1970-1-1', now()) * 10 + 621355968000000000));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE ((timestampdiff(microsecond, '1970-1-1', a__Type.`Time`) * 10 + 621355968000000000) > (timestampdiff(microsecond, '1970-1-1', now()) * 10 + 621355968000000000));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE ((timestampdiff(microsecond, '1970-1-1', a__Type__Parent.`Time2`) * 10 + 621355968000000000) > (timestampdiff(microsecond, '1970-1-1', now()) * 10 + 621355968000000000))
+		}
+		[Fact]
+		public void Add() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval ((1 * 86400000000)) microsecond) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval ((1 * 86400000000)) microsecond) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval ((1 * 86400000000)) microsecond) > now())
+		}
+		[Fact]
+		public void AddDays() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddDays(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddDays(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddDays(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) day) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) day) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) day) > now())
+		}
+		[Fact]
+		public void AddHours() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddHours(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddHours(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddHours(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) hour) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) hour) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) hour) > now())
+		}
+		[Fact]
+		public void AddMilliseconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddMilliseconds(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddMilliseconds(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddMilliseconds(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) * 1000 microsecond) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) * 1000 microsecond) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) * 1000 microsecond) > now())
+		}
+		[Fact]
+		public void AddMinutes() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddMinutes(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddMinutes(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddMinutes(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) minute) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) minute) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) minute) > now())
+		}
+		[Fact]
+		public void AddMonths() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddMonths(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddMonths(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddMonths(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) month) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) month) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) month) > now())
+		}
+		[Fact]
+		public void AddSeconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddSeconds(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddSeconds(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddSeconds(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) second) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) second) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) second) > now())
+		}
+		[Fact]
+		public void AddTicks() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddTicks(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddTicks(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddTicks(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) / 10 microsecond) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) / 10 microsecond) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) / 10 microsecond) > now())
+		}
+		[Fact]
+		public void AddYears() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddYears(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddYears(1) > DateTime.Now).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_add(a.`CreateTime`, interval (1) year) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_add(a__Type.`Time`, interval (1) year) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_add(a__Type__Parent.`Time2`, interval (1) year) > now())
+		}
+		[Fact]
+		public void Subtract() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.Subtract(DateTime.Now).TotalSeconds > 0).ToList());
+			data.Add(select.Where(a => a.Type.Time.Subtract(DateTime.Now).TotalSeconds > 0).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Subtract(DateTime.Now).TotalSeconds > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (((timestampdiff(microsecond, now(), a.`CreateTime`)) / 1000000) > 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (((timestampdiff(microsecond, now(), a__Type.`Time`)) / 1000000) > 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (((timestampdiff(microsecond, now(), a__Type__Parent.`Time2`)) / 1000000) > 0);
+			data.Add(select.Where(a => a.CreateTime.Subtract(TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+			data.Add(select.Where(a => a.Type.Time.Subtract(TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.Subtract(TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (date_sub(a.`CreateTime`, interval ((1 * 86400000000)) microsecond) > a.`CreateTime`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (date_sub(a__Type.`Time`, interval ((1 * 86400000000)) microsecond) > a.`CreateTime`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (date_sub(a__Type__Parent.`Time2`, interval ((1 * 86400000000)) microsecond) > a.`CreateTime`)
+		}
+		[Fact]
+		public void this_Equals() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.AddYears(1).Equals(DateTime.Now)).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddYears(1).Equals(DateTime.Now)).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).Equals(DateTime.Now)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE ((date_add(a.`CreateTime`, interval (1) year) = now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE ((date_add(a__Type.`Time`, interval (1) year) = now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE ((date_add(a__Type__Parent.`Time2`, interval (1) year) = now()))
+		}
+		[Fact]
+		public void this_ToString() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.ToString().Equals(DateTime.Now)).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddYears(1).ToString().Equals(DateTime.Now)).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).ToString().Equals(DateTime.Now)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE ((date_format(a.`CreateTime`, '%Y-%m-%d %H:%i:%s.%f') = now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE ((date_format(date_add(a__Type.`Time`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') = now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE ((date_format(date_add(a__Type__Parent.`Time2`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') = now()))
+		}
+
+		[Fact]
+		public void DateTime_Compare() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.CompareTo(DateTime.Now) == 0).ToList());
+			data.Add(select.Where(a => a.Type.Time.AddYears(1).CompareTo(DateTime.Now) == 0).ToList());
+			data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).CompareTo(DateTime.Now) == 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (((a.`CreateTime`) - (now())) = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (((date_add(a__Type.`Time`, interval (1) year)) - (now())) = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (((date_add(a__Type__Parent.`Time2`, interval (1) year)) - (now())) = 0)
+		}
+		[Fact]
+		public void DateTime_DaysInMonth() {
+			var data = new List<object>();
+			data.Add(select.Where(a => DateTime.DaysInMonth(a.CreateTime.Year, a.CreateTime.Month) > 30).ToList());
+			data.Add(select.Where(a => DateTime.DaysInMonth(a.Type.Time.Year, a.Type.Time.Month) > 30).ToList());
+			data.Add(select.Where(a => DateTime.DaysInMonth(a.Type.Parent.Time2.Year, a.Type.Parent.Time2.Month) > 30).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (dayofmonth(last_day(concat(year(a.`CreateTime`), month(a.`CreateTime`), '-01'))) > 30);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (dayofmonth(last_day(concat(year(a__Type.`Time`), month(a__Type.`Time`), '-01'))) > 30);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (dayofmonth(last_day(concat(year(a__Type__Parent.`Time2`), month(a__Type__Parent.`Time2`), '-01'))) > 30)
+		}
+		[Fact]
+		public void DateTime_Equals() {
+			var data = new List<object>();
+			data.Add(select.Where(a => DateTime.Equals(a.CreateTime.AddYears(1), DateTime.Now)).ToList());
+			data.Add(select.Where(a => DateTime.Equals(a.Type.Time.AddYears(1), DateTime.Now)).ToList());
+			data.Add(select.Where(a => DateTime.Equals(a.Type.Parent.Time2.AddYears(1), DateTime.Now)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE ((date_add(a.`CreateTime`, interval (1) year) = now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE ((date_add(a__Type.`Time`, interval (1) year) = now()));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE ((date_add(a__Type__Parent.`Time2`, interval (1) year) = now()))
+		}
+		[Fact]
+		public void DateTime_IsLeapYear() {
+			var data = new List<object>();
+			data.Add(select.Where(a => DateTime.IsLeapYear(a.CreateTime.Year)).ToList());
+			data.Add(select.Where(a => DateTime.IsLeapYear(a.Type.Time.AddYears(1).Year)).ToList());
+			data.Add(select.Where(a => DateTime.IsLeapYear(a.Type.Parent.Time2.AddYears(1).Year)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (((year(a.`CreateTime`)) % 4 = 0 AND (year(a.`CreateTime`)) % 100 <> 0 OR (year(a.`CreateTime`)) % 400 = 0));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (((year(date_add(a__Type.`Time`, interval (1) year))) % 4 = 0 AND (year(date_add(a__Type.`Time`, interval (1) year))) % 100 <> 0 OR (year(date_add(a__Type.`Time`, interval (1) year))) % 400 = 0));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (((year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 4 = 0 AND (year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 100 <> 0 OR (year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 400 = 0))
+		}
+		[Fact]
+		public void DateTime_Parse() {
+			var data = new List<object>();
+			data.Add(select.Where(a => DateTime.Parse(a.CreateTime.ToString()) > DateTime.Now).ToList());
+			data.Add(select.Where(a => DateTime.Parse(a.Type.Time.AddYears(1).ToString()) > DateTime.Now).ToList());
+			data.Add(select.Where(a => DateTime.Parse(a.Type.Parent.Time2.AddYears(1).ToString()) > DateTime.Now).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic111333` a 
+			//WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d %H:%i:%s.%f') as datetime) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+			//WHERE (cast(date_format(date_add(a__Type.`Time`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') as datetime) > now());
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+			//FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+			//WHERE (cast(date_format(date_add(a__Type__Parent.`Time2`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') as datetime) > now())
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/PostgreSQLExpression/MathTest.cs

@@ -0,0 +1,132 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQLExpression {
+	public class MathTest {
+
+		ISelect<Topic> select => g.pgsql.Select<Topic>();
+
+		[Table(Name = "tb_topic")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public int TestTypeInfoGuid { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+		class TestTypeInfo {
+			public int Guid { get; set; }
+			public int ParentId { get; set; }
+			public TestTypeParentInfo Parent { get; set; }
+			public string Name { get; set; }
+		}
+		class TestTypeParentInfo {
+			public int Id { get; set; }
+			public string Name { get; set; }
+
+			public List<TestTypeInfo> Types { get; set; }
+		}
+
+		[Fact]
+		public void PI() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.PI + a.Clicks > 0).ToList());
+		}
+		[Fact]
+		public void Abs() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Abs(-a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void Sign() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Sign(-a.Clicks) > 0).ToList());
+		}
+		[Fact]
+		public void Floor() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Floor(a.Clicks + 0.5) == a.Clicks).ToList());
+		}
+		[Fact]
+		public void Ceiling() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Ceiling(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Round() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Round(a.Clicks + 0.5) == a.Clicks).ToList());
+			data.Add(select.Where(a => Math.Round(a.Clicks + 0.5, 1) > a.Clicks).ToList());
+		}
+		[Fact]
+		public void Exp() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Exp(1) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Log() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Log(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Log10() {
+			var data = new List<object>();
+			//data.Add(select.Where(a => Math.Log10(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Pow() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Pow(2, a.Clicks) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Sqrt() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Sqrt(Math.Pow(2, a.Clicks)) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Cos() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Cos(Math.Pow(2, a.Clicks)) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Sin() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Sin(Math.Pow(2, a.Clicks)) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Tan() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Tan(Math.Pow(2, a.Clicks)) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Acos() {
+			var data = new List<object>();
+			//data.Add(select.Where(a => Math.Acos(Math.Pow(2, a.Clicks)) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Asin() {
+			var data = new List<object>();
+			//data.Add(select.Where(a => Math.Asin(Math.Pow(2, a.Clicks)) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Atan() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Atan(Math.Pow(2, a.Clicks)) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Atan2() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Atan2(2, a.Clicks) == a.Clicks + 1).ToList());
+		}
+		[Fact]
+		public void Truncate() {
+			var data = new List<object>();
+			data.Add(select.Where(a => Math.Truncate(a.Clicks * 1.0 / 3) == a.Clicks + 1).ToList());
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/PostgreSQLExpression/StringTest.cs

@@ -0,0 +1,675 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQLExpression {
+	public class StringTest {
+
+		ISelect<Topic> select => g.pgsql.Select<Topic>();
+
+		[Table(Name = "tb_topic")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public int TestTypeInfoGuid { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+		class TestTypeInfo {
+			public int Guid { get; set; }
+			public int ParentId { get; set; }
+			public TestTypeParentInfo Parent { get; set; }
+			public string Name { get; set; }
+		}
+		class TestTypeParentInfo {
+			public int Id { get; set; }
+			public string Name { get; set; }
+
+			public List<TestTypeInfo> Types { get; set; }
+		}
+
+		[Fact]
+		public void Empty() {
+			var data = new List<object>();
+			data.Add(select.Where(a => (a.Title ?? "") == string.Empty).ToSql());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (ifnull(a.`Title`, '') = '')
+		}
+
+		[Fact]
+		public void StartsWith() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.StartsWith("aaa")).ToList());
+			list.Add(select.Where(a => a.Title.StartsWith(a.Title)).ToList());
+			list.Add(select.Where(a => a.Title.StartsWith(a.Title + 1)).ToList());
+			list.Add(select.Where(a => a.Title.StartsWith(a.Type.Name)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE '%aaa')
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE concat('%', a.`Title`))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE concat('%', concat(a.`Title`, 1)))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE((a.`Title`) LIKE concat('%', a__Type.`Name`))
+			list.Add(select.Where(a => (a.Title + "aaa").StartsWith("aaa")).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Title)).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Title + 1)).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Type.Name)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE '%aaa')
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a.`Title`))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', concat(a.`Title`, 1)))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a__Type.`Name`))
+		}
+		[Fact]
+		public void EndsWith() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.EndsWith("aaa")).ToList());
+			list.Add(select.Where(a => a.Title.EndsWith(a.Title)).ToList());
+			list.Add(select.Where(a => a.Title.EndsWith(a.Title + 1)).ToList());
+			list.Add(select.Where(a => a.Title.EndsWith(a.Type.Name)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE 'aaa%')
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE concat(a.`Title`, '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE concat(concat(a.`Title`, 1), '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE((a.`Title`) LIKE concat(a__Type.`Name`, '%'))
+			list.Add(select.Where(a => (a.Title + "aaa").EndsWith("aaa")).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Title)).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Title + 1)).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Type.Name)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE 'aaa%')
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat(a.`Title`, '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat(concat(a.`Title`, 1), '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat(a__Type.`Name`, '%'))
+		}
+		[Fact]
+		public void Contains() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.Contains("aaa")).ToList());
+			list.Add(select.Where(a => a.Title.Contains(a.Title)).ToList());
+			list.Add(select.Where(a => a.Title.Contains(a.Title + 1)).ToList());
+			list.Add(select.Where(a => a.Title.Contains(a.Type.Name)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE '%aaa%')
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE concat('%', a.`Title`, '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((a.`Title`) LIKE concat('%', a.`Title` +1, '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE((a.`Title`) LIKE concat('%', a__Type.`Name`, '%'))
+			list.Add(select.Where(a => (a.Title + "aaa").Contains("aaa")).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Title)).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Title + 1)).ToList());
+			list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Type.Name)).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE '%aaa%')
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a.`Title`, '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', concat(a.`Title`, 1), '%'))
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a__Type.`Name`, '%'))
+		}
+		[Fact]
+		public void ToLower() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.ToLower() == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.ToLower() == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.ToLower() == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.ToLower() == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE(lower(a.`Title`) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE(lower(a.`Title`) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE(lower(a.`Title`) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE(lower(a.`Title`) = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE(lower(concat(lower(a.`Title`), 'aaa')) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE(lower(concat(lower(a.`Title`), 'aaa')) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5
+			//FROM `tb_topic` a
+			//WHERE(lower(concat(lower(a.`Title`), 'aaa')) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type
+			//WHERE(lower(concat(lower(a.`Title`), 'aaa')) = a__Type.`Name`)
+		}
+		[Fact]
+		public void ToUpper() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.ToUpper() == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.ToUpper() == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.ToUpper() == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.ToUpper() == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (upper(a.`Title`) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (upper(a.`Title`) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (upper(a.`Title`) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (upper(a.`Title`) = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (upper(concat(upper(a.`Title`), 'aaa')) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (upper(concat(upper(a.`Title`), 'aaa')) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (upper(concat(upper(a.`Title`), 'aaa')) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (upper(concat(upper(a.`Title`), 'aaa')) = a__Type.`Name`)
+		}
+		[Fact]
+		public void Substring() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.Substring(0) == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.Substring(0) == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.Substring(0) == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.Substring(0) == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (substr(a.`Title`, 1) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (substr(a.`Title`, 1) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (substr(a.`Title`, 1) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (substr(a.`Title`, 1) = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(a.Title.Length) == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(0, a.Title.Length) == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(0, 3) == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(1, 2) == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), char_length(a.`Title`) + 1) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 1, char_length(a.`Title`)) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 1, 3) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 2, 2) = a__Type.`Name`)
+		}
+		[Fact]
+		public void Length() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.Length == 0).ToList());
+			data.Add(select.Where(a => a.Title.Length == 1).ToList());
+			data.Add(select.Where(a => a.Title.Length == a.Title.Length + 1).ToList());
+			data.Add(select.Where(a => a.Title.Length == a.Type.Name.Length).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (char_length(a.`Title`) = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (char_length(a.`Title`) = 1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (char_length(a.`Title`) = char_length(a.`Title`) + 1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (char_length(a.`Title`) = char_length(a__Type.`Name`));
+			data.Add(select.Where(a => (a.Title + "aaa").Length == 0).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").Length == 1).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").Length == a.Title.Length + 1).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").Length == a.Type.Name.Length).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (char_length(concat(a.`Title`, 'aaa')) = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (char_length(concat(a.`Title`, 'aaa')) = 1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (char_length(concat(a.`Title`, 'aaa')) = char_length(a.`Title`) + 1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (char_length(concat(a.`Title`, 'aaa')) = char_length(a__Type.`Name`))
+		}
+		[Fact]
+		public void IndexOf() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.IndexOf("aaa") == -1).ToList());
+			data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == -1).ToList());
+			data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == (a.Title.Length + 1)).ToList());
+			data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == a.Type.Name.Length + 1).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((locate(a.`Title`, 'aaa') - 1) = -1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = -1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = char_length(a.`Title`) + 1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = char_length(a__Type.`Name`) + 1);
+			data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa") == -1).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == -1).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == (a.Title.Length + 1)).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == a.Type.Name.Length + 1).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa') - 1) = -1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = -1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = char_length(a.`Title`) + 1);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = char_length(a__Type.`Name`) + 1)
+		}
+		[Fact]
+		public void PadLeft() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (lpad(a.`Title`, 10, 'a') = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (lpad(a.`Title`, 10, 'a') = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (lpad(a.`Title`, 10, 'a') = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (lpad(a.`Title`, 10, 'a') = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a__Type.`Name`)
+		}
+		[Fact]
+		public void PadRight() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.PadRight(10, 'a') == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.PadRight(10, 'a') == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.PadRight(10, 'a') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.PadRight(10, 'a') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rpad(a.`Title`, 10, 'a') = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rpad(a.`Title`, 10, 'a') = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rpad(a.`Title`, 10, 'a') = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (rpad(a.`Title`, 10, 'a') = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a__Type.`Name`)
+		}
+		[Fact]
+		public void Trim() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.Trim() == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.Trim('a') == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.Trim('a', 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.Trim('a', 'b', 'c') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(a.`Title`) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim('a' from a.`Title`) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim('b' from trim('a' from a.`Title`)) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (trim('c' from trim('b' from trim('a' from a.`Title`))) = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.Trim() + "aaa").Trim() == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.Trim('a') + "aaa").Trim('a') == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.Trim('a', 'b') + "aaa").Trim('a', 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.Trim('a', 'b', 'c') + "aaa").Trim('a', 'b', 'c') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(concat(trim(a.`Title`), 'aaa')) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim('a' from concat(trim('a' from a.`Title`), 'aaa')) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim('b' from trim('a' from concat(trim('b' from trim('a' from a.`Title`)), 'aaa'))) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (trim('c' from trim('b' from trim('a' from concat(trim('c' from trim('b' from trim('a' from a.`Title`))), 'aaa')))) = a__Type.`Name`)
+		}
+		[Fact]
+		public void TrimStart() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.TrimStart() == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.TrimStart('a') == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.TrimStart('a', 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.TrimStart('a', 'b', 'c') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (ltrim(a.`Title`) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'a' from trim(leading 'a' from a.`Title`)) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))))) = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.TrimStart() + "aaa").TrimStart() == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.TrimStart('a') + "aaa").TrimStart('a') == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.TrimStart('a', 'b') + "aaa").TrimStart('a', 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.TrimStart('a', 'b', 'c') + "aaa").TrimStart('a', 'b', 'c') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (ltrim(concat(ltrim(a.`Title`), 'aaa')) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'a' from trim(leading 'a' from a.`Title`)), 'aaa'))) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))), 'aaa'))))) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))))), 'aaa'))))))) = a__Type.`Name`)
+		}
+		[Fact]
+		public void TrimEnd() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.TrimEnd() == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.TrimEnd('a') == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rtrim(a.`Title`) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'a' from a.`Title`) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'b' from trim(trailing 'a' from a.`Title`)) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from a.`Title`))) = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.TrimEnd() + "aaa").TrimEnd() == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.TrimEnd('a') + "aaa").TrimEnd('a') == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.TrimEnd('a', 'b') + "aaa").TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.TrimEnd('a', 'b', 'c') + "aaa").TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (rtrim(concat(rtrim(a.`Title`), 'aaa')) = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'a' from concat(trim(trailing 'a' from a.`Title`), 'aaa')) = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (trim(trailing 'b' from trim(trailing 'a' from concat(trim(trailing 'b' from trim(trailing 'a' from a.`Title`)), 'aaa'))) = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from concat(trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from a.`Title`))), 'aaa')))) = a__Type.`Name`)
+		}
+		[Fact]
+		public void Replace() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.Replace("a", "b") == "aaa").ToList());
+			data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c") == a.Title).ToList());
+			data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c").Replace("c", "a") == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c").Replace(a.Type.Name, "a") == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (replace(a.`Title`, 'a', 'b') = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (replace(replace(a.`Title`, 'a', 'b'), 'b', 'c') = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'c', 'a') = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), a__Type.`Name`, 'a') = a__Type.`Name`);
+			data.Add(select.Where(a => (a.Title.Replace("a", "b") + "aaa").TrimEnd() == "aaa").ToList());
+			data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c") + "aaa").TrimEnd('a') == a.Title).ToList());
+			data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c").Replace("c", "a") + "aaa").TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+			data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c").Replace(a.Type.Name, "a") + "aaa").TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (concat(replace(a.`Title`, 'a', 'b'), 'aaa') = 'aaa');
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (concat(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'aaa') = a.`Title`);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (concat(replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'c', 'a'), 'aaa') = concat(a.`Title`, 1));
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (concat(replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), a__Type.`Name`, 'a'), 'aaa') = a__Type.`Name`)
+		}
+		[Fact]
+		public void CompareTo() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.Title.CompareTo(a.Title) == 0).ToList());
+			data.Add(select.Where(a => a.Title.CompareTo(a.Title) > 0).ToList());
+			data.Add(select.Where(a => a.Title.CompareTo(a.Title + 1) == 0).ToList());
+			data.Add(select.Where(a => a.Title.CompareTo(a.Title + a.Type.Name) == 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (strcmp(a.`Title`, a.`Title`) = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (strcmp(a.`Title`, a.`Title`) > 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (strcmp(a.`Title`, concat(a.`Title`, 1)) = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (strcmp(a.`Title`, concat(a.`Title`, a__Type.`Name`)) = 0);
+			data.Add(select.Where(a => (a.Title + "aaa").CompareTo("aaa") == 0).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Title) > 0).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Title + 1) == 0).ToList());
+			data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Type.Name) == 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (strcmp(concat(a.`Title`, 'aaa'), 'aaa') = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (strcmp(concat(a.`Title`, 'aaa'), a.`Title`) > 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (strcmp(concat(a.`Title`, 'aaa'), concat(a.`Title`, 1)) = 0);
+
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+			//FROM `tb_topic` a, `TestTypeInfo` a__Type 
+			//WHERE (strcmp(concat(a.`Title`, 'aaa'), a__Type.`Name`) = 0)
+		}
+	}
+}

FreeSql.Tests/PostgreSQL/PostgreSQLExpression/TimeSpanTest.cs

@@ -0,0 +1,260 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQLExpression {
+	public class TimeSpanTest {
+
+		ISelect<Topic> select => g.pgsql.Select<Topic>();
+
+		[Table(Name = "tb_topic")]
+		class Topic {
+			[Column(IsIdentity = true, IsPrimary = true)]
+			public int Id { get; set; }
+			public int Clicks { get; set; }
+			public int TestTypeInfoGuid { get; set; }
+			public TestTypeInfo Type { get; set; }
+			public string Title { get; set; }
+			public DateTime CreateTime { get; set; }
+		}
+		class TestTypeInfo {
+			public int Guid { get; set; }
+			public int ParentId { get; set; }
+			public TestTypeParentInfo Parent { get; set; }
+			public string Name { get; set; }
+		}
+		class TestTypeParentInfo {
+			public int Id { get; set; }
+			public string Name { get; set; }
+
+			public List<TestTypeInfo> Types { get; set; }
+		}
+		[Fact]
+		public void Zero() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay > TimeSpan.Zero).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) > 0)
+		}
+		[Fact]
+		public void MinValue() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay > TimeSpan.MinValue).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) > -922337203685477580)
+		}
+		[Fact]
+		public void MaxValue() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay < TimeSpan.MaxValue).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) < 922337203685477580)
+		}
+		[Fact]
+		public void Days() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Days == 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 86400000000) = 0)
+		}
+		[Fact]
+		public void Hours() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Hours > 0).ToSql());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 3600000000) mod 24 > 0)
+		}
+		[Fact]
+		public void Milliseconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Milliseconds > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 1000 mod 1000) > 0)
+		}
+		[Fact]
+		public void Minutes() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Minutes > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 60000000 mod 60) > 0)
+		}
+		[Fact]
+		public void Seconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Seconds > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 1000000 mod 60) > 0)
+		}
+		[Fact]
+		public void Ticks() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Ticks > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) * 10) > 0)
+		}
+		[Fact]
+		public void TotalDays() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalDays > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 86400000000) > 0)
+		}
+		[Fact]
+		public void TotalHours() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalHours > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 3600000000) > 0)
+		}
+		[Fact]
+		public void TotalMilliseconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalMilliseconds > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 1000) > 0)
+		}
+		[Fact]
+		public void TotalMinutes() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalMinutes > 0).ToSql());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 60000000) > 0)
+		}
+		[Fact]
+		public void TotalSeconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalSeconds > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 1000000) > 0)
+		}
+		[Fact]
+		public void Add() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Add(TimeSpan.FromDays(1)) > TimeSpan.Zero).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) + (1 * 86400000000)) > 0)
+		}
+		[Fact]
+		public void Subtract() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Subtract(TimeSpan.FromDays(1)) > TimeSpan.Zero).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) - (1 * 86400000000)) > 0)
+		}
+		[Fact]
+		public void CompareTo() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.CompareTo(TimeSpan.FromDays(1)) > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) - ((1 * 86400000000))) > 0)
+		}
+		[Fact]
+		public void this_Equals() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.Equals(TimeSpan.FromDays(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+		}
+		[Fact]
+		public void this_ToString() {
+			var data = new List<object>();
+			data.Add(select.Where(a => a.CreateTime.TimeOfDay.ToString() == "ssss").ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') = 'ssss')
+		}
+
+		[Fact]
+		public void TimeSpan_Compare() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Compare(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1)) > 0).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) - ((1 * 86400000000))) > 0)
+		}
+		[Fact]
+		public void TimeSpan_Equals() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+		}
+		[Fact]
+		public void TimeSpan_FromDays() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+		}
+		[Fact]
+		public void TimeSpan_FromHours() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromHours(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 3600000000)))
+		}
+		[Fact]
+		public void TimeSpan_FromMilliseconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromMilliseconds(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 1000)))
+		}
+		[Fact]
+		public void TimeSpan_FromMinutes() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromMinutes(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 60000000)))
+		}
+		[Fact]
+		public void TimeSpan_FromSeconds() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromSeconds(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 1000000)))
+		}
+		[Fact]
+		public void TimeSpan_FromTicks() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromTicks(1))).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 / 10)))
+		}
+		[Fact]
+		public void TimeSpan_Parse() {
+			var data = new List<object>();
+			data.Add(select.Where(a => TimeSpan.Parse(a.CreateTime.TimeOfDay.ToString()) > TimeSpan.Zero).ToList());
+			//SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+			//FROM `tb_topic` a 
+			//WHERE (cast(date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') as signed) > 0)
+		}
+	}
+}

FreeSql.Tests/g.cs

@@ -7,13 +7,17 @@ public class g {
 
 	public static IFreeSql mysql = new FreeSql.FreeSqlBuilder()
 		.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10")
+		.UseAutoSyncStructure()
 		.Build();
 
 	public static IFreeSql sqlserver = new FreeSql.FreeSqlBuilder()
 		.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=cms;Pooling=true;Max Pool Size=10")
+		.UseAutoSyncStructure()
 		.Build();
 
 	public static IFreeSql pgsql = new FreeSql.FreeSqlBuilder()
 		.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=10")
+		.UseAutoSyncStructure()
+		.UseSyncStructureToLower()
 		.Build();
 }

FreeSql/FreeSqlBuilder.cs

@@ -11,6 +11,8 @@ namespace FreeSql {
 		DataType _dataType;
 		string _masterConnectionString;
 		string[] _slaveConnectionString;
+		bool _isAutoSyncStructure = false;
+		bool _isSyncStructureToLower = false;
 
 		/// <summary>
 		/// 使用缓存，不指定默认使用内存
@@ -51,14 +53,35 @@ namespace FreeSql {
 			_slaveConnectionString = slaveConnectionString;
 			return this;
 		}
+		/// <summary>
+		/// 【开发环境必备】自动同步实体结构到数据库，程序运行中检查实体表是否存在，然后创建或修改
+		/// </summary>
+		/// <returns></returns>
+		public FreeSqlBuilder UseAutoSyncStructure() {
+			_isAutoSyncStructure = true;
+			return this;
+		}
+		/// <summary>
+		/// 转小写同步结构
+		/// </summary>
+		/// <returns></returns>
+		public FreeSqlBuilder UseSyncStructureToLower() {
+			_isSyncStructureToLower = true;
+			return this;
+		}
 
 		public IFreeSql Build() {
+			IFreeSql ret = null;
 			switch(_dataType) {
-				case DataType.MySql: return new MySql.MySqlProvider(_cache, null, _masterConnectionString, _slaveConnectionString, _logger);
+				case DataType.MySql: ret = new MySql.MySqlProvider(_cache, null, _masterConnectionString, _slaveConnectionString, _logger); break;
-				case DataType.SqlServer: return new SqlServer.SqlServerProvider(_cache, null, _masterConnectionString, _slaveConnectionString, _logger);
+				case DataType.SqlServer: ret = new SqlServer.SqlServerProvider(_cache, null, _masterConnectionString, _slaveConnectionString, _logger); break;
-				case DataType.PostgreSQL: return new PostgreSQL.PostgreSQLProvider(_cache, null, _masterConnectionString, _slaveConnectionString, _logger);
+				case DataType.PostgreSQL: ret = new PostgreSQL.PostgreSQLProvider(_cache, null, _masterConnectionString, _slaveConnectionString, _logger); break;
 			}
-			return null;
+			if (ret != null) {
+				ret.CodeFirst.IsAutoSyncStructure = _isAutoSyncStructure;
+				ret.CodeFirst.IsSyncStructureToLower = _isSyncStructureToLower;
+			}
+			return ret;
 		}
 	}
 

FreeSql/Interface/ICodeFirst.cs

@@ -8,6 +8,11 @@ namespace FreeSql {
 		/// </summary>
 		bool IsAutoSyncStructure { get; set; }
 
+		/// <summary>
+		/// 转小写同步结构
+		/// </summary>
+		bool IsSyncStructureToLower { get; set; }
+
 		/// <summary>
 		/// 将实体类型与数据库对比，返回DDL语句
 		/// </summary>
@@ -38,6 +43,6 @@ namespace FreeSql {
 		/// </summary>
 		/// <param name="type"></param>
 		/// <returns></returns>
-		(int type, string dbtype, string dbtypeFull, bool? isnullable)? GetDbInfo(Type type);
+		(int type, string dbtype, string dbtypeFull, bool? isnullable, object defaultValue)? GetDbInfo(Type type);
 	}
 }

FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs

@@ -26,7 +26,8 @@ namespace FreeSql.Internal.CommonProvider {
 					switch (expCall.Method.Name) {
 						case "Where": this.InternalWhere(expCall.Arguments[0]); break;
 						case "WhereIf":
-							if (_commonExpression.ExpressionSelectColumn_MemberAccess(null, null, SelectTableInfoType.From, expCall.Arguments[0], false) == "1")
+							var whereIfCond = _commonExpression.ExpressionSelectColumn_MemberAccess(null, null, SelectTableInfoType.From, expCall.Arguments[0], false);
+							if (whereIfCond == "1" || whereIfCond == "'t'")
 								this.InternalWhere(expCall.Arguments[1]);
 							break;
 						case "GroupBy": this.InternalGroupBy(expCall.Arguments[0]); break;

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -66,7 +66,7 @@ namespace FreeSql.Internal.CommonProvider {
 			if (cols.Any() == false) return this;
 			foreach (var col in cols) {
 				if (col.Column.Attribute.IsNullable) {
-					var replval = col.Column.Attribute.DbDefautValue;
+					var replval = _orm.CodeFirst.GetDbInfo(col.Column.CsType.GenericTypeArguments.FirstOrDefault())?.defaultValue;
 					if (replval == null) continue;
 					var replname = _commonUtils.QuoteSqlName(col.Column.Attribute.Name);
 					expt = expt.Replace(replname, _commonUtils.IsNull(replname, _commonUtils.FormatSql("{0}", replval)));

FreeSql/Internal/Utils.cs

@@ -22,8 +22,12 @@ namespace FreeSql.Internal {
 			trytb.Type = entity;
 			trytb.Properties = entity.GetProperties().ToDictionary(a => a.Name, a => a, StringComparer.CurrentCultureIgnoreCase);
 			trytb.CsName = entity.Name;
-			trytb.DbName = tbattr?.Name ?? entity.Name;
+			trytb.DbName = (tbattr?.Name ?? entity.Name);
 			trytb.DbOldName = tbattr?.OldName;
+			if (common.CodeFirst.IsSyncStructureToLower) {
+				trytb.DbName = trytb.DbName.ToLower();
+				trytb.DbOldName = trytb.DbOldName?.ToLower();
+			}
 			trytb.SelectFilter = tbattr?.SelectFilter;
 			foreach (var p in trytb.Properties.Values) {
 				var tp = common.CodeFirst.GetDbInfo(p.PropertyType);
@@ -38,22 +42,23 @@ namespace FreeSql.Internal {
 						IsNullable = tp.Value.isnullable ?? true,
 						IsPrimary = false,
 					};
-				if (string.IsNullOrEmpty(colattr.DbType) == false) colattr.DbType = colattr.DbType.ToUpper();
-				if (tp != null && tp.Value.isnullable == null) colattr.IsNullable = tp.Value.dbtypeFull.Contains("NOT NULL") == false;
-				if (string.IsNullOrEmpty(colattr.DbType) == false) colattr.IsNullable = colattr.DbType.Contains("NOT NULL") == false;
-				if (string.IsNullOrEmpty(colattr.Name)) colattr.Name = p.Name;
 				if (string.IsNullOrEmpty(colattr.DbType)) colattr.DbType = tp?.dbtypeFull ?? "varchar(255)";
+				colattr.DbType = colattr.DbType.ToUpper();
+
+				if (tp != null && tp.Value.isnullable == null) colattr.IsNullable = tp.Value.dbtypeFull.Contains("NOT NULL") == false;
+				if (colattr.DbType?.Contains("NOT NULL") == true) colattr.IsNullable = false;
+				if (string.IsNullOrEmpty(colattr.Name)) colattr.Name = p.Name;
+				if (common.CodeFirst.IsSyncStructureToLower) colattr.Name = colattr.Name.ToLower();
+				
 				if ((colattr.IsNullable == false || colattr.IsIdentity || colattr.IsPrimary) && colattr.DbType.Contains("NOT NULL") == false) colattr.DbType += " NOT NULL";
 				if (colattr.IsNullable == true && colattr.DbType.Contains("NOT NULL")) colattr.DbType = colattr.DbType.Replace("NOT NULL", "");
 				colattr.DbType = Regex.Replace(colattr.DbType, @"\([^\)]+\)", m => Regex.Replace(m.Groups[0].Value, @"\s", ""));
 				colattr.DbDefautValue = trytb.Properties[p.Name].GetValue(Activator.CreateInstance(trytb.Type));
-				if (colattr.DbDefautValue == null && p.PropertyType.FullName == "System.String") colattr.DbDefautValue = string.Empty;
+				if (colattr.DbDefautValue == null) colattr.DbDefautValue = tp?.defaultValue;
-				if (colattr.DbDefautValue == null) {
+				if (colattr.IsNullable == false && colattr.DbDefautValue == null) {
 					var consturctorType = p.PropertyType.GenericTypeArguments.FirstOrDefault() ?? p.PropertyType;
-					if (consturctorType.GetConstructor(new Type[0]) != null) colattr.DbDefautValue = Activator.CreateInstance(consturctorType);
+					colattr.DbDefautValue = Activator.CreateInstance(consturctorType);
 				}
-				if (colattr.DbDefautValue == null) colattr.DbDefautValue = "";
-				if (colattr.DbDefautValue.GetType().FullName == "System.DateTime") colattr.DbDefautValue = new DateTime(1970, 1, 1);
 
 				var col = new ColumnInfo {
 					Table = trytb,

FreeSql/MySql/MySqlAdo/MySqlAdoExtensions.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Reflection;
-
-public static class MySqlAdoExtensions {
-	public static object GetEnum<T>(this IDataReader dr, int index) {
-		string value = dr.GetString(index);
-		Type t = typeof(T);
-		foreach (var f in t.GetFields())
-			if (f.GetCustomAttribute<DescriptionAttribute>()?.Description == value || f.Name == value) return Enum.Parse(t, f.Name);
-		return null;
-	}
-
-	public static string ToDescriptionOrString(this Enum item) {
-		string name = item.ToString();
-		DescriptionAttribute desc = item.GetType().GetField(name)?.GetCustomAttribute<DescriptionAttribute>();
-		return desc?.Description ?? name;
-	}
-	public static long ToInt64(this Enum item) {
-		return Convert.ToInt64(item);
-	}
-	public static IEnumerable<T> ToSet<T>(this long value) {
-		List<T> ret = new List<T>();
-		if (value == 0) return ret;
-		Type t = typeof(T);
-		foreach (FieldInfo f in t.GetFields()) {
-			if (f.FieldType != t) continue;
-			object o = Enum.Parse(t, f.Name);
-			long v = (long) o;
-			if ((value & v) == v) ret.Add((T) o);
-		}
-		return ret;
-	}
-}

FreeSql/MySql/MySqlAdo/MygisTypes.cs

@@ -290,19 +290,3 @@ public class MygisMultiPolygon : MygisGeometry, IEquatable<MygisMultiPolygon>, I
 		return ret;
 	}
 }
-
-public static partial class MygisTypesExtensions {
-	/// <summary>
-	/// 测量两个经纬度的距离，返回单位：米
-	/// </summary>
-	/// <param name="that">经纬坐标1</param>
-	/// <param name="point">经纬坐标2</param>
-	/// <returns>返回距离（单位：米）</returns>
-	public static double Distance(this MygisPoint that, MygisPoint point) {
-		double radLat1 = (double)(that.Y) * Math.PI / 180d;
-		double radLng1 = (double)(that.X) * Math.PI / 180d;
-		double radLat2 = (double)(point.Y) * Math.PI / 180d;
-		double radLng2 = (double)(point.X) * Math.PI / 180d;
-		return 2 * Math.Asin(Math.Sqrt(Math.Pow(Math.Sin((radLat1 - radLat2) / 2), 2) + Math.Cos(radLat1) * Math.Cos(radLat2) * Math.Pow(Math.Sin((radLng1 - radLng2) / 2), 2))) * 6378137;
-	}
-}

FreeSql/MySql/MySqlAdo/MygisTypesExtensions.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Reflection;
+using System.Text;
+
+public static partial class MygisTypesExtensions {
+	/// <summary>
+	/// 测量两个经纬度的距离，返回单位：米
+	/// </summary>
+	/// <param name="that">经纬坐标1</param>
+	/// <param name="point">经纬坐标2</param>
+	/// <returns>返回距离（单位：米）</returns>
+	public static double Distance(this MygisPoint that, MygisPoint point) {
+		double radLat1 = (double)(that.Y) * Math.PI / 180d;
+		double radLng1 = (double)(that.X) * Math.PI / 180d;
+		double radLat2 = (double)(point.Y) * Math.PI / 180d;
+		double radLng2 = (double)(point.X) * Math.PI / 180d;
+		return 2 * Math.Asin(Math.Sqrt(Math.Pow(Math.Sin((radLat1 - radLat2) / 2), 2) + Math.Cos(radLat1) * Math.Cos(radLat2) * Math.Pow(Math.Sin((radLng1 - radLng2) / 2), 2))) * 6378137;
+	}
+
+	/// <summary>
+	/// 测量两个经纬度的距离，返回单位：米
+	/// </summary>
+	/// <param name="that">经纬坐标1</param>
+	/// <param name="point">经纬坐标2</param>
+	/// <returns>返回距离（单位：米）</returns>
+	public static double Distance(this Point that, Point point) {
+		double radLat1 = (double)(that.Y) * Math.PI / 180d;
+		double radLng1 = (double)(that.X) * Math.PI / 180d;
+		double radLat2 = (double)(point.Y) * Math.PI / 180d;
+		double radLng2 = (double)(point.X) * Math.PI / 180d;
+		return 2 * Math.Asin(Math.Sqrt(Math.Pow(Math.Sin((radLat1 - radLat2) / 2), 2) + Math.Cos(radLat1) * Math.Cos(radLat2) * Math.Pow(Math.Sin((radLng1 - radLng2) / 2), 2))) * 6378137;
+	}
+
+	public static object GetEnum<T>(this IDataReader dr, int index) {
+		string value = dr.GetString(index);
+		Type t = typeof(T);
+		foreach (var f in t.GetFields())
+			if (f.GetCustomAttribute<DescriptionAttribute>()?.Description == value || f.Name == value) return Enum.Parse(t, f.Name);
+		return null;
+	}
+
+	public static string ToDescriptionOrString(this Enum item) {
+		string name = item.ToString();
+		var desc = item.GetType().GetField(name)?.GetCustomAttribute<DescriptionAttribute>();
+		return desc?.Description ?? name;
+	}
+	public static long ToInt64(this Enum item) {
+		return Convert.ToInt64(item);
+	}
+	public static IEnumerable<T> ToSet<T>(this long value) {
+		List<T> ret = new List<T>();
+		if (value == 0) return ret;
+		Type t = typeof(T);
+		foreach (FieldInfo f in t.GetFields()) {
+			if (f.FieldType != t) continue;
+			object o = Enum.Parse(t, f.Name);
+			long v = (long)o;
+			if ((value & v) == v) ret.Add((T)o);
+		}
+		return ret;
+	}
+}

FreeSql/MySql/MySqlCodeFirst.cs

@@ -23,57 +23,58 @@ namespace FreeSql.MySql {
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsSyncStructureToLower { get; set; } = false;
 
 		static object _dicCsToDbLock = new object();
-		static Dictionary<string, (MySqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable)> _dicCsToDb = new Dictionary<string, (MySqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable)>() {
+		static Dictionary<string, (MySqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable, object defaultValue)> _dicCsToDb = new Dictionary<string, (MySqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable, object defaultValue)>() {
-				{ typeof(bool).FullName,  (MySqlDbType.Bit, "bit","bit(1) NOT NULL", null, false) },{ typeof(bool?).FullName,  (MySqlDbType.Bit, "bit","bit(1)", null, true) },
+				{ typeof(bool).FullName,  (MySqlDbType.Bit, "bit","bit(1) NOT NULL", null, false, false) },{ typeof(bool?).FullName,  (MySqlDbType.Bit, "bit","bit(1)", null, true, null) },
 
-				{ typeof(sbyte).FullName,  (MySqlDbType.Byte, "tinyint", "tinyint(3) NOT NULL", false, false) },{ typeof(sbyte?).FullName,  (MySqlDbType.Byte, "tinyint", "tinyint(3)", false, true) },
+				{ typeof(sbyte).FullName,  (MySqlDbType.Byte, "tinyint", "tinyint(3) NOT NULL", false, false, 0) },{ typeof(sbyte?).FullName,  (MySqlDbType.Byte, "tinyint", "tinyint(3)", false, true, null) },
-				{ typeof(short).FullName,  (MySqlDbType.Int16, "smallint","smallint(6) NOT NULL", false, false) },{ typeof(short?).FullName,  (MySqlDbType.Int16, "smallint", "smallint(6)", false, true) },
+				{ typeof(short).FullName,  (MySqlDbType.Int16, "smallint","smallint(6) NOT NULL", false, false, 0) },{ typeof(short?).FullName,  (MySqlDbType.Int16, "smallint", "smallint(6)", false, true, null) },
-				{ typeof(int).FullName,  (MySqlDbType.Int32, "int", "int(11) NOT NULL", false, false) },{ typeof(int?).FullName,  (MySqlDbType.Int32, "int", "int(11)", false, true) },
+				{ typeof(int).FullName,  (MySqlDbType.Int32, "int", "int(11) NOT NULL", false, false, 0) },{ typeof(int?).FullName,  (MySqlDbType.Int32, "int", "int(11)", false, true, null) },
-				{ typeof(long).FullName,  (MySqlDbType.Int64, "bigint","bigint(20) NOT NULL", false, false) },{ typeof(long?).FullName,  (MySqlDbType.Int64, "bigint","bigint(20)", false, true) },
+				{ typeof(long).FullName,  (MySqlDbType.Int64, "bigint","bigint(20) NOT NULL", false, false, 0) },{ typeof(long?).FullName,  (MySqlDbType.Int64, "bigint","bigint(20)", false, true, null) },
 
-				{ typeof(byte).FullName,  (MySqlDbType.UByte, "tinyint","tinyint(3) unsigned NOT NULL", true, false) },{ typeof(byte?).FullName,  (MySqlDbType.UByte, "tinyint","tinyint(3) unsigned", true, true) },
+				{ typeof(byte).FullName,  (MySqlDbType.UByte, "tinyint","tinyint(3) unsigned NOT NULL", true, false, 0) },{ typeof(byte?).FullName,  (MySqlDbType.UByte, "tinyint","tinyint(3) unsigned", true, true, null) },
-				{ typeof(ushort).FullName,  (MySqlDbType.UInt16, "smallint","smallint(5) unsigned NOT NULL", true, false) },{ typeof(ushort?).FullName,  (MySqlDbType.UInt16, "smallint", "smallint(5) unsigned", true, true) },
+				{ typeof(ushort).FullName,  (MySqlDbType.UInt16, "smallint","smallint(5) unsigned NOT NULL", true, false, 0) },{ typeof(ushort?).FullName,  (MySqlDbType.UInt16, "smallint", "smallint(5) unsigned", true, true, null) },
-				{ typeof(uint).FullName,  (MySqlDbType.UInt32, "int", "int(10) unsigned NOT NULL", true, false) },{ typeof(uint?).FullName,  (MySqlDbType.UInt32, "int", "int(10) unsigned", true, true) },
+				{ typeof(uint).FullName,  (MySqlDbType.UInt32, "int", "int(10) unsigned NOT NULL", true, false, 0) },{ typeof(uint?).FullName,  (MySqlDbType.UInt32, "int", "int(10) unsigned", true, true, null) },
-				{ typeof(ulong).FullName,  (MySqlDbType.UInt64, "bigint", "bigint(20) unsigned NOT NULL", true, false) },{ typeof(ulong?).FullName,  (MySqlDbType.UInt64, "bigint", "bigint(20) unsigned", true, true) },
+				{ typeof(ulong).FullName,  (MySqlDbType.UInt64, "bigint", "bigint(20) unsigned NOT NULL", true, false, 0) },{ typeof(ulong?).FullName,  (MySqlDbType.UInt64, "bigint", "bigint(20) unsigned", true, true, null) },
 
-				{ typeof(double).FullName,  (MySqlDbType.Double, "double", "double NOT NULL", false, false) },{ typeof(double?).FullName,  (MySqlDbType.Double, "double", "double", false, true) },
+				{ typeof(double).FullName,  (MySqlDbType.Double, "double", "double NOT NULL", false, false, 0) },{ typeof(double?).FullName,  (MySqlDbType.Double, "double", "double", false, true, null) },
-				{ typeof(float).FullName,  (MySqlDbType.Float, "float","float NOT NULL", false, false) },{ typeof(float?).FullName,  (MySqlDbType.Float, "float","float", false, true) },
+				{ typeof(float).FullName,  (MySqlDbType.Float, "float","float NOT NULL", false, false, 0) },{ typeof(float?).FullName,  (MySqlDbType.Float, "float","float", false, true, null) },
-				{ typeof(decimal).FullName,  (MySqlDbType.Decimal, "decimal", "decimal(10,2) NOT NULL", false, false) },{ typeof(decimal?).FullName,  (MySqlDbType.Decimal, "decimal", "decimal(10,2)", false, true) },
+				{ typeof(decimal).FullName,  (MySqlDbType.Decimal, "decimal", "decimal(10,2) NOT NULL", false, false, 0) },{ typeof(decimal?).FullName,  (MySqlDbType.Decimal, "decimal", "decimal(10,2)", false, true, null) },
 
-				{ typeof(TimeSpan).FullName,  (MySqlDbType.Time, "time","time NOT NULL", false, false) },{ typeof(TimeSpan?).FullName,  (MySqlDbType.Time, "time", "time",false, true) },
+				{ typeof(TimeSpan).FullName,  (MySqlDbType.Time, "time","time NOT NULL", false, false, 0) },{ typeof(TimeSpan?).FullName,  (MySqlDbType.Time, "time", "time",false, true, null) },
-				{ typeof(DateTime).FullName,  (MySqlDbType.DateTime, "datetime", "datetime NOT NULL", false, false) },{ typeof(DateTime?).FullName,  (MySqlDbType.DateTime, "datetime", "datetime", false, true) },
+				{ typeof(DateTime).FullName,  (MySqlDbType.DateTime, "datetime", "datetime NOT NULL", false, false, new DateTime(1970,1,1)) },{ typeof(DateTime?).FullName,  (MySqlDbType.DateTime, "datetime", "datetime", false, true, null) },
 
-				{ typeof(byte[]).FullName,  (MySqlDbType.VarBinary, "varbinary", "varbinary(255)", false, null) },
+				{ typeof(byte[]).FullName,  (MySqlDbType.VarBinary, "varbinary", "varbinary(255)", false, null, new byte[0]) },
-				{ typeof(string).FullName,  (MySqlDbType.VarChar, "varchar", "varchar(255)", false, null) },
+				{ typeof(string).FullName,  (MySqlDbType.VarChar, "varchar", "varchar(255)", false, null, "") },
 
-				{ typeof(Guid).FullName,  (MySqlDbType.VarChar, "char", "char(36)", false, false) },{ typeof(Guid?).FullName,  (MySqlDbType.VarChar, "char", "char(36)", false, true) },
+				{ typeof(Guid).FullName,  (MySqlDbType.VarChar, "char", "char(36)", false, false, Guid.Empty) },{ typeof(Guid?).FullName,  (MySqlDbType.VarChar, "char", "char(36)", false, true, null) },
 
-				{ typeof(MygisPoint).FullName,  (MySqlDbType.Geometry, "point", "point", false, null) },
+				{ typeof(MygisPoint).FullName,  (MySqlDbType.Geometry, "point", "point", false, null, new MygisPoint(0, 0)) },
-				{ typeof(MygisLineString).FullName,  (MySqlDbType.Geometry, "linestring", "linestring", false, null) },
+				{ typeof(MygisLineString).FullName,  (MySqlDbType.Geometry, "linestring", "linestring", false, null, new MygisLineString(new[]{new MygisCoordinate2D(),new MygisCoordinate2D()})) },
-				{ typeof(MygisPolygon).FullName,  (MySqlDbType.Geometry, "polygon", "polygon", false, null) },
+				{ typeof(MygisPolygon).FullName,  (MySqlDbType.Geometry, "polygon", "polygon", false, null, new MygisPolygon(new[]{new[]{new MygisCoordinate2D(),new MygisCoordinate2D()},new[]{new MygisCoordinate2D(),new MygisCoordinate2D()}})) },
-				{ typeof(MygisMultiPoint).FullName,  (MySqlDbType.Geometry, "multipoint","multipoint", false, null) },
+				{ typeof(MygisMultiPoint).FullName,  (MySqlDbType.Geometry, "multipoint","multipoint", false, null, new MygisMultiPoint(new[]{new MygisCoordinate2D(),new MygisCoordinate2D()})) },
-				{ typeof(MygisMultiLineString).FullName,  (MySqlDbType.Geometry, "multilinestring","multilinestring", false, null) },
+				{ typeof(MygisMultiLineString).FullName,  (MySqlDbType.Geometry, "multilinestring","multilinestring", false, null, new MygisMultiLineString(new[]{new[]{new MygisCoordinate2D(),new MygisCoordinate2D()},new[]{new MygisCoordinate2D(),new MygisCoordinate2D()}})) },
-				{ typeof(MygisMultiPolygon).FullName,  (MySqlDbType.Geometry, "multipolygon", "multipolygon", false, null) },
+				{ typeof(MygisMultiPolygon).FullName,  (MySqlDbType.Geometry, "multipolygon", "multipolygon", false, null, new MygisMultiPolygon(new[]{new MygisPolygon(new[]{new[]{new MygisCoordinate2D(),new MygisCoordinate2D()},new[]{new MygisCoordinate2D(),new MygisCoordinate2D()}}),new MygisPolygon(new[]{new[]{new MygisCoordinate2D(),new MygisCoordinate2D()},new[]{new MygisCoordinate2D(),new MygisCoordinate2D()}})})) },
 			};
 
-		public (int type, string dbtype, string dbtypeFull, bool? isnullable)? GetDbInfo(Type type) {
+		public (int type, string dbtype, string dbtypeFull, bool? isnullable, object defaultValue)? GetDbInfo(Type type) {
-			if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new (int, string, string, bool?)?(((int)trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable));
+			if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new (int, string, string, bool?, object)?(((int)trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable, trydc.defaultValue));
 			var enumType = type.IsEnum ? type : null;
 			if (enumType == null && type.FullName.StartsWith("System.Nullable`1[") && type.GenericTypeArguments.Length == 1 && type.GenericTypeArguments.First().IsEnum) enumType = type.GenericTypeArguments.First();
 			if (enumType != null) {
 				var names = string.Join(",", Enum.GetNames(enumType).Select(a => _commonUtils.FormatSql("{0}", a)));
 				var newItem = enumType.GetCustomAttributes(typeof(FlagsAttribute), false).Any() ?
-					(MySqlDbType.Set, "set", $"set({names}){(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true) :
+					(MySqlDbType.Set, "set", $"set({names}){(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, Enum.GetValues(enumType).GetValue(0)) :
-					(MySqlDbType.Enum, "enum", $"enum({names}){(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true);
+					(MySqlDbType.Enum, "enum", $"enum({names}){(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, Enum.GetValues(enumType).GetValue(0));
 				if (_dicCsToDb.ContainsKey(type.FullName) == false) {
 					lock (_dicCsToDbLock) {
 						if (_dicCsToDb.ContainsKey(type.FullName) == false)
 							_dicCsToDb.Add(type.FullName, newItem);
 					}
 				}
-				return ((int)newItem.Item1, newItem.Item2, newItem.Item3, newItem.Item5);
+				return ((int)newItem.Item1, newItem.Item2, newItem.Item3, newItem.Item5, newItem.Item6);
 			}
 			return null;
 		}
@@ -218,26 +219,22 @@ where a.table_schema in ({0}) and a.table_name in ({1})".FormatMySql(tboldname ?
 					}
 					sb.Append("\r\n) Engine=InnoDB CHARACTER SET utf8;\r\n");
 					sb.Append("INSERT INTO ").Append(tmptablename).Append(" (");
-					foreach (var tbcol in tb.Columns.Values) {
+					foreach (var tbcol in tb.Columns.Values)
-						if (tbstruct.ContainsKey(tbcol.Attribute.Name) ||
+						sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
-							string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.ContainsKey(tbcol.Attribute.OldName)) { //导入旧表存在的字段
-							sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
-						}
-					}
 					sb.Remove(sb.Length - 2, 2).Append(")\r\nSELECT ");
 					foreach (var tbcol in tb.Columns.Values) {
+						var insertvalue = "NULL";
 						if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) ||
 							string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol)) {
-							var insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
+							insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
 							if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false) {
-								//var tbcoldbtype = tbcol.Attribute.DbType.Split(' ').First();
+								//insertvalue = $"cast({insertvalue} as {tbcol.Attribute.DbType.Split(' ').First()})";
-								//insertvalue = $"cast({insertvalue} as {tbcoldbtype})";
 							}
-							if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable) {
+							if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable)
 								insertvalue = $"ifnull({insertvalue},{_commonUtils.FormatSql("{0}", tbcol.Attribute.DbDefautValue).Replace("'", "''")})";
-							}
+						} else if (tbcol.Attribute.IsNullable == false)
-							sb.Append(insertvalue).Append(", ");
+							insertvalue = _commonUtils.FormatSql("{0}", tbcol.Attribute.DbDefautValue).Replace("'", "''");
-						}
+						sb.Append(insertvalue).Append(", ");
 					}
 					sb.Remove(sb.Length - 2, 2).Append(" FROM ").Append(tablename).Append(";\r\n");
 					sb.Append("DROP TABLE ").Append(tablename).Append(";\r\n");

FreeSql/MySql/MySqlExpression.cs

@@ -173,7 +173,7 @@ namespace FreeSql.MySql {
 
 					case "IsLeapYear":
 						var isLeapYearArgs1 = ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName);
-						return $"(({isLeapYearArgs1})%4=0 AND ({isLeapYearArgs1})%100 <> 0 OR ({isLeapYearArgs1})%400 = 0)";
+						return $"(({isLeapYearArgs1})%4=0 AND ({isLeapYearArgs1})%100<>0 OR ({isLeapYearArgs1})%400=0)";
 
 					case "Parse": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as datetime)";
 					case "ParseExact":

FreeSql/MySql/MySqlUtils.cs

@@ -14,6 +14,7 @@ namespace FreeSql.MySql {
 
 		internal override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, object value) {
 			if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
+			else if (_orm.CodeFirst.IsSyncStructureToLower) parameterName = parameterName.ToLower();
 			MySqlParameter ret = null;
 			if (value == null) ret = new MySqlParameter { ParameterName = $"{parameterName}", Value = DBNull.Value };
 			else {
@@ -42,7 +43,7 @@ namespace FreeSql.MySql {
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatMySql(args);
 		internal override string QuoteSqlName(string name) => $"`{name.Trim('`').Replace(".", "`.`")}`";
-		internal override string QuoteParamterName(string name) => $"?{name}";
+		internal override string QuoteParamterName(string name) => $"?{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"ifnull({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"concat({left}, {right})";
 	}

FreeSql/PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs

@@ -36,13 +36,11 @@ namespace FreeSql.PostgreSQL {
 				return string.Concat("'", ((DateTime)param).ToString("yyyy-MM-dd HH:mm:ss.ffffff"), "'");
 			else if (param is DateTime?)
 				return string.Concat("'", (param as DateTime?).Value.ToString("yyyy-MM-dd HH:mm:ss.ffffff"), "'");
-			else if (param is TimeSpan) {
+			else if (param is TimeSpan)
-				var ts = (TimeSpan)param;
+				return ((TimeSpan)param).Ticks / 10;
-				return string.Concat("'", ts.Ticks > 0 ? "" : "-", ts.TotalHours, dt1970.AddTicks(Math.Abs(ts.Ticks)).ToString(":mm:ss.ffffff"), "'");
+			else if (param is TimeSpan?)
-			} else if (param is TimeSpan) {
+				return (param as TimeSpan?).Value.Ticks / 10;
-				var ts = (param as TimeSpan?).Value;
+			else if (param is IEnumerable) {
-				return string.Concat("'", ts.Ticks > 0 ? "" : "-", ts.TotalHours, dt1970.AddTicks(Math.Abs(ts.Ticks)).ToString(":mm:ss.ffffff"), "'");
-			} else if (param is IEnumerable) {
 				var sb = new StringBuilder();
 				var ie = param as IEnumerable;
 				foreach (var z in ie) sb.Append(",").Append(AddslashesProcessParam(z));

FreeSql/PostgreSQL/PostgreSQLAdo/PostgreSQLTypesExtensions.cs

@@ -1,4 +1,5 @@
-using NpgsqlTypes;
+using Npgsql.LegacyPostgis;
+using NpgsqlTypes;
 using System;
 
 public static partial class PostgreSQLTypesExtensions {
@@ -15,4 +16,18 @@ public static partial class PostgreSQLTypesExtensions {
 		double radLng2 = (double)(point.X) * Math.PI / 180d;
 		return 2 * Math.Asin(Math.Sqrt(Math.Pow(Math.Sin((radLat1 - radLat2) / 2), 2) + Math.Cos(radLat1) * Math.Cos(radLat2) * Math.Pow(Math.Sin((radLng1 - radLng2) / 2), 2))) * 6378137;
 	}
+
+	/// <summary>
+	/// 测量两个经纬度的距离，返回单位：米
+	/// </summary>
+	/// <param name="that">经纬坐标1</param>
+	/// <param name="point">经纬坐标2</param>
+	/// <returns>返回距离（单位：米）</returns>
+	public static double Distance(this PostgisPoint that, PostgisPoint point) {
+		double radLat1 = (double)(that.Y) * Math.PI / 180d;
+		double radLng1 = (double)(that.X) * Math.PI / 180d;
+		double radLat2 = (double)(point.Y) * Math.PI / 180d;
+		double radLng2 = (double)(point.X) * Math.PI / 180d;
+		return 2 * Math.Asin(Math.Sqrt(Math.Pow(Math.Sin((radLat1 - radLat2) / 2), 2) + Math.Cos(radLat1) * Math.Cos(radLat2) * Math.Pow(Math.Sin((radLng1 - radLng2) / 2), 2))) * 6378137;
+	}
 }

FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs

@@ -13,6 +13,7 @@ using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace FreeSql.PostgreSQL {
 
@@ -27,89 +28,91 @@ namespace FreeSql.PostgreSQL {
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsSyncStructureToLower { get; set; } = false;
 
 		static object _dicCsToDbLock = new object();
-		static Dictionary<string, (NpgsqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable)> _dicCsToDb = new Dictionary<string, (NpgsqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable)>() {
+		static Dictionary<string, (NpgsqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable, object defaultValue)> _dicCsToDb = new Dictionary<string, (NpgsqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable, object defaultValue)>() {
 
-				{ typeof(sbyte).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false) },{ typeof(sbyte?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true) },
+				{ typeof(sbyte).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false, 0) },{ typeof(sbyte?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true, null) },
-				{ typeof(short).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false) },{ typeof(short?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true) },
+				{ typeof(short).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false, 0) },{ typeof(short?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true, null) },
-				{ typeof(int).FullName,  (NpgsqlDbType.Integer, "int4","int4 NOT NULL", false, false) },{ typeof(int?).FullName,  (NpgsqlDbType.Integer, "int4", "int4", false, true) },
+				{ typeof(int).FullName,  (NpgsqlDbType.Integer, "int4","int4 NOT NULL", false, false, 0) },{ typeof(int?).FullName,  (NpgsqlDbType.Integer, "int4", "int4", false, true, null) },
-				{ typeof(long).FullName,  (NpgsqlDbType.Bigint, "int8","int8 NOT NULL", false, false) },{ typeof(long?).FullName,  (NpgsqlDbType.Bigint, "int8", "int8", false, true) },
+				{ typeof(long).FullName,  (NpgsqlDbType.Bigint, "int8","int8 NOT NULL", false, false, 0) },{ typeof(long?).FullName,  (NpgsqlDbType.Bigint, "int8", "int8", false, true, null) },
 
-				{ typeof(byte).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false) },{ typeof(byte?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true) },
+				{ typeof(byte).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false, 0) },{ typeof(byte?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true, null) },
-				{ typeof(ushort).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false) },{ typeof(ushort?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true) },
+				{ typeof(ushort).FullName,  (NpgsqlDbType.Smallint, "int2","int2 NOT NULL", false, false, 0) },{ typeof(ushort?).FullName,  (NpgsqlDbType.Smallint, "int2", "int2", false, true, null) },
-				{ typeof(uint).FullName,  (NpgsqlDbType.Integer, "int4","int4 NOT NULL", false, false) },{ typeof(uint?).FullName,  (NpgsqlDbType.Integer, "int4", "int4", false, true) },
+				{ typeof(uint).FullName,  (NpgsqlDbType.Integer, "int4","int4 NOT NULL", false, false, 0) },{ typeof(uint?).FullName,  (NpgsqlDbType.Integer, "int4", "int4", false, true, null) },
-				{ typeof(ulong).FullName,  (NpgsqlDbType.Bigint, "int8","int8 NOT NULL", false, false) },{ typeof(ulong?).FullName,  (NpgsqlDbType.Bigint, "int8", "int8", false, true) },
+				{ typeof(ulong).FullName,  (NpgsqlDbType.Bigint, "int8","int8 NOT NULL", false, false, 0) },{ typeof(ulong?).FullName,  (NpgsqlDbType.Bigint, "int8", "int8", false, true, null) },
 
-				{ typeof(float).FullName,  (NpgsqlDbType.Real, "float4","float4 NOT NULL", false, false) },{ typeof(float?).FullName,  (NpgsqlDbType.Real, "float4", "float4", false, true) },
+				{ typeof(float).FullName,  (NpgsqlDbType.Real, "float4","float4 NOT NULL", false, false, 0) },{ typeof(float?).FullName,  (NpgsqlDbType.Real, "float4", "float4", false, true, null) },
-				{ typeof(double).FullName,  (NpgsqlDbType.Double, "float8","float8 NOT NULL", false, false) },{ typeof(double?).FullName,  (NpgsqlDbType.Double, "float8", "float8", false, true) },
+				{ typeof(double).FullName,  (NpgsqlDbType.Double, "float8","float8 NOT NULL", false, false, 0) },{ typeof(double?).FullName,  (NpgsqlDbType.Double, "float8", "float8", false, true, null) },
-				{ typeof(decimal).FullName,  (NpgsqlDbType.Numeric, "numeric", "numeric(10,2) NOT NULL", false, false) },{ typeof(decimal?).FullName,  (NpgsqlDbType.Numeric, "numeric", "numeric(10,2)", false, true) },
+				{ typeof(decimal).FullName,  (NpgsqlDbType.Numeric, "numeric", "numeric(10,2) NOT NULL", false, false, 0) },{ typeof(decimal?).FullName,  (NpgsqlDbType.Numeric, "numeric", "numeric(10,2)", false, true, null) },
 
-				{ typeof(string).FullName,  (NpgsqlDbType.Varchar, "varchar", "varchar(255)", false, null) },
+				{ typeof(string).FullName,  (NpgsqlDbType.Varchar, "varchar", "varchar(255)", false, null, "") },
 
-				{ typeof(TimeSpan).FullName,  (NpgsqlDbType.Time, "time","time NOT NULL", false, false) },{ typeof(TimeSpan?).FullName,  (NpgsqlDbType.Time, "time", "time",false, true) },
+				{ typeof(TimeSpan).FullName,  (NpgsqlDbType.Time, "time","time NOT NULL", false, false, 0) },{ typeof(TimeSpan?).FullName,  (NpgsqlDbType.Time, "time", "time",false, true, null) },
-				{ typeof(DateTime).FullName,  (NpgsqlDbType.Timestamp, "timestamp", "timestamp NOT NULL", false, false) },{ typeof(DateTime?).FullName,  (NpgsqlDbType.Timestamp, "timestamp", "timestamp", false, true) },
+				{ typeof(DateTime).FullName,  (NpgsqlDbType.Timestamp, "timestamp", "timestamp NOT NULL", false, false, new DateTime(1970,1,1)) },{ typeof(DateTime?).FullName,  (NpgsqlDbType.Timestamp, "timestamp", "timestamp", false, true, null) },
 
-				{ typeof(bool).FullName,  (NpgsqlDbType.Boolean, "bool","bool NOT NULL", null, false) },{ typeof(bool?).FullName,  (NpgsqlDbType.Bit, "bool","bool", null, true) },
+				{ typeof(bool).FullName,  (NpgsqlDbType.Boolean, "bool","bool NOT NULL", null, false, false) },{ typeof(bool?).FullName,  (NpgsqlDbType.Bit, "bool","bool", null, true, null) },
-				{ typeof(Byte[]).FullName,  (NpgsqlDbType.Bytea, "bytea", "bytea", false, null) },
+				{ typeof(Byte[]).FullName,  (NpgsqlDbType.Bytea, "bytea", "bytea", false, null, new byte[0]) },
-				{ typeof(BitArray).FullName,  (NpgsqlDbType.Varbit, "varbit", "varbit(64)", false, null) },
+				{ typeof(BitArray).FullName,  (NpgsqlDbType.Varbit, "varbit", "varbit(64)", false, null, new BitArray(new byte[64])) },
 
-				{ typeof(NpgsqlPoint).FullName,  (NpgsqlDbType.Point, "point", "point NOT NULL", false, false) },{ typeof(NpgsqlPoint?).FullName,  (NpgsqlDbType.Point, "point", "point", false, true) },
+				{ typeof(NpgsqlPoint).FullName,  (NpgsqlDbType.Point, "point", "point NOT NULL", false, false, new NpgsqlPoint()) },{ typeof(NpgsqlPoint?).FullName,  (NpgsqlDbType.Point, "point", "point", false, true, null) },
-				{ typeof(NpgsqlLine).FullName,  (NpgsqlDbType.Line, "line", "line NOT NULL", false, false) },{ typeof(NpgsqlLine?).FullName,  (NpgsqlDbType.Line, "line", "line", false, true) },
+				{ typeof(NpgsqlLine).FullName,  (NpgsqlDbType.Line, "line", "line NOT NULL", false, false, new NpgsqlLine()) },{ typeof(NpgsqlLine?).FullName,  (NpgsqlDbType.Line, "line", "line", false, true, null) },
-				{ typeof(NpgsqlLSeg).FullName,  (NpgsqlDbType.LSeg, "lseg", "lseg NOT NULL", false, false) },{ typeof(NpgsqlLSeg?).FullName,  (NpgsqlDbType.LSeg, "lseg", "lseg", false, true) },
+				{ typeof(NpgsqlLSeg).FullName,  (NpgsqlDbType.LSeg, "lseg", "lseg NOT NULL", false, false, new NpgsqlLSeg()) },{ typeof(NpgsqlLSeg?).FullName,  (NpgsqlDbType.LSeg, "lseg", "lseg", false, true, null) },
-				{ typeof(NpgsqlBox).FullName,  (NpgsqlDbType.Box, "box", "box NOT NULL", false, false) },{ typeof(NpgsqlBox?).FullName,  (NpgsqlDbType.Box, "box", "box", false, true) },
+				{ typeof(NpgsqlBox).FullName,  (NpgsqlDbType.Box, "box", "box NOT NULL", false, false, new NpgsqlBox()) },{ typeof(NpgsqlBox?).FullName,  (NpgsqlDbType.Box, "box", "box", false, true, null) },
-				{ typeof(NpgsqlPath).FullName,  (NpgsqlDbType.Path, "path", "path NOT NULL", false, false) },{ typeof(NpgsqlPath?).FullName,  (NpgsqlDbType.Path, "path", "path", false, true) },
+				{ typeof(NpgsqlPath).FullName,  (NpgsqlDbType.Path, "path", "path NOT NULL", false, false, new NpgsqlPath()) },{ typeof(NpgsqlPath?).FullName,  (NpgsqlDbType.Path, "path", "path", false, true, null) },
-				{ typeof(NpgsqlPolygon).FullName,  (NpgsqlDbType.Polygon, "polygon", "polygon NOT NULL", false, false) },{ typeof(NpgsqlPolygon?).FullName,  (NpgsqlDbType.Polygon, "polygon", "polygon", false, true) },
+				{ typeof(NpgsqlPolygon).FullName,  (NpgsqlDbType.Polygon, "polygon", "polygon NOT NULL", false, false, new NpgsqlPolygon()) },{ typeof(NpgsqlPolygon?).FullName,  (NpgsqlDbType.Polygon, "polygon", "polygon", false, true, null) },
-				{ typeof(NpgsqlCircle).FullName,  (NpgsqlDbType.Circle, "circle", "circle NOT NULL", false, false) },{ typeof(NpgsqlCircle?).FullName,  (NpgsqlDbType.Circle, "circle", "circle", false, true) },
+				{ typeof(NpgsqlCircle).FullName,  (NpgsqlDbType.Circle, "circle", "circle NOT NULL", false, false, new NpgsqlCircle()) },{ typeof(NpgsqlCircle?).FullName,  (NpgsqlDbType.Circle, "circle", "circle", false, true, null) },
 
-				{ typeof((IPAddress Address, int Subnet)).FullName,  (NpgsqlDbType.Cidr, "cidr", "cidr NOT NULL", false, false) },{ typeof((IPAddress Address, int Subnet)?).FullName,  (NpgsqlDbType.Cidr, "cidr", "cidr", false, true) },
+				{ typeof((IPAddress Address, int Subnet)).FullName,  (NpgsqlDbType.Cidr, "cidr", "cidr NOT NULL", false, false, (IPAddress.None, 0)) },{ typeof((IPAddress Address, int Subnet)?).FullName,  (NpgsqlDbType.Cidr, "cidr", "cidr", false, true, null) },
-				{ typeof(IPAddress).FullName,  (NpgsqlDbType.Inet, "inet", "inet", false, null) },
+				{ typeof(IPAddress).FullName,  (NpgsqlDbType.Inet, "inet", "inet", false, null, IPAddress.None) },
-				{ typeof(PhysicalAddress).FullName,  (NpgsqlDbType.MacAddr, "macaddr", "macaddr", false, null) },
+				{ typeof(PhysicalAddress).FullName,  (NpgsqlDbType.MacAddr, "macaddr", "macaddr", false, null, PhysicalAddress.None) },
 
-				{ typeof(JToken).FullName,  (NpgsqlDbType.Jsonb, "jsonb", "jsonb", false, null) },
+				{ typeof(JToken).FullName,  (NpgsqlDbType.Jsonb, "jsonb", "jsonb", false, null, JToken.Parse("{}")) },
-				{ typeof(JObject).FullName,  (NpgsqlDbType.Jsonb, "jsonb", "jsonb", false, null) },
+				{ typeof(JObject).FullName,  (NpgsqlDbType.Jsonb, "jsonb", "jsonb", false, null, JObject.Parse("{}")) },
-				{ typeof(JArray).FullName,  (NpgsqlDbType.Jsonb, "jsonb", "jsonb", false, null) },
+				{ typeof(JArray).FullName,  (NpgsqlDbType.Jsonb, "jsonb", "jsonb", false, null, JArray.Parse("[]")) },
-				{ typeof(Guid).FullName,  (NpgsqlDbType.Uuid, "uuid", "uuid NOT NULL", false, false) },{ typeof(Guid?).FullName,  (NpgsqlDbType.Uuid, "uuid", "uuid", false, true) },
+				{ typeof(Guid).FullName,  (NpgsqlDbType.Uuid, "uuid", "uuid NOT NULL", false, false, Guid.Empty) },{ typeof(Guid?).FullName,  (NpgsqlDbType.Uuid, "uuid", "uuid", false, true, null) },
 
-				{ typeof(NpgsqlRange<int>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Integer, "int4range", "int4range NOT NULL", false, false) },{ typeof(NpgsqlRange<int>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Integer, "int4range", "int4range", false, true) },
+				{ typeof(NpgsqlRange<int>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Integer, "int4range", "int4range NOT NULL", false, false, NpgsqlRange<int>.Empty) },{ typeof(NpgsqlRange<int>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Integer, "int4range", "int4range", false, true, null) },
-				{ typeof(NpgsqlRange<long>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Bigint, "int8range", "int8range NOT NULL", false, false) },{ typeof(NpgsqlRange<long>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Bigint, "int8range", "int8range", false, true) },
+				{ typeof(NpgsqlRange<long>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Bigint, "int8range", "int8range NOT NULL", false, false, NpgsqlRange<long>.Empty) },{ typeof(NpgsqlRange<long>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Bigint, "int8range", "int8range", false, true, null) },
-				{ typeof(NpgsqlRange<decimal>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Numeric, "numrange", "numrange NOT NULL", false, false) },{ typeof(NpgsqlRange<decimal>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Numeric, "numrange", "numrange", false, true) },
+				{ typeof(NpgsqlRange<decimal>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Numeric, "numrange", "numrange NOT NULL", false, false, NpgsqlRange<decimal>.Empty) },{ typeof(NpgsqlRange<decimal>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Numeric, "numrange", "numrange", false, true, null) },
-				{ typeof(NpgsqlRange<DateTime>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Timestamp, "tsrange", "tsrange NOT NULL", false, false) },{ typeof(NpgsqlRange<DateTime>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Timestamp, "tsrange", "tsrange", false, true) },
+				{ typeof(NpgsqlRange<DateTime>).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Timestamp, "tsrange", "tsrange NOT NULL", false, false, NpgsqlRange<DateTime>.Empty) },{ typeof(NpgsqlRange<DateTime>?).FullName,  (NpgsqlDbType.Range | NpgsqlDbType.Timestamp, "tsrange", "tsrange", false, true, null) },
 
-				{ typeof(Dictionary<string, string>).FullName,  (NpgsqlDbType.Hstore, "hstore", "hstore", false, null) },
+				{ typeof(Dictionary<string, string>).FullName,  (NpgsqlDbType.Hstore, "hstore", "hstore", false, null, new Dictionary<string, string>()) },
-				{ typeof(PostgisPoint).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisPoint).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisPoint(0, 0)) },
-				{ typeof(PostgisLineString).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisLineString).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisLineString(new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) })) },
-				{ typeof(PostgisPolygon).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisPolygon).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisPolygon(new []{new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) }, new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) } })) },
-				{ typeof(PostgisMultiPoint).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisMultiPoint).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisMultiPoint(new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) })) },
-				{ typeof(PostgisMultiLineString).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisMultiLineString).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisMultiLineString(new[]{new PostgisLineString(new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) }),new PostgisLineString(new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) }) })) },
-				{ typeof(PostgisMultiPolygon).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisMultiPolygon).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisMultiPolygon(new[]{new PostgisPolygon(new []{new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) }, new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) } }),new PostgisPolygon(new []{new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) }, new []{new Coordinate2D(0, 0),new Coordinate2D(0, 0) } }) })) },
-				{ typeof(PostgisGeometry).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisGeometry).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisPoint(0, 0)) },
-				{ typeof(PostgisGeometryCollection).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null) },
+				{ typeof(PostgisGeometryCollection).FullName,  (NpgsqlDbType.Geometry, "geometry", "geometry", false, null, new PostgisGeometryCollection(new[]{new PostgisPoint(0, 0),new PostgisPoint(0, 0) })) },
 			};
 
-		public (int type, string dbtype, string dbtypeFull, bool? isnullable)? GetDbInfo(Type type) {
+		public (int type, string dbtype, string dbtypeFull, bool? isnullable, object defaultValue)? GetDbInfo(Type type) {
-			var elementType = type.IsArray ? type.GetElementType() : type;
+			var isarray = type.FullName != "System.Byte[]" && type.IsArray;
+			var elementType = isarray ? type.GetElementType() : type;
 			var info = GetDbInfoNoneArray(elementType);
 			if (info == null) return null;
-			if (type.IsArray == false) return ((int)info.Value.type, info.Value.dbtype, info.Value.dbtypeFull, info.Value.isnullable);
+			if (isarray == false) return ((int)info.Value.type, info.Value.dbtype, info.Value.dbtypeFull, info.Value.isnullable, info.Value.defaultValue);
-			var dbype = $"{info.Value.dbtype}[]";
+			var dbtypefull = Regex.Replace(info.Value.dbtypeFull, $@"{info.Value.dbtype}(\s*\([^\)]+\))?", "$0[]");
-			return ((int)(info.Value.type | NpgsqlDbType.Array), dbype, info.Value.dbtypeFull.Replace(info.Value.dbtype, dbype), info.Value.isnullable);
+			return ((int)(info.Value.type | NpgsqlDbType.Array), $"{info.Value.dbtype}[]", dbtypefull, info.Value.isnullable, Array.CreateInstance(elementType, 0));
 		}
-		(NpgsqlDbType type, string dbtype, string dbtypeFull, bool? isnullable)? GetDbInfoNoneArray(Type type) {
+		(NpgsqlDbType type, string dbtype, string dbtypeFull, bool? isnullable, object defaultValue)? GetDbInfoNoneArray(Type type) {
-			if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new (NpgsqlDbType, string, string, bool?)?((trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable));
+			if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new (NpgsqlDbType, string, string, bool?, object)?((trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable, trydc.defaultValue));
 			var enumType = type.IsEnum ? type : null;
 			if (enumType == null && type.FullName.StartsWith("System.Nullable`1[") && type.GenericTypeArguments.Length == 1 && type.GenericTypeArguments.First().IsEnum) enumType = type.GenericTypeArguments.First();
 			if (enumType != null) {
 				var newItem = enumType.GetCustomAttributes(typeof(FlagsAttribute), false).Any() ?
-					(NpgsqlDbType.Bigint, "int8", $"int8{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true) :
+					(NpgsqlDbType.Bigint, "int8", $"int8{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, Enum.GetValues(enumType).GetValue(0)) :
-					(NpgsqlDbType.Integer, "int4", $"int4{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true);
+					(NpgsqlDbType.Integer, "int4", $"int4{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, Enum.GetValues(enumType).GetValue(0));
 				if (_dicCsToDb.ContainsKey(type.FullName) == false) {
 					lock (_dicCsToDbLock) {
 						if (_dicCsToDb.ContainsKey(type.FullName) == false)
 							_dicCsToDb.Add(type.FullName, newItem);
 					}
 				}
-				return (newItem.Item1, newItem.Item2, newItem.Item3, newItem.Item5);
+				return (newItem.Item1, newItem.Item2, newItem.Item3, newItem.Item5, newItem.Item6);
 			}
 			return null;
 		}
@@ -143,7 +146,7 @@ namespace FreeSql.PostgreSQL {
 						//创建表
 						sb.Append("CREATE TABLE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" (");
 						foreach (var tbcol in tb.Columns.Values) {
-							sb.Append(" \r\n  ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType.ToUpper()).Append(",");
+							sb.Append(" \r\n  ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType).Append(",");
 							if (tbcol.Attribute.IsIdentity) seqcols.Add((tbcol, tbname, true));
 						}
 						if (tb.Primarys.Any() == false)
@@ -171,7 +174,7 @@ namespace FreeSql.PostgreSQL {
 a.attname,
 t.typname,
 case when a.atttypmod > 0 and a.atttypmod < 32767 then a.atttypmod - 4 else a.attlen end len,
-case when t.typelem = 0 then t.typname else t2.typname end,
+case when t.typelem > 0 and t.typinput::varchar = 'array_in' then t2.typname else t.typname end,
 case when a.attnotnull then '0' else '1' end as is_nullable,
 e.adsrc,
 a.attndims
@@ -185,34 +188,51 @@ inner join pg_namespace ns on ns.oid = c.relnamespace
 inner join pg_namespace ns2 on ns2.oid = t.typnamespace
 where ns.nspname = {0} and c.relname = {1}".FormatPostgreSQL(tboldname ?? tbname);
 				var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
-				var tbstruct = ds.ToDictionary(a => string.Concat(a[0]), a => new {
+				var tbstruct = ds.ToDictionary(a => string.Concat(a[0]), a => {
-					column = string.Concat(a[0]),
+					var attndims = int.Parse(string.Concat(a[6]));
-					sqlType = string.Concat(a[3], long.Parse(string.Concat(a[6])) > 0 ? "[]" : ""),
+					var type = string.Concat(a[1]);
-					max_length = long.Parse(string.Concat(a[2])),
+					var sqlType = string.Concat(a[3]);
-					is_nullable = string.Concat(a[4]) == "1",
+					var max_length = long.Parse(string.Concat(a[2]));
-					is_identity = string.Concat(a[5]).StartsWith(@"nextval('") && string.Concat(a[5]).EndsWith(@"'::regclass)"),
+					switch (sqlType) {
-					attndims = long.Parse(string.Concat(a[6]))
+						case "bool": case "name": case "bit": case "varbit": case "bpchar": case "varchar": case "bytea": case "text": case "uuid": break;
-				}, StringComparer.CurrentCultureIgnoreCase);
+						default: max_length *= 8; break;
+					}
+					if (type.StartsWith("_")) {
+						type = type.Substring(1);
+						if (attndims == 0) attndims++;
+					}
+					if (sqlType.StartsWith("_")) sqlType = sqlType.Substring(1);
+					return new {
+						column = string.Concat(a[0]),
+						sqlType = string.Concat(sqlType),
+						max_length = long.Parse(string.Concat(a[2])),
+						is_nullable = string.Concat(a[4]) == "1",
+						is_identity = string.Concat(a[5]).StartsWith(@"nextval('") && string.Concat(a[5]).EndsWith(@"'::regclass)"),
+						attndims
+					};
+					}, StringComparer.CurrentCultureIgnoreCase);
 
 				if (istmpatler == false) {
 					foreach (var tbcol in tb.Columns.Values) {
 						if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) ||
 							string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol)) {
 							if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false ||
-								tbcol.Attribute.IsNullable != tbstructcol.is_nullable) {
+								tbcol.Attribute.DbType.Contains("[]") != (tbstructcol.attndims > 0))
-								sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ALTER COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(" TYPE ").Append(tbcol.Attribute.DbType.ToUpper()).Append(";\r\n");
+								sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ALTER COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(" TYPE ").Append(tbcol.Attribute.DbType.Split(' ').First()).Append(";\r\n");
-								break;
+							if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable)
-							}
+								sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ALTER COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(" ").Append(tbcol.Attribute.IsNullable ? "DROP" : "SET").Append(" NOT NULL;\r\n");
-							if (tbcol.Attribute.IsIdentity != tbstructcol.is_identity) seqcols.Add((tbcol, tbname, tbcol.Attribute.IsIdentity));
+							if (tbcol.Attribute.IsIdentity != tbstructcol.is_identity)
-							if (tbstructcol.column == tbcol.Attribute.OldName) {
+								seqcols.Add((tbcol, tbname, tbcol.Attribute.IsIdentity));
+							if (tbstructcol.column == tbcol.Attribute.OldName)
 								//修改列名
 								sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" RENAME COLUMN ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.OldName)).Append(" TO ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(";\r\n");
-							}
 							continue;
 						}
 						//添加列
-						sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ADD COLUMN ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType.ToUpper()).Append(";\r\n");
+						sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ADD COLUMN ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType.Split(' ').First()).Append(";\r\n");
-						if (tbcol.Attribute.IsIdentity != tbstructcol.is_identity) seqcols.Add((tbcol, tbname, tbcol.Attribute.IsIdentity));
+						sbalter.Append("UPDATE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" SET ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(_commonUtils.FormatSql(" = {0};\r\n", tbcol.Attribute.DbDefautValue));
+						if (tbcol.Attribute.IsNullable == false) sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ALTER COLUMN ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" SET NOT NULL;\r\n");
+						if (tbcol.Attribute.IsIdentity) seqcols.Add((tbcol, tbname, tbcol.Attribute.IsIdentity));
 					}
 				}
 				if (istmpatler == false) {
@@ -225,7 +245,7 @@ where ns.nspname = {0} and c.relname = {1}".FormatPostgreSQL(tboldname ?? tbname
 				//创建临时表
 				sb.Append("CREATE TABLE IF NOT EXISTS ").Append(tmptablename).Append(" (");
 				foreach (var tbcol in tb.Columns.Values) {
-					sb.Append(" \r\n  ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType.ToUpper()).Append(",");
+					sb.Append(" \r\n  ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType).Append(",");
 					if (tbcol.Attribute.IsIdentity) seqcols.Add((tbcol, tbname, true));
 				}
 				if (tb.Primarys.Any() == false)
@@ -237,26 +257,21 @@ where ns.nspname = {0} and c.relname = {1}".FormatPostgreSQL(tboldname ?? tbname
 				}
 				sb.Append("\r\n) WITH (OIDS=FALSE);\r\n");
 				sb.Append("INSERT INTO ").Append(tmptablename).Append(" (");
-				foreach (var tbcol in tb.Columns.Values) {
+				foreach (var tbcol in tb.Columns.Values)
-					if (tbstruct.ContainsKey(tbcol.Attribute.Name) ||
+					sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
-						string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.ContainsKey(tbcol.Attribute.OldName)) { //导入旧表存在的字段
-						sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
-					}
-				}
 				sb.Remove(sb.Length - 2, 2).Append(")\r\nSELECT ");
 				foreach (var tbcol in tb.Columns.Values) {
+					var insertvalue = "NULL";
 					if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) ||
 						string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol)) {
-						var insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
+						insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
-						if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false) {
+						if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false)
-							var tbcoldbtype = tbcol.Attribute.DbType.Split(' ').First();
+							insertvalue = $"cast({insertvalue} as {tbcol.Attribute.DbType.Split(' ').First()})";
-							insertvalue = $"cast({insertvalue} as {tbcoldbtype})";
+						if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable)
-						}
+							insertvalue = $"coalesce({insertvalue},{_commonUtils.FormatSql("{0}", tbcol.Attribute.DbDefautValue).Replace("'", "''")})";
-						if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable) {
+					} else if (tbcol.Attribute.IsNullable == false)
-							insertvalue = $"ifnull({insertvalue},{_commonUtils.FormatSql("{0}", tbcol.Attribute.DbDefautValue).Replace("'", "''")})";
+						insertvalue = _commonUtils.FormatSql("{0}", tbcol.Attribute.DbDefautValue).Replace("'", "''");
-						}
+					sb.Append(insertvalue).Append(", ");
-						sb.Append(insertvalue).Append(", ");
-					}
 				}
 				sb.Remove(sb.Length - 2, 2).Append(" FROM ").Append(tablename).Append(";\r\n");
 				sb.Append("DROP TABLE ").Append(tablename).Append(";\r\n");

FreeSql/PostgreSQL/PostgreSQLExpression.cs

@@ -11,11 +11,17 @@ namespace FreeSql.PostgreSQL {
 		public PostgreSQLExpression(CommonUtils common) : base(common) { }
 
 		internal override string ExpressionLambdaToSqlMemberAccessString(MemberExpression exp, List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, SelectTableInfoType tbtype, bool isQuoteName) {
+			if (exp.Expression == null) {
+				switch (exp.Member.Name) {
+					case "Empty": return "''";
+				}
+				return null;
+			}
 			var left = ExpressionLambdaToSql(exp.Expression, _tables, _selectColumnMap, tbtype, isQuoteName);
 			switch (exp.Member.Name) {
 				case "Length": return $"char_length({left})";
 			}
-			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");
+			return null;
 		}
 		internal override string ExpressionLambdaToSqlMemberAccessDateTime(MemberExpression exp, List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, SelectTableInfoType tbtype, bool isQuoteName) {
 			if (exp.Expression == null) {
@@ -23,10 +29,15 @@ namespace FreeSql.PostgreSQL {
 					case "Now": return "current_timestamp";
 					case "UtcNow": return "(current_timestamp at time zone 'UTC')";
 					case "Today": return "current_date";
+					case "MinValue": return "'0001/1/1 0:00:00'::timestamp";
+					case "MaxValue": return "'9999/12/31 23:59:59'::timestamp";
 				}
+				return null;
 			}
 			var left = ExpressionLambdaToSql(exp.Expression, _tables, _selectColumnMap, tbtype, isQuoteName);
 			switch (exp.Member.Name) {
+				case "Date": return $"({left})::date";
+				case "TimeOfDay": return $"(extract(epoch from ({left})::time)*1000000)";
 				case "DayOfWeek": return $"extract(dow from ({left})::timestamp)";
 				case "Day": return $"extract(day from ({left})::timestamp)";
 				case "DayOfYear": return $"extract(doy from ({left})::timestamp)";
@@ -35,27 +46,35 @@ namespace FreeSql.PostgreSQL {
 				case "Hour": return $"extract(hour from ({left})::timestamp)";
 				case "Minute": return $"extract(minute from ({left})::timestamp)";
 				case "Second": return $"extract(second from ({left})::timestamp)";
-				case "Millisecond": return $"(extract(milliseconds from ({left})::timestamp) - extract(second from ({left})::timestamp) * 1000)";
+				case "Millisecond": return $"(extract(milliseconds from ({left})::timestamp)-extract(second from ({left})::timestamp)*1000)";
-				case "Ticks": return $"(extract(epoch from ({left})::timestamp) * 10000000 + 621355968000000000)";
+				case "Ticks": return $"(extract(epoch from ({left})::timestamp)*10000000+621355968000000000)";
 			}
-			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");
+			return null;
 		}
 		internal override string ExpressionLambdaToSqlMemberAccessTimeSpan(MemberExpression exp, List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, SelectTableInfoType tbtype, bool isQuoteName) {
+			if (exp.Expression == null) {
+				switch (exp.Member.Name) {
+					case "Zero": return "0";
+					case "MinValue": return "-922337203685477580"; //微秒 Ticks / 10
+					case "MaxValue": return "922337203685477580";
+				}
+				return null;
+			}
 			var left = ExpressionLambdaToSql(exp.Expression, _tables, _selectColumnMap, tbtype, isQuoteName);
 			switch (exp.Member.Name) {
-				case "Days": return $"floor(extract(epoch from ({left})::interval) / {60 * 60 * 24})";
+				case "Days": return $"floor(({left})/{(long)1000000 * 60 * 60 * 24})";
-				case "Hours": return $"extract(hour from ({left})::interval)";
+				case "Hours": return $"floor(({left})/{(long)1000000 * 60 * 60}%24)";
-				case "Milliseconds": return $"(extract(milliseconds from ({left})::interval) - extract(second from ({left})::interval) * 1000)";
+				case "Milliseconds": return $"(floor(({left})/1000)::int8%1000)";
-				case "Minutes": return $"extract(minute from ({left})::interval)";
+				case "Minutes": return $"(floor(({left})/{(long)1000000 * 60})::int8%60)";
-				case "Seconds": return $"extract(second from ({left})::interval)";
+				case "Seconds": return $"(floor(({left})/1000000)::int8%60)";
-				case "Ticks": return $"(extract(epoch from ({left})::interval) * 10000000)";
+				case "Ticks": return $"(({left})*10)";
-				case "TotalDays": return $"floor(extract(epoch from ({left})::interval) / {60 * 60 * 24})";
+				case "TotalDays": return $"(({left})/{(long)1000000 * 60 * 60 * 24})";
-				case "TotalHours": return $"floor(extract(epoch from ({left})::interval) / {60 * 60})";
+				case "TotalHours": return $"(({left})/{(long)1000000 * 60 * 60})";
-				case "TotalMilliseconds": return $"(epoch from ({left})::interval + extract(milliseconds from ({left})::interval) - extract(second from ({left})::interval) * 1000)";
+				case "TotalMilliseconds": return $"(({left})/1000)";
-				case "TotalMinutes": return $"floor(extract(epoch from ({left})::interval) / 60)";
+				case "TotalMinutes": return $"(({left})/{(long)1000000 * 60})";
-				case "TotalSeconds": return $"extract(epoch from ({left})::interval)";
+				case "TotalSeconds": return $"(({left})/1000000)";
 			}
-			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");
+			return null;
 		}
 
 		internal override string ExpressionLambdaToSqlCallString(MethodCallExpression exp, List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, SelectTableInfoType tbtype, bool isQuoteName) {
@@ -80,10 +99,10 @@ namespace FreeSql.PostgreSQL {
 				case "Substring":
 					var substrArgs1 = ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName);
 					if (long.TryParse(substrArgs1, out var testtrylng1)) substrArgs1 = (testtrylng1 + 1).ToString();
-					else substrArgs1 += " + 1";
+					else substrArgs1 += "+1";
 					if (exp.Arguments.Count == 1) return $"substr({left}, {substrArgs1})";
 					return $"substr({left}, {substrArgs1}, {ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)})";
-				case "IndexOf": return $"(strpos({left}, {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)}) - 1)";
+				case "IndexOf": return $"(strpos({left}, {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})-1)";
 				case "PadLeft":
 					if (exp.Arguments.Count == 1) return $"lpad({left}, {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})";
 					return $"lpad({left}, {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)}, {ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)})";
@@ -98,7 +117,8 @@ namespace FreeSql.PostgreSQL {
 						if (exp.Method.Name == "TrimStart") return $"ltrim({left})";
 						if (exp.Method.Name == "TrimEnd") return $"rtrim({left})";
 					}
-					var trimArg = "";
+					var trimArg1 = "";
+					var trimArg2 = "";
 					foreach (var argsTrim02 in exp.Arguments) {
 						var argsTrim01s = new[] { argsTrim02 };
 						if (argsTrim02.NodeType == ExpressionType.NewArrayInit) {
@@ -106,17 +126,18 @@ namespace FreeSql.PostgreSQL {
 							argsTrim01s = arritem.Expressions.ToArray();
 						}
 						foreach (var argsTrim01 in argsTrim01s) {
-							var trimChr = ExpressionLambdaToSql(argsTrim01, _tables, _selectColumnMap, tbtype, isQuoteName).Trim('"');
+							var trimChr = ExpressionLambdaToSql(argsTrim01, _tables, _selectColumnMap, tbtype, isQuoteName).Trim('\'');
-							if (trimChr.Length == 1) trimArg += trimChr;
+							if (trimChr.Length == 1) trimArg1 += trimChr;
-							else trimArg += $" || ({trimArg})";
+							else trimArg2 += $" || ({trimChr})";
 						}
 					}
-					if (exp.Method.Name == "Trim") left = $"trim({left}, {trimArg})";
+					if (exp.Method.Name == "Trim") left = $"trim({left}, {_common.FormatSql("{0}", trimArg1)}{trimArg2})";
-					if (exp.Method.Name == "TrimStart") left = $"ltrim({left}, {trimArg})";
+					if (exp.Method.Name == "TrimStart") left = $"ltrim({left}, {_common.FormatSql("{0}", trimArg1)}{trimArg2})";
-					if (exp.Method.Name == "TrimEnd") left = $"rtrim({left}, {trimArg})";
+					if (exp.Method.Name == "TrimEnd") left = $"rtrim({left}, {_common.FormatSql("{0}", trimArg1)}{trimArg2})";
 					return left;
 				case "Replace": return $"replace({left}, {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)}, {ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)})";
-				case "CompareTo": return $"strcmp({left}, {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})";
+				case "CompareTo": return $"case when {left} = {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} then 0 when {left} > {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} then 1 else -1 end";
+				case "Equals": return $"({left} = ({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::varchar)";
 			}
 			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");
 		}
@@ -146,54 +167,94 @@ namespace FreeSql.PostgreSQL {
 			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");
 		}
 		internal override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, SelectTableInfoType tbtype, bool isQuoteName) {
-			var left = ExpressionLambdaToSql(exp.Object, _tables, _selectColumnMap, tbtype, isQuoteName);
+			if (exp.Object == null) {
-			var args1 = ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName);
+				switch (exp.Method.Name) {
-			switch (exp.Method.Name) {
+					case "Compare": return $"extract(epoch from ({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp-({ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp)";
-				case "Add": return $"(({left})::timestamp + ({args1})::interval)";
+					case "DaysInMonth": return $"extract(day from ({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} || '-' || {ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)} || '-01')::timestamp+'1 month'::interval-'1 day'::interval)";
-				case "AddDays": return $"(({left})::timestamp + (({args1}) || ' day')::interval)";
+					case "Equals": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp = ({ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp)";
-				case "AddHours": return $"(({left})::timestamp + (({args1}) || ' hour')::interval)";
+
-				case "AddMilliseconds": return $"(({left})::timestamp + (({args1}) || ' milliseconds')::interval)";
+					case "IsLeapYear":
-				case "AddMinutes": return $"(({left})::timestamp + (({args1}) || ' minute')::interval)";
+						var isLeapYearArgs1 = ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName);
-				case "AddMonths": return $"(({left})::timestamp + (({args1}) || ' month')::interval)";
+						return $"(({isLeapYearArgs1})::int8%4=0 AND ({isLeapYearArgs1})::int8%100<>0 OR ({isLeapYearArgs1})::int8%400=0)";
-				case "AddSeconds": return $"(({left})::timestamp + (({args1}) || ' second')::interval)";
+
-				case "AddTicks": return $"(({left})::timestamp + (({args1}) / 10 || ' microseconds')::interval)";
+					case "Parse": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp";
-				case "AddYears": return $"(({left})::timestamp + (({args1}) || ' year')::interval)";
+					case "ParseExact":
-				case "Subtract":
+					case "TryParse":
-					if (exp.Arguments[0].Type.FullName == "System.DateTime" || exp.Arguments[0].Type.GenericTypeArguments.FirstOrDefault()?.FullName == "System.DateTime")
+					case "TryParseExact": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp";
-						return $"(({left})::timestamp - ({args1})::timestamp)";
+				}
-					if (exp.Arguments[0].Type.FullName == "System.TimeSpan" || exp.Arguments[0].Type.GenericTypeArguments.FirstOrDefault()?.FullName == "System.TimeSpan")
+			} else {
-						return $"(({left})::timestamp - ({args1})::interval)";
+				var left = ExpressionLambdaToSql(exp.Object, _tables, _selectColumnMap, tbtype, isQuoteName);
-					break;
+				var args1 = exp.Arguments.Count == 0 ? null : ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName);
+				switch (exp.Method.Name) {
+					case "Add": return $"(({left})::timestamp+(({args1})||' microseconds')::interval)";
+					case "AddDays": return $"(({left})::timestamp+(({args1})||' day')::interval)";
+					case "AddHours": return $"(({left})::timestamp+(({args1})||' hour')::interval)";
+					case "AddMilliseconds": return $"(({left})::timestamp+(({args1})||' milliseconds')::interval)";
+					case "AddMinutes": return $"(({left})::timestamp+(({args1})||' minute')::interval)";
+					case "AddMonths": return $"(({left})::timestamp+(({args1})||' month')::interval)";
+					case "AddSeconds": return $"(({left})::timestamp+(({args1})||' second')::interval)";
+					case "AddTicks": return $"(({left})::timestamp+(({args1})/10||' microseconds')::interval)";
+					case "AddYears": return $"(({left})::timestamp+(({args1})||' year')::interval)";
+					case "Subtract":
+						if (exp.Arguments[0].Type.FullName == "System.DateTime" || exp.Arguments[0].Type.GenericTypeArguments.FirstOrDefault()?.FullName == "System.DateTime")
+							return $"(extract(epoch from ({left})::timestamp-({args1})::timestamp)*1000000)";
+						if (exp.Arguments[0].Type.FullName == "System.TimeSpan" || exp.Arguments[0].Type.GenericTypeArguments.FirstOrDefault()?.FullName == "System.TimeSpan")
+							return $"(({left})::timestamp-(({args1})||' microseconds')::interval)";
+						break;
+					case "Equals": return $"({left} = ({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp)";
+					case "CompareTo": return $"extract(epoch from ({left})::timestamp-({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp)";
+					case "ToString": return $"to_char({left}, 'YYYY-MM-DD HH24:MI:SS.US')";
+				}
 			}
 			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");
 		}
 		internal override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, SelectTableInfoType tbtype, bool isQuoteName) {
-			var left = ExpressionLambdaToSql(exp.Object, _tables, _selectColumnMap, tbtype, isQuoteName);
+			if (exp.Object == null) {
-			var args1 = ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName);
+				switch (exp.Method.Name) {
-			switch (exp.Method.Name) {
+					case "Compare": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)}-({ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)}))";
-				case "Add": return $"(({left})::interval + ({args1})::interval)";
+					case "Equals": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} = {ExpressionLambdaToSql(exp.Arguments[1], _tables, _selectColumnMap, tbtype, isQuoteName)})";
-				case "Subtract": return $"(({left})::interval - ({args1})::interval)";
+					case "FromDays": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})*{(long)1000000 * 60 * 60 * 24})";
+					case "FromHours": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})*{(long)1000000 * 60 * 60})";
+					case "FromMilliseconds": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})*1000)";
+					case "FromMinutes": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})*{(long)1000000 * 60})";
+					case "FromSeconds": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})*1000000)";
+					case "FromTicks": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})/10)";
+					case "Parse": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int8";
+					case "ParseExact":
+					case "TryParse":
+					case "TryParseExact": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int8";
+				}
+			} else {
+				var left = ExpressionLambdaToSql(exp.Object, _tables, _selectColumnMap, tbtype, isQuoteName);
+				var args1 = exp.Arguments.Count == 0 ? null : ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName);
+				switch (exp.Method.Name) {
+					case "Add": return $"({left}+{args1})";
+					case "Subtract": return $"({left}-({args1}))";
+					case "Equals": return $"({left} = {ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})";
+					case "CompareTo": return $"({left}-({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)}))";
+					case "ToString": return $"({left})::varchar";
+				}
 			}
 			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");
 		}
 		internal override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, SelectTableInfoType tbtype, bool isQuoteName) {
 			if (exp.Object == null) {
 				switch (exp.Method.Name) {
-					case "ToBoolean": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} not in ('0','false'))";
+					case "ToBoolean": return $"(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::varchar not in ('0','false','f','no'))";
-					case "ToByte": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as unsigned)";
+					case "ToByte": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int2";
-					case "ToChar": return $"substr(cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as char), 1, 1)";
+					case "ToChar": return $"substr(({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::char, 1, 1)";
-					case "ToDateTime": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as datetime)";
+					case "ToDateTime": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::timestamp";
-					case "ToDecimal": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as decimal(36,18))";
+					case "ToDecimal": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::numeric";
-					case "ToDouble": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as decimal(32,16))";
+					case "ToDouble": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::float8";
-					case "ToInt16":
+					case "ToInt16": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int2";
-					case "ToInt32":
+					case "ToInt32": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int4";
-					case "ToInt64":
+					case "ToInt64": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int8";
-					case "ToSByte": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as signed)";
+					case "ToSByte": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int2";
-					case "ToSingle": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as decimal(14,7))";
+					case "ToSingle": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::float4";
-					case "ToString": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as char)";
+					case "ToString": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::varchar";
-					case "ToUInt16":
+					case "ToUInt16": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int2";
-					case "ToUInt32":
+					case "ToUInt32": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int4";
-					case "ToUInt64": return $"cast({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)} as unsigned)";
+					case "ToUInt64": return $"({ExpressionLambdaToSql(exp.Arguments[0], _tables, _selectColumnMap, tbtype, isQuoteName)})::int8";
 				}
 			}
 			throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析");

FreeSql/PostgreSQL/PostgreSQLUtils.cs

@@ -16,6 +16,7 @@ namespace FreeSql.PostgreSQL {
 
 		internal override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, object value) {
 			if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
+			else if (_orm.CodeFirst.IsSyncStructureToLower) parameterName = parameterName.ToLower();
 			NpgsqlParameter ret = null;
 			if (value == null) ret = new NpgsqlParameter { ParameterName = $"{parameterName}", Value = DBNull.Value };
 			else {
@@ -52,7 +53,7 @@ namespace FreeSql.PostgreSQL {
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatPostgreSQL(args);
 		internal override string QuoteSqlName(string name) => $"\"{name.Trim('"').Replace(".", "\".\"")}\"";
-		internal override string QuoteParamterName(string name) => $"@{name}";
+		internal override string QuoteParamterName(string name) => $"@{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"coalesce({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"{left} || {right}";
 	}

FreeSql/SqlServer/SqlServerCodeFirst.cs

@@ -22,50 +22,51 @@ namespace FreeSql.SqlServer {
 		}
 
 		public bool IsAutoSyncStructure { get; set; } = true;
+		public bool IsSyncStructureToLower { get; set; } = false;
 
 		static object _dicCsToDbLock = new object();
-		static Dictionary<string, (SqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable)> _dicCsToDb = new Dictionary<string, (SqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable)>() {
+		static Dictionary<string, (SqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable, object defaultValue)> _dicCsToDb = new Dictionary<string, (SqlDbType type, string dbtype, string dbtypeFull, bool? isUnsigned, bool? isnullable, object defaultValue)>() {
-				{ typeof(bool).FullName,  (SqlDbType.Bit, "bit","bit NOT NULL", null, false) },{ typeof(bool?).FullName,  (SqlDbType.Bit, "bit","bit", null, true) },
+				{ typeof(bool).FullName,  (SqlDbType.Bit, "bit","bit NOT NULL", null, false, false) },{ typeof(bool?).FullName,  (SqlDbType.Bit, "bit","bit", null, true, null) },
 
-				{ typeof(sbyte).FullName,  (SqlDbType.TinyInt, "tinyint", "tinyint NOT NULL", false, false) },{ typeof(sbyte?).FullName,  (SqlDbType.TinyInt, "tinyint", "tinyint", false, true) },
+				{ typeof(sbyte).FullName,  (SqlDbType.TinyInt, "tinyint", "tinyint NOT NULL", false, false, 0) },{ typeof(sbyte?).FullName,  (SqlDbType.TinyInt, "tinyint", "tinyint", false, true, null) },
-				{ typeof(short).FullName,  (SqlDbType.SmallInt, "smallint","smallint NOT NULL", false, false) },{ typeof(short?).FullName,  (SqlDbType.SmallInt, "smallint", "smallint", false, true) },
+				{ typeof(short).FullName,  (SqlDbType.SmallInt, "smallint","smallint NOT NULL", false, false, 0) },{ typeof(short?).FullName,  (SqlDbType.SmallInt, "smallint", "smallint", false, true, null) },
-				{ typeof(int).FullName,  (SqlDbType.Int, "int", "int NOT NULL", false, false) },{ typeof(int?).FullName,  (SqlDbType.Int, "int", "int", false, true) },
+				{ typeof(int).FullName,  (SqlDbType.Int, "int", "int NOT NULL", false, false, 0) },{ typeof(int?).FullName,  (SqlDbType.Int, "int", "int", false, true, null) },
-				{ typeof(long).FullName,  (SqlDbType.BigInt, "bigint","bigint NOT NULL", false, false) },{ typeof(long?).FullName,  (SqlDbType.BigInt, "bigint","bigint", false, true) },
+				{ typeof(long).FullName,  (SqlDbType.BigInt, "bigint","bigint NOT NULL", false, false, 0) },{ typeof(long?).FullName,  (SqlDbType.BigInt, "bigint","bigint", false, true, null) },
 
-				{ typeof(byte).FullName,  (SqlDbType.TinyInt, "tinyint","tinyint NOT NULL", true, false) },{ typeof(byte?).FullName,  (SqlDbType.TinyInt, "tinyint","tinyint", true, true) },
+				{ typeof(byte).FullName,  (SqlDbType.TinyInt, "tinyint","tinyint NOT NULL", true, false, 0) },{ typeof(byte?).FullName,  (SqlDbType.TinyInt, "tinyint","tinyint", true, true, null) },
-				{ typeof(ushort).FullName,  (SqlDbType.SmallInt, "smallint","smallint NOT NULL", true, false) },{ typeof(ushort?).FullName,  (SqlDbType.SmallInt, "smallint", "smallint", true, true) },
+				{ typeof(ushort).FullName,  (SqlDbType.SmallInt, "smallint","smallint NOT NULL", true, false, 0) },{ typeof(ushort?).FullName,  (SqlDbType.SmallInt, "smallint", "smallint", true, true, null) },
-				{ typeof(uint).FullName,  (SqlDbType.Int, "int", "int NOT NULL", true, false) },{ typeof(uint?).FullName,  (SqlDbType.Int, "int", "int", true, true) },
+				{ typeof(uint).FullName,  (SqlDbType.Int, "int", "int NOT NULL", true, false, 0) },{ typeof(uint?).FullName,  (SqlDbType.Int, "int", "int", true, true, null) },
-				{ typeof(ulong).FullName,  (SqlDbType.BigInt, "bigint", "bigint NOT NULL", true, false) },{ typeof(ulong?).FullName,  (SqlDbType.BigInt, "bigint", "bigint", true, true) },
+				{ typeof(ulong).FullName,  (SqlDbType.BigInt, "bigint", "bigint NOT NULL", true, false, 0) },{ typeof(ulong?).FullName,  (SqlDbType.BigInt, "bigint", "bigint", true, true, null) },
 
-				{ typeof(double).FullName,  (SqlDbType.Float, "float", "float NOT NULL", false, false) },{ typeof(double?).FullName,  (SqlDbType.Float, "float", "float", false, true) },
+				{ typeof(double).FullName,  (SqlDbType.Float, "float", "float NOT NULL", false, false, 0) },{ typeof(double?).FullName,  (SqlDbType.Float, "float", "float", false, true, null) },
-				{ typeof(float).FullName,  (SqlDbType.Real, "real","real NOT NULL", false, false) },{ typeof(float?).FullName,  (SqlDbType.Real, "real","real", false, true) },
+				{ typeof(float).FullName,  (SqlDbType.Real, "real","real NOT NULL", false, false, 0) },{ typeof(float?).FullName,  (SqlDbType.Real, "real","real", false, true, null) },
-				{ typeof(decimal).FullName,  (SqlDbType.Decimal, "decimal", "decimal(10,2) NOT NULL", false, false) },{ typeof(decimal?).FullName,  (SqlDbType.Decimal, "decimal", "decimal(10,2)", false, true) },
+				{ typeof(decimal).FullName,  (SqlDbType.Decimal, "decimal", "decimal(10,2) NOT NULL", false, false, 0) },{ typeof(decimal?).FullName,  (SqlDbType.Decimal, "decimal", "decimal(10,2)", false, true, null) },
 
-				{ typeof(TimeSpan).FullName,  (SqlDbType.Time, "time","time NOT NULL", false, false) },{ typeof(TimeSpan?).FullName,  (SqlDbType.Time, "time", "time",false, true) },
+				{ typeof(TimeSpan).FullName,  (SqlDbType.Time, "time","time NOT NULL", false, false, 0) },{ typeof(TimeSpan?).FullName,  (SqlDbType.Time, "time", "time",false, true, null) },
-				{ typeof(DateTime).FullName,  (SqlDbType.DateTime, "datetime", "datetime NOT NULL", false, false) },{ typeof(DateTime?).FullName,  (SqlDbType.DateTime, "datetime", "datetime", false, true) },
+				{ typeof(DateTime).FullName,  (SqlDbType.DateTime, "datetime", "datetime NOT NULL", false, false, new DateTime(1970,1,1)) },{ typeof(DateTime?).FullName,  (SqlDbType.DateTime, "datetime", "datetime", false, true, null) },
-				{ typeof(DateTimeOffset).FullName,  (SqlDbType.DateTimeOffset, "datetimeoffset", "datetimeoffset NOT NULL", false, false) },{ typeof(DateTimeOffset?).FullName,  (SqlDbType.DateTimeOffset, "datetimeoffset", "datetimeoffset", false, true) },
+				{ typeof(DateTimeOffset).FullName,  (SqlDbType.DateTimeOffset, "datetimeoffset", "datetimeoffset NOT NULL", false, false, new DateTimeOffset(new DateTime(1970,1,1), TimeSpan.Zero)) },{ typeof(DateTimeOffset?).FullName,  (SqlDbType.DateTimeOffset, "datetimeoffset", "datetimeoffset", false, true, null) },
 
-				{ typeof(byte[]).FullName,  (SqlDbType.VarBinary, "varbinary", "varbinary(255)", false, null) },
+				{ typeof(byte[]).FullName,  (SqlDbType.VarBinary, "varbinary", "varbinary(255)", false, null, new byte[0]) },
-				{ typeof(string).FullName,  (SqlDbType.NVarChar, "nvarchar", "nvarchar(255)", false, null) },
+				{ typeof(string).FullName,  (SqlDbType.NVarChar, "nvarchar", "nvarchar(255)", false, null, "") },
 
-				{ typeof(Guid).FullName,  (SqlDbType.UniqueIdentifier, "uniqueidentifier", "uniqueidentifier NOT NULL", false, false) },{ typeof(Guid?).FullName,  (SqlDbType.UniqueIdentifier, "uniqueidentifier", "uniqueidentifier", false, true) },
+				{ typeof(Guid).FullName,  (SqlDbType.UniqueIdentifier, "uniqueidentifier", "uniqueidentifier NOT NULL", false, false, Guid.Empty) },{ typeof(Guid?).FullName,  (SqlDbType.UniqueIdentifier, "uniqueidentifier", "uniqueidentifier", false, true, null) },
 			};
 
-		public (int type, string dbtype, string dbtypeFull, bool? isnullable)? GetDbInfo(Type type) {
+		public (int type, string dbtype, string dbtypeFull, bool? isnullable, object defaultValue)? GetDbInfo(Type type) {
-			if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new (int, string, string, bool?)?(((int)trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable));
+			if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new (int, string, string, bool?, object)?(((int)trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable, trydc.defaultValue));
 			var enumType = type.IsEnum ? type : null;
 			if (enumType == null && type.FullName.StartsWith("System.Nullable`1[") && type.GenericTypeArguments.Length == 1 && type.GenericTypeArguments.First().IsEnum) enumType = type.GenericTypeArguments.First();
 			if (enumType != null) {
 				var newItem = enumType.GetCustomAttributes(typeof(FlagsAttribute), false).Any() ?
-					(SqlDbType.BigInt, "bigint", $"bigint{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true) :
+					(SqlDbType.BigInt, "bigint", $"bigint{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, Enum.GetValues(enumType).GetValue(0)) :
-					(SqlDbType.Int, "int", $"int{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true);
+					(SqlDbType.Int, "int", $"int{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, Enum.GetValues(enumType).GetValue(0));
 				if (_dicCsToDb.ContainsKey(type.FullName) == false) {
 					lock (_dicCsToDbLock) {
 						if (_dicCsToDb.ContainsKey(type.FullName) == false)
 							_dicCsToDb.Add(type.FullName, newItem);
 					}
 				}
-				return ((int)newItem.Item1, newItem.Item2, newItem.Item3, newItem.Item5);
+				return ((int)newItem.Item1, newItem.Item2, newItem.Item3, newItem.Item5, newItem.Item6);
 			}
 			return null;
 		}
@@ -186,9 +187,10 @@ use " + database, tboldname ?? tbname);
 							//添加列
 							sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}.{tbname[2]}")).Append(" ADD ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType);
 							if (tbcol.Attribute.IsIdentity && tbcol.Attribute.DbType.IndexOf("identity", StringComparison.CurrentCultureIgnoreCase) == -1) sbalter.Append(" identity(1,1)");
-							var addcoldbdefault = tb.Properties[tbcol.CsName].GetValue(Activator.CreateInstance(tb.Type));
+							if (tbcol.Attribute.IsNullable == false) {
-							if (tbcol.Attribute.IsNullable == false) addcoldbdefault = tbcol.Attribute.DbDefautValue;
+								var addcoldbdefault = tbcol.Attribute.DbDefautValue;
-							if (addcoldbdefault != null) sbalter.Append(_commonUtils.FormatSql(" default({0})", addcoldbdefault));
+								if (addcoldbdefault != null) sbalter.Append(_commonUtils.FormatSql(" default({0})", addcoldbdefault));
+							}
 							sbalter.Append(";\r\n");
 						}
 					}
@@ -225,26 +227,21 @@ use " + database, tboldname ?? tbname);
 					if (idents) sb.Append("SET IDENTITY_INSERT ").Append(tmptablename).Append(" ON;\r\n");
 					sb.Append("IF EXISTS(SELECT 1 FROM ").Append(tablename).Append(")\r\n");
 					sb.Append("\tEXEC('INSERT INTO ").Append(tmptablename).Append(" (");
-					foreach (var tbcol in tb.Columns.Values) {
+					foreach (var tbcol in tb.Columns.Values)
-						if (tbstruct.ContainsKey(tbcol.Attribute.Name) ||
+						sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
-							string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.ContainsKey(tbcol.Attribute.OldName)) { //导入旧表存在的字段
-							sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
-						}
-					}
 					sb.Remove(sb.Length - 2, 2).Append(")\r\n\t\tSELECT ");
 					foreach (var tbcol in tb.Columns.Values) {
+						var insertvalue = "NULL";
 						if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) ||
 							string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol)) {
-							var insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
+							insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
-							if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false) {
+							if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false)
-								var tbcoldbtype = tbcol.Attribute.DbType.Split(' ').First();
+								insertvalue = $"cast({insertvalue} as {tbcol.Attribute.DbType.Split(' ').First()})";
-								insertvalue = $"cast({insertvalue} as {tbcoldbtype})";
+							if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable)
-							}
-							if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable) {
 								insertvalue = $"isnull({insertvalue},{_commonUtils.FormatSql("{0}", tbcol.Attribute.DbDefautValue).Replace("'", "''")})";
-							}
+						} else if (tbcol.Attribute.IsNullable == false)
-							sb.Append(insertvalue).Append(", ");
+							insertvalue = _commonUtils.FormatSql("{0}", tbcol.Attribute.DbDefautValue).Replace("'", "''");
-						}
+						sb.Append(insertvalue).Append(", ");
 					}
 					sb.Remove(sb.Length - 2, 2).Append(" FROM ").Append(tablename).Append(" WITH (HOLDLOCK TABLOCKX)');\r\n");
 					if (idents) sb.Append("SET IDENTITY_INSERT ").Append(tmptablename).Append(" OFF;\r\n");

FreeSql/SqlServer/SqlServerUtils.cs

@@ -15,6 +15,7 @@ namespace FreeSql.SqlServer {
 
 		internal override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, object value) {
 			if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
+			else if (_orm.CodeFirst.IsSyncStructureToLower) parameterName = parameterName.ToLower();
 			SqlParameter ret = null;
 			if (value == null) ret = new SqlParameter { ParameterName = $"{parameterName}", Value = DBNull.Value };
 			else {
@@ -43,7 +44,7 @@ namespace FreeSql.SqlServer {
 
 		internal override string FormatSql(string sql, params object[] args) => sql?.FormatSqlServer(args);
 		internal override string QuoteSqlName(string name) => $"[{name.TrimStart('[').TrimEnd(']').Replace(".", "].[")}]";
-		internal override string QuoteParamterName(string name) => $"@{name}";
+		internal override string QuoteParamterName(string name) => $"@{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
 		internal override string IsNull(string sql, object value) => $"isnull({sql}, {value})";
 		internal override string StringConcat(string left, string right, Type leftType, Type rightType) => $"{(leftType.FullName == "System.String" ? left : $"cast({left} as nvarchar)")} + {(rightType.FullName == "System.String" ? right : $"cast({right} as nvarchar)")}";
 	}