From 9fd850c81cd483cb6c1aa6eb61dd75c9bb2749dc Mon Sep 17 00:00:00 2001
From: LambertW <26795806@qq.com>
Date: Fri, 15 Mar 2019 21:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0SqlServerFluentTest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{FluentTest.cs => MySqlFluentTest.cs}     | 24 +++----
 .../DataAnnotations/SqlServerFluentTest.cs    | 66 +++++++++++++++++++
 FreeSql.Tests/FreeSql.Tests.csproj            |  2 +
 3 files changed, 81 insertions(+), 11 deletions(-)
 rename FreeSql.Tests/DataAnnotations/{FluentTest.cs => MySqlFluentTest.cs} (79%)
 create mode 100644 FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs

diff --git a/FreeSql.Tests/DataAnnotations/FluentTest.cs b/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs
similarity index 79%
rename from FreeSql.Tests/DataAnnotations/FluentTest.cs
rename to FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs
index bc522806..9d098d45 100644
--- a/FreeSql.Tests/DataAnnotations/FluentTest.cs
+++ b/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs
@@ -2,7 +2,7 @@ using FreeSql.DataAnnotations;
 using Xunit;
 
 namespace FreeSql.Tests.DataAnnotations {
-	public class FluentTest {
+	public class MySqlFluentTest {
 		[Fact]
 		public void Fluent() {
 			g.mysql.CodeFirst
@@ -35,19 +35,21 @@ namespace FreeSql.Tests.DataAnnotations {
 			var t2affrows = g.mysql.Insert<TestFluenttb2>().AppendData(new TestFluenttb2 { Id = t2lastId + 1 }).ExecuteAffrows();
 			var t2 = g.mysql.Select<TestFluenttb2>(t2lastId + 1).ToOne();
 		}
-	}
 
-	class TestFluenttb1 {
-		public int Id { get; set; }
+		class TestFluenttb1
+		{
+			public int Id { get; set; }
 
-		public string name { get; set; } = "defaultValue";
-	}
+			public string name { get; set; } = "defaultValue";
+		}
 
-	[Table(Name = "cccccdddwww")]
-	class TestFluenttb2 {
-		[Column(Name = "Idx", IsPrimary = true, IsIdentity = false)]
-		public int Id { get; set; }
+		[Table(Name = "cccccdddwww")]
+		class TestFluenttb2
+		{
+			[Column(Name = "Idx", IsPrimary = true, IsIdentity = false)]
+			public int Id { get; set; }
 
-		public string name { get; set; } = "defaultValue";
+			public string name { get; set; } = "defaultValue";
+		}
 	}
 }
diff --git a/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs b/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs
new file mode 100644
index 00000000..3a550775
--- /dev/null
+++ b/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs
@@ -0,0 +1,66 @@
+using FreeSql.DataAnnotations;
+using FreeSql.Tests.DataContext.SqlServer;
+using Xunit;
+
+namespace FreeSql.Tests.DataAnnotations {
+	[Collection("SqlServerCollection")]
+	public class SqlServerFluentTest {
+
+		SqlServerFixture _sqlserverFixture;
+
+		public SqlServerFluentTest(SqlServerFixture sqlserverFixture)
+		{
+			_sqlserverFixture = sqlserverFixture;
+		}
+
+		[Fact]
+		public void Fluent() {
+			_sqlserverFixture.SqlServer.CodeFirst
+				//.ConfigEntity<TestFluenttb1>(a => {
+				//	a.Name("xxdkdkdk1").SelectFilter("a.Id22 > 0");
+				//	a.Property(b => b.Id).Name("Id22").IsIdentity(true);
+				//	a.Property(b => b.name).DbType("varchar(100)").IsNullable(true);
+				//})
+
+				.ConfigEntity(typeof(TestFluenttb1), a => {
+					a.Name("xxdkdkdk1222").SelectFilter("a.Id22dd > 1");
+					a.Property("Id").Name("Id22dd").IsIdentity(true);
+					a.Property("Name").DbType("varchar(101)").IsNullable(true);
+				})
+
+				.ConfigEntity<TestFluenttb2>(a => {
+					a.Name("xxdkdkdk2").SelectFilter("a.Idx > 0");
+					a.Property(b => b.Id).Name("Id22").IsIdentity(true);
+					a.Property(b => b.name).DbType("varchar(100)").IsNullable(true);
+				})
+				;
+
+			var ddl1 = _sqlserverFixture.SqlServer.CodeFirst.GetComparisonDDLStatements<TestFluenttb1>();
+			var ddl2 = _sqlserverFixture.SqlServer.CodeFirst.GetComparisonDDLStatements<TestFluenttb2>();
+
+			var t1id = _sqlserverFixture.SqlServer.Insert<TestFluenttb1>().AppendData(new TestFluenttb1 { }).ExecuteIdentity();
+			var t1 = _sqlserverFixture.SqlServer.Select<TestFluenttb1>(t1id).ToOne();
+
+			var t2lastId = _sqlserverFixture.SqlServer.Select<TestFluenttb2>().Max(a => a.Id);
+			var t2affrows = _sqlserverFixture.SqlServer.Insert<TestFluenttb2>().AppendData(new TestFluenttb2 { Id = t2lastId + 1 }).ExecuteAffrows();
+			var t2 = _sqlserverFixture.SqlServer.Select<TestFluenttb2>(t2lastId + 1).ToOne();
+		}
+
+		class TestFluenttb1
+		{
+			public int Id { get; set; }
+
+			public string name { get; set; } = "defaultValue";
+		}
+
+		[Table(Name = "cccccdddwww")]
+		class TestFluenttb2
+		{
+			[Column(Name = "Idx", IsPrimary = true, IsIdentity = false)]
+			public int Id { get; set; }
+
+			public string name { get; set; } = "defaultValue";
+		}
+	}
+
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.csproj b/FreeSql.Tests/FreeSql.Tests.csproj
index 56f55744..30abb7c1 100644
--- a/FreeSql.Tests/FreeSql.Tests.csproj
+++ b/FreeSql.Tests/FreeSql.Tests.csproj
@@ -18,6 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="DataAnnotations\MySql\" />
+    <Folder Include="DataAnnotations\SqlServer\" />
     <Folder Include="DataContext\MySql\" />
   </ItemGroup>