SqlServer 单元测试 Curd 走通

FreeSql.Tests/MySql/Curd/MySqlSelectTest.cs

@@ -343,9 +343,9 @@ namespace FreeSql.Tests.MySql {
 			query2.ToList();
 
 			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
-			query = select.Where("a.clicks > 100 && a.id = ?id", new { id = 10 });
+			query = select.Where("a.clicks > 100 and a.id = ?id", new { id = 10 });
 			sql = query.ToSql().Replace("\r\n", "");
-			Assert.Equal("SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a WHERE (a.clicks > 100 && a.id = ?id)", sql);
+			Assert.Equal("SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a WHERE (a.clicks > 100 and a.id = ?id)", sql);
 			query.ToList();
 		}
 		[Fact]
@@ -390,9 +390,9 @@ namespace FreeSql.Tests.MySql {
 			query2.ToList();
 
 			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
-			query = select.WhereIf(true, "a.clicks > 100 && a.id = ?id", new { id = 10 });
+			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` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a WHERE (a.clicks > 100 && a.id = ?id)", sql);
+			Assert.Equal("SELECT a.`Id` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a WHERE (a.clicks > 100 and a.id = ?id)", sql);
 			query.ToList();
 
 			// ==========================================WhereIf(false)
@@ -437,7 +437,7 @@ namespace FreeSql.Tests.MySql {
 			query2.ToList();
 
 			//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>㲻<EFBFBD><E3B2BB>
-			query = select.WhereIf(false, "a.clicks > 100 && a.id = ?id", new { id = 10 });
+			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` as1, a.`Clicks` as2, a.`TestTypeInfoGuid` as3, a.`Title` as4, a.`CreateTime` as5 FROM `tb_topic` a", sql);
 			query.ToList();

FreeSql.Tests/SqlServer/Curd/SqlServerDeleteTest.cs

@@ -0,0 +1,73 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqlServer {
+	public class SqlServerDeleteTest {
+
+		IDelete<Topic> delete => g.sqlserver.Delete<Topic>(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+		[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.sqlserver.Delete<Topic>().ToSql());
+			var sql = g.sqlserver.Delete<Topic>(new[] { 1, 2 }).ToSql();
+			Assert.Equal("DELETE FROM [tb_topic] WHERE ([Id] = 1 OR [Id] = 2)", sql);
+
+			sql = g.sqlserver.Delete<Topic>(new Topic { Id = 1, Title = "test" }).ToSql();
+			Assert.Equal("DELETE FROM [tb_topic] WHERE ([Id] = 1)", sql);
+
+			sql = g.sqlserver.Delete<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).ToSql();
+			Assert.Equal("DELETE FROM [tb_topic] WHERE ([Id] = 1 OR [Id] = 2)", sql);
+
+			sql = g.sqlserver.Delete<Topic>(new { id = 1 }).ToSql();
+			Assert.Equal("DELETE FROM [tb_topic] 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] WHERE ([Id] = 1)", sql);
+
+			sql = delete.Where("id = ?id", new { id = 1 }).ToSql().Replace("\r\n", "");
+			Assert.Equal("DELETE FROM [tb_topic] 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] 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] 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.sqlserver.Insert<Topic>(new Topic { Title = "xxxx", CreateTime = DateTime.Now }).ExecuteIdentity();
+			Assert.Equal(1, delete.Where(a => a.Id == id).ExecuteAffrows());
+		}
+		[Fact]
+		public void ExecuteDeleted() {
+
+			var item = g.sqlserver.Insert<Topic>(new Topic { Title = "xxxx", CreateTime = DateTime.Now }).ExecuteInserted();
+			Assert.Equal(item[0].Id, delete.Where(a => a.Id == item[0].Id).ExecuteDeleted()[0].Id);
+		}
+	}
+}

FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs

@@ -0,0 +1,85 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqlServer {
+	public class SqlServerInsertTest {
+
+		IInsert<Topic> insert => g.sqlserver.Insert<Topic>(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+		[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 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, CreateTime = DateTime.Now });
+
+			var sql = insert.AppendData(items.First()).ToSql();
+			Assert.Equal("INSERT INTO [tb_topic]([Clicks], [Title], [CreateTime]) VALUES(@Clicks0, @Title0, @CreateTime0)", sql);
+
+			sql = insert.AppendData(items).ToSql();
+			Assert.Equal("INSERT INTO [tb_topic]([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]([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]([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, CreateTime = DateTime.Now });
+
+			var sql = insert.AppendData(items).InsertColumns(a => a.Title).ToSql();
+			Assert.Equal("INSERT INTO [tb_topic]([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]([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, CreateTime = DateTime.Now });
+
+			var sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).ToSql();
+			Assert.Equal("INSERT INTO [tb_topic]([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]([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, CreateTime = DateTime.Now });
+
+			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, CreateTime = DateTime.Now });
+
+			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, CreateTime = DateTime.Now });
+
+			var items2 = insert.AppendData(items).ExecuteInserted();
+		}
+	}
+}

FreeSql.Tests/SqlServer/Curd/SqlServerSelectTest.cs

@@ -0,0 +1,501 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqlServer {
+	public class SqlServerSelectTest {
+
+		ISelect<Topic> select => g.sqlserver.Select<Topic>();
+
+		[Table(Name = "tb_topic22")]
+		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() {
+		}
+		[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.sqlserver.Cache.Get("testcaching");
+			Assert.NotNull(testcaching1);
+			var result2 = select.Where(a => 1 == 1).Caching(20, "testcaching").ToList();
+			var testcaching2 = g.sqlserver.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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] 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_topic22] 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] 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_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] 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_topic22] 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] 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_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] 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_topic22] 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] 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_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] 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_topic22] 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] 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_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] 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_topic22] 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] 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_topic22] 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] 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_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, b.[Guid] as4, b.[ParentId] as5, b.[Name] as6, a.[Title] as7, a.[CreateTime] as8 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] a", sql);
+			query.ToList();
+
+			query = select.WhereIf(false, a => a.Type.Name == "typeTitle");
+			sql = query.ToSql().Replace("\r\n", "");
+			Assert.Equal("SELECT a.[Id] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] 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] as1, a.[Clicks] as2, a.[TestTypeInfoGuid] as3, a.[Title] as4, a.[CreateTime] as5 FROM [tb_topic22] a", sql);
+			query.ToList();
+		}
+		[Fact]
+		public void WhereLike() {
+			//ģ<><C4A3><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF>WhereLike(a => a.Title, "%sql")
+			var query = select.Where(a => a.Title.StartsWith("ss")).Where(a => a.Type.Name.Contains("sss"));
+			var sql = query.ToSql().Replace("\r\n", "");
+
+			query = select.Where(a => a.Title.EndsWith("ss"));
+			sql = query.ToSql().Replace("\r\n", "");
+
+			query = select.Where(a => a.Title.Contains("ss"));
+			sql = query.ToSql().Replace("\r\n", "");
+
+			query = select.WhereLike(a => a.Title, "%ss");
+			sql = query.ToSql().Replace("\r\n", "");
+
+			query = select.WhereLike(a => a.Title, "%ss").WhereLike(a => a.Title, "%aa");
+			sql = query.ToSql().Replace("\r\n", "");
+
+			//ģ<><C4A3><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD> OR<4F><52>WhereLike(a => new[] { a.Title, a.Content }, "%sql%")
+			query = select.WhereLike(a => new[] { a.Title, a.Type.Name, a.Type.Parent.Name }, "%aa");
+			sql = query.ToSql().Replace("\r\n", "");
+		}
+		[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/SqlServer/Curd/SqlServerUpdateTest.cs

@@ -0,0 +1,107 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace FreeSql.Tests.SqlServer {
+	public class SqlServerUpdateTest {
+		IUpdate<Topic> update => g.sqlserver.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.sqlserver.Update<Topic>().ToSql());
+			Assert.Equal("UPDATE [tb_topic] SET title='test' \r\nWHERE ([Id] = 1 OR [Id] = 2)", g.sqlserver.Update<Topic>(new[] { 1, 2 }).SetRaw("title='test'").ToSql());
+			Assert.Equal("UPDATE [tb_topic] SET title='test1' \r\nWHERE ([Id] = 1)", g.sqlserver.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.sqlserver.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.sqlserver.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] = isnull([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] = isnull([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/SqlServer/SqlServerAdo/SqlServerAdoTest.cs

@@ -0,0 +1,55 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.SqlServer {
+	public class SqlServerAdoTest {
+		[Fact]
+		public void Pool() {
+			var t1 = g.sqlserver.Ado.MasterPool.StatisticsFullily;
+		}
+
+		[Fact]
+		public void SlavePools() {
+			var t2 = g.sqlserver.Ado.SlavePools.Count;
+		}
+
+		[Fact]
+		public void IsTracePerformance() {
+			Assert.True(g.sqlserver.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.sqlserver.Ado.Query<xxx>("select * from song");
+
+			var t4 = g.sqlserver.Ado.Query<(int, string, string, DateTime)>("select * from song");
+
+			var t5 = g.sqlserver.Ado.Query<dynamic>("select * from song");
+		}
+
+		class xxx {
+			public int Id { get; set; }
+			public string Title { get; set; }
+			public string Url { get; set; }
+			public DateTime Create_time { get; set; }
+		}
+	}
+}

FreeSql.Tests/g.cs

@@ -10,6 +10,6 @@ public class g {
 		.Build();
 
 	public static IFreeSql sqlserver = new FreeSql.FreeSqlBuilder()
-		.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=shop;Pooling=true;Max Pool Size=10")
+		.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=cms;Pooling=true;Max Pool Size=10")
 		.Build();
 }

FreeSql/Interface/IAdo.cs

@@ -80,6 +80,15 @@ namespace FreeSql {
 		/// <param name="cmdParms"></param>
 		object ExecuteScalar(CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
 
+		/// <summary>
+		/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="cmdType"></param>
+		/// <param name="cmdText"></param>
+		/// <param name="cmdParms"></param>
+		/// <returns></returns>
+		List<T> Query<T>(CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
 		/// <summary>
 		/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age", new { age = 25 })
 		/// </summary>
@@ -126,7 +135,16 @@ namespace FreeSql {
 		Task<object> ExecuteScalarAsync(CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
 
 		/// <summary>
-		/// 执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age", new { age = 25 })
+		/// 执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="cmdType"></param>
+		/// <param name="cmdText"></param>
+		/// <param name="cmdParms"></param>
+		/// <returns></returns>
+		Task<List<T>> QueryAsync<T>(CommandType cmdType, string cmdText, params DbParameter[] cmdParms);
+		/// <summary>
+		/// 执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new { age = 25 })
 		/// </summary>
 		/// <typeparam name="T"></typeparam>
 		/// <param name="cmdText"></param>

FreeSql/Internal/CommonExpression.cs

@@ -113,15 +113,36 @@ namespace FreeSql.Internal {
 			{ ExpressionType.Equal, "=" },
 		};
 		internal string ExpressionWhereLambdaNoneForeignObject(List<SelectTableInfo> _tables, List<SelectColumnInfo> _selectColumnMap, Expression exp) {
-			return ExpressionLambdaToSql(exp, _tables, _selectColumnMap, SelectTableInfoType.From, true);
+			var sql = ExpressionLambdaToSql(exp, _tables, _selectColumnMap, SelectTableInfoType.From, true);
+			switch(sql) {
+				case "1":
+				case "'t'": return "1=1";
+				case "0":
+				case "'f'": return "1=2";
+				default:return sql;
+			}
 		}
 
 		internal string ExpressionWhereLambda(List<SelectTableInfo> _tables, Expression exp) {
-			return ExpressionLambdaToSql(exp, _tables, null, SelectTableInfoType.From, true);
+			var sql = ExpressionLambdaToSql(exp, _tables, null, SelectTableInfoType.From, true);
+			switch (sql) {
+				case "1":
+				case "'t'": return "1=1";
+				case "0":
+				case "'f'": return "1=2";
+				default: return sql;
+			}
 		}
 		internal void ExpressionJoinLambda(List<SelectTableInfo> _tables, SelectTableInfoType tbtype, Expression exp) {
 			var tbidx = _tables.Count;
 			var filter = ExpressionLambdaToSql(exp, _tables, null, tbtype, true);
+			switch (filter) {
+				case "1":
+				case "'t'": filter = "1=1"; break;
+				case "0":
+				case "'f'": filter = "1=2"; break;
+				default: break;
+			}
 			if (_tables.Count > tbidx) {
 				_tables[tbidx].Type = tbtype;
 				_tables[tbidx].On = filter;

FreeSql/Internal/CommonProvider/InsertProvider.cs

@@ -76,7 +76,7 @@ namespace FreeSql.Internal.CommonProvider {
 				foreach (var col in _table.Columns.Values)
 					if (col.Attribute.IsIdentity == false && _ignore.ContainsKey(col.Attribute.Name) == false) {
 						if (colidx2 > 0) sb.Append(", ");
-						sb.Append("?").Append(col.CsName).Append(didx);
+						sb.Append(_commonUtils.QuoteParamterName(col.CsName)).Append(didx);
 						_params[didx * colidx + colidx2] = _commonUtils.AppendParamter(null, $"{col.CsName}{didx}", _table.Properties.TryGetValue(col.CsName, out var tryp) ? tryp.GetValue(d) : DBNull.Value);
 						++colidx2;
 					}

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -54,7 +54,7 @@ namespace FreeSql.Internal.CommonProvider {
 		public IUpdate<T1> Set<TMember>(Expression<Func<T1, TMember>> column, TMember value) {
 			var col = _commonExpression.ExpressionSelectColumn_MemberAccess(null, null, SelectTableInfoType.From, column?.Body, true);
 			if (string.IsNullOrEmpty(col)) return this;
-			_set.Append(", ").Append(col).Append(" = ?p_").Append(_params.Count);
+			_set.Append(", ").Append(col).Append(" = ").Append(_commonUtils.QuoteParamterName("p_")).Append(_params.Count);
 			_commonUtils.AppendParamter(_params, null, value);
 			//foreach (var t in _source) Utils.FillPropertyValue(t, tryf.CsName, value);
 			return this;
@@ -135,7 +135,7 @@ namespace FreeSql.Internal.CommonProvider {
 				//	++pkidx;
 				//}
 				//if (_table.Primarys.Length > 1) caseWhen.Append(")");
-				var cw = caseWhen.Append(" ").ToString();
+				var cw = caseWhen.ToString();
 
 				_paramsSource.Clear();
 				var colidx = 0;

FreeSql/MySql/Curd/MySqlDelete.cs

@@ -1,5 +1,6 @@
 using FreeSql.Internal;
 using System.Collections.Generic;
+using System.Data;
 using System.Text;
 
 namespace FreeSql.MySql.Curd {
@@ -19,7 +20,7 @@ namespace FreeSql.MySql.Curd {
 				sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
 				++colidx;
 			}
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params.ToArray());
 		}
 	}
 }

FreeSql/MySql/Curd/MySqlInsert.cs

@@ -22,7 +22,7 @@ namespace FreeSql.MySql.Curd {
 				sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
 				++colidx;
 			}
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params);
 		}
 	}
 }

FreeSql/MySql/Curd/MySqlUpdate.cs

@@ -1,6 +1,8 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
 using System.Collections.Generic;
+using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace FreeSql.MySql.Curd {
@@ -21,29 +23,37 @@ namespace FreeSql.MySql.Curd {
 				sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
 				++colidx;
 			}
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params.Concat(_paramsSource).ToArray());
 		}
 
 		protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys) {
-			if (_table.Primarys.Length > 1) caseWhen.Append("CONCAT(");
+			if (_table.Primarys.Length == 1) {
+				caseWhen.Append(_commonUtils.QuoteSqlName(_table.Primarys.First().Attribute.Name));
+				return;
+			}
+			caseWhen.Append("CONCAT(");
 			var pkidx = 0;
 			foreach (var pk in _table.Primarys) {
 				if (pkidx > 0) caseWhen.Append(", ");
 				caseWhen.Append(_commonUtils.QuoteSqlName(pk.Attribute.Name));
 				++pkidx;
 			}
-			if (_table.Primarys.Length > 1) caseWhen.Append(")");
+			caseWhen.Append(")");
 		}
 
 		protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, object d) {
-			if (_table.Primarys.Length > 1) sb.Append("CONCAT(");
+			if (_table.Primarys.Length == 1) {
+				sb.Append(_commonUtils.FormatSql("{0}", _table.Properties.TryGetValue(_table.Primarys.First().CsName, out var tryp2) ? tryp2.GetValue(d) : null));
+				return;
+			}
+			sb.Append("CONCAT(");
 			var pkidx = 0;
 			foreach (var pk in _table.Primarys) {
 				if (pkidx > 0) sb.Append(", ");
 				sb.Append(_commonUtils.FormatSql("{0}", _table.Properties.TryGetValue(pk.CsName, out var tryp2) ? tryp2.GetValue(d) : null));
 				++pkidx;
 			}
-			if (_table.Primarys.Length > 1) sb.Append(")");
+			sb.Append(")");
 		}
 	}
 }

FreeSql/PostgreSQL/Curd/PostgreSQLDelete.cs

@@ -1,5 +1,6 @@
 using FreeSql.Internal;
 using System.Collections.Generic;
+using System.Data;
 using System.Text;
 
 namespace FreeSql.PostgreSQL.Curd {
@@ -19,7 +20,7 @@ namespace FreeSql.PostgreSQL.Curd {
 				sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
 				++colidx;
 			}
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params.ToArray());
 		}
 	}
 }

FreeSql/PostgreSQL/Curd/PostgreSQLInsert.cs

@@ -24,7 +24,7 @@ namespace FreeSql.PostgreSQL.Curd {
 				sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
 				++colidx;
 			}
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params);
 		}
 	}
 }

FreeSql/PostgreSQL/Curd/PostgreSQLUpdate.cs

@@ -1,6 +1,8 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
 using System.Collections.Generic;
+using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace FreeSql.PostgreSQL.Curd {
@@ -21,29 +23,37 @@ namespace FreeSql.PostgreSQL.Curd {
 				sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
 				++colidx;
 			}
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params.Concat(_paramsSource).ToArray());
 		}
 
 		protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys) {
-			if (_table.Primarys.Length > 1) caseWhen.Append("(");
+			if (_table.Primarys.Length == 1) {
+				caseWhen.Append(_commonUtils.QuoteSqlName(_table.Primarys.First().Attribute.Name));
+				return;
+			}
+			caseWhen.Append("(");
 			var pkidx = 0;
 			foreach (var pk in _table.Primarys) {
-				if (pkidx > 0) caseWhen.Append(", ");
+				if (pkidx > 0) caseWhen.Append(" || ");
 				caseWhen.Append(_commonUtils.QuoteSqlName(pk.Attribute.Name)).Append("::varchar");
 				++pkidx;
 			}
-			if (_table.Primarys.Length > 1) caseWhen.Append(")");
+			caseWhen.Append(")");
 		}
 
 		protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, object d) {
-			if (_table.Primarys.Length > 1) sb.Append("(");
+			if (_table.Primarys.Length == 1) {
+				sb.Append(_commonUtils.FormatSql("{0}", _table.Properties.TryGetValue(_table.Primarys.First().CsName, out var tryp2) ? tryp2.GetValue(d) : null));
+				return;
+			}
+			sb.Append("(");
 			var pkidx = 0;
 			foreach (var pk in _table.Primarys) {
-				if (pkidx > 0) sb.Append(", ");
+				if (pkidx > 0) sb.Append(" || ");
 				sb.Append(_commonUtils.FormatSql("{0}", _table.Properties.TryGetValue(pk.CsName, out var tryp2) ? tryp2.GetValue(d) : null)).Append("::varchar");
 				++pkidx;
 			}
-			if (_table.Primarys.Length > 1) sb.Append(")");
+			sb.Append(")");
 		}
 	}
 }

FreeSql/SqlServer/Curd/SqlServerDelete.cs

@@ -1,6 +1,7 @@
 using FreeSql.Internal;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Text;
 
 namespace FreeSql.SqlServer.Curd {
@@ -28,7 +29,7 @@ namespace FreeSql.SqlServer.Curd {
 			sb.Insert(0, sql.Substring(0, validx));
 			sb.Append(sql.Substring(validx));
 
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params.ToArray());
 		}
 	}
 }

FreeSql/SqlServer/Curd/SqlServerInsert.cs

@@ -28,10 +28,10 @@ namespace FreeSql.SqlServer.Curd {
 
 			var validx = sql.IndexOf(") VALUES");
 			if (validx == -1) throw new ArgumentException("找不到 VALUES");
-			sb.Insert(0, sql.Substring(0, validx)).Insert(0, ")");
+			sb.Insert(0, sql.Substring(0, validx + 1));
 			sb.Append(sql.Substring(validx + 1));
 
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params);
 		}
 	}
 }

FreeSql/SqlServer/Curd/SqlServerUpdate.cs

@@ -2,6 +2,8 @@
 using FreeSql.Internal.Model;
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace FreeSql.SqlServer.Curd {
@@ -30,29 +32,35 @@ namespace FreeSql.SqlServer.Curd {
 			sb.Insert(0, sql.Substring(0, validx));
 			sb.Append(sql.Substring(validx));
 
-			return _orm.Ado.Query<T1>(sb.ToString());
+			return _orm.Ado.Query<T1>(CommandType.Text, sb.ToString(), _params.Concat(_paramsSource).ToArray());
 		}
 
 		protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys) {
-			if (_table.Primarys.Length > 1) caseWhen.Append("(");
+			if (_table.Primarys.Length == 1) {
+				caseWhen.Append(_commonUtils.QuoteSqlName(_table.Primarys.First().Attribute.Name));
+				return;
+			}
+			caseWhen.Append("(");
 			var pkidx = 0;
 			foreach (var pk in _table.Primarys) {
 				if (pkidx > 0) caseWhen.Append(", ");
 				caseWhen.Append("cast(").Append(_commonUtils.QuoteSqlName(pk.Attribute.Name)).Append(" as varchar)");
 				++pkidx;
 			}
-			if (_table.Primarys.Length > 1) caseWhen.Append(")");
+			caseWhen.Append(")");
 		}
 
 		protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, object d) {
-			if (_table.Primarys.Length > 1) sb.Append("(");
+			if (_table.Primarys.Length == 1) {
+				sb.Append(_commonUtils.FormatSql("{0}", _table.Properties.TryGetValue(_table.Primarys.First().CsName, out var tryp2) ? tryp2.GetValue(d) : null));
+				return;
+			}
 			var pkidx = 0;
 			foreach (var pk in _table.Primarys) {
 				if (pkidx > 0) sb.Append(", ");
 				sb.Append("cast(").Append(_commonUtils.FormatSql("{0}", _table.Properties.TryGetValue(pk.CsName, out var tryp2) ? tryp2.GetValue(d) : null)).Append(" as varchar)");
 				++pkidx;
 			}
-			if (_table.Primarys.Length > 1) sb.Append(")");
 		}
 	}
 }

FreeSql/SqlServer/SqlServerCodeFirst.cs

@@ -85,7 +85,7 @@ namespace FreeSql.SqlServer {
 
 					if (tboldname != null && _orm.Ado.ExecuteScalar(CommandType.Text, string.Format("select 1 from dbo.sysobjects where id = object_id(N'[{0}].[{1}]') and OBJECTPROPERTY(id, N'IsUserTable') = 1", tboldname)) != null) { //旧表存在
 																																																									//修改表名
-						sb.Append(_commonUtils.FormatSql("EXEC sp_rename {0}, {1} \r\nGO \r\n", _commonUtils.QuoteSqlName($"{tboldname[0]}.{tboldname[1]}"), _commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")));
+						sb.Append(_commonUtils.FormatSql("EXEC sp_rename {0}, {1};\r\n", _commonUtils.QuoteSqlName($"{tboldname[0]}.{tboldname[1]}"), _commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")));
 						isRenameTable = true;
 
 					} else {
@@ -98,7 +98,7 @@ namespace FreeSql.SqlServer {
 							if (tbcol.Attribute.IsPrimary) sb.Append(" primary key");
 							sb.Append(",");
 						}
-						sb.Remove(sb.Length - 1, 1).Append("\r\n) \r\nGO \r\n");
+						sb.Remove(sb.Length - 1, 1).Append("\r\n);\r\n");
 						continue;
 					}
 				}
@@ -137,7 +137,7 @@ where a.object_id in (object_id(N'[{0}].[{1}]'))", isRenameTable ? tboldname : t
 							trycol.Attribute.IsIdentity != is_identity) {
 							sb.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ALTER COLUMN ").Append(_commonUtils.QuoteSqlName(column)).Append(" ").Append(trycol.Attribute.DbType.ToUpper());
 							if (trycol.Attribute.IsIdentity && trycol.Attribute.DbType.IndexOf("identity", StringComparison.CurrentCultureIgnoreCase) == -1) sb.Append(" identity(1,1)");
-							sb.Append(" \r\nGO \r\n");
+							sb.Append(";\r\n");
 						}
 						addcols.Remove(column);
 					} else
@@ -145,15 +145,15 @@ where a.object_id in (object_id(N'[{0}].[{1}]'))", isRenameTable ? tboldname : t
 				}
 				foreach (var addcol in addcols.Values) {
 					if (string.IsNullOrEmpty(addcol.Attribute.OldName) == false && surplus.ContainsKey(addcol.Attribute.OldName)) { //修改列名
-						sb.Append(_commonUtils.FormatSql("EXEC sp_rename {0}, {1}, 'COLUMN' \r\nGO \r\n", $"{tbname[0]}.{tbname[1]}.{addcol.Attribute.OldName}", addcol.Attribute.Name));
+						sb.Append(_commonUtils.FormatSql("EXEC sp_rename {0}, {1}, 'COLUMN';\r\n", $"{tbname[0]}.{tbname[1]}.{addcol.Attribute.OldName}", addcol.Attribute.Name));
 						sb.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ALTER COLUMN ").Append(_commonUtils.QuoteSqlName(addcol.Attribute.Name)).Append(" ").Append(addcol.Attribute.DbType.ToUpper());
 						if (addcol.Attribute.IsIdentity && addcol.Attribute.DbType.IndexOf("identity", StringComparison.CurrentCultureIgnoreCase) == -1) sb.Append(" identity(1,1)");
-						sb.Append(" \r\nGO \r\n");
+						sb.Append(";\r\n");
 
 					} else { //添加列
 						sb.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" ADD ").Append(_commonUtils.QuoteSqlName(addcol.Attribute.Name)).Append(" ").Append(addcol.Attribute.DbType.ToUpper());
 						if (addcol.Attribute.IsIdentity && addcol.Attribute.DbType.IndexOf("identity", StringComparison.CurrentCultureIgnoreCase) == -1) sb.Append(" identity(1,1)");
-						sb.Append(" \r\nGO \r\n");
+						sb.Append(";\r\n");
 					}
 				}
 			}