修复 IsIgnore 过滤字段后，查询的错误；

28810 · 28810 · commit 8d266a556e9f · 2019-04-18T11:21:12.000+08:00
diff --git a/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs b/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs
@@ -1,5 +1,6 @@
 using FreeSql.DataAnnotations;
 using FreeSql.Tests.DataContext.SqlServer;
+using System;
 using Xunit;
 
 namespace FreeSql.Tests.DataAnnotations {
@@ -56,5 +57,22 @@ class TestFluenttb2
 
 			public string name { get; set; } = "defaultValue";
 		}
+
+		[Fact]
+		public void IsIgnore() {
+			var item = new TestIsIgnore { };
+			Assert.Equal(1, g.mysql.Insert<TestIsIgnore>().AppendData(item).ExecuteAffrows());
+
+			var find = g.mysql.Select<TestIsIgnore>().Where(a => a.id == item.id).First();
+			Assert.NotNull(find);
+			Assert.Equal(item.id, find.id);
+		}
+
+		class TestIsIgnore {
+			public Guid id { get; set; }
+
+			[Column(IsIgnore = true)]
+			public bool isignore { get; set; }
+		}
 	}
 }
diff --git a/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs b/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs
@@ -1,5 +1,6 @@
 using FreeSql.DataAnnotations;
 using FreeSql.Tests.DataContext.SqlServer;
+using System;
 using Xunit;
 
 namespace FreeSql.Tests.DataAnnotations {
@@ -81,6 +82,23 @@ class TestgroupkeyTb {
 
 			public string name { get; set; } = "defaultValue";
 		}
+
+		[Fact]
+		public void IsIgnore() {
+			var item = new TestIsIgnore { };
+			Assert.Equal(1, _sqlserverFixture.SqlServer.Insert<TestIsIgnore>().AppendData(item).ExecuteAffrows());
+
+			var find = _sqlserverFixture.SqlServer.Select<TestIsIgnore>().Where(a => a.id == item.id).First();
+			Assert.NotNull(find);
+			Assert.Equal(item.id, find.id);
+		}
+
+		class TestIsIgnore {
+			public Guid id { get; set; }
+
+			[Column(IsIgnore = true)]
+			public bool isignore { get; set; }
+		}
 	}
 
 }
diff --git a/FreeSql.Tests/MySql/Curd/MySqlSelectTest.cs b/FreeSql.Tests/MySql/Curd/MySqlSelectTest.cs
@@ -246,6 +246,8 @@ class TestGuidIdToList {
 		}
 		[Fact]
 		public void ToOne() {
+			var testnotfind = select.Where("1=2").First(a => a.CreateTime);
+			Assert.Equal(default(DateTime), testnotfind);
 		}
 		[Fact]
 		public void ToSql() {
diff --git a/FreeSql.Tests/Oracle/Curd/OracleSelectTest.cs b/FreeSql.Tests/Oracle/Curd/OracleSelectTest.cs
@@ -156,6 +156,8 @@ class TestGuidIdToList {
 		}
 		[Fact]
 		public void ToOne() {
+			var testnotfind = select.Where("1=2").First(a => a.CreateTime);
+			Assert.Equal(default(DateTime), testnotfind);
 		}
 		[Fact]
 		public void ToSql() {
diff --git a/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs b/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs
@@ -226,6 +226,8 @@ class TestGuidIdToList {
 		}
 		[Fact]
 		public void ToOne() {
+			var testnotfind = select.Where("1=2").First(a => a.CreateTime);
+			Assert.Equal(default(DateTime), testnotfind);
 		}
 		[Fact]
 		public void ToSql() {
diff --git a/FreeSql.Tests/SqlServer/Curd/SqlServerSelectTest.cs b/FreeSql.Tests/SqlServer/Curd/SqlServerSelectTest.cs
@@ -158,6 +158,8 @@ class TestGuidIdToList {
 		}
 		[Fact]
 		public void ToOne() {
+			var testnotfind = select.Where("1=2").First(a => a.CreateTime);
+			Assert.Equal(default(DateTime), testnotfind);
 		}
 		[Fact]
 		public void ToSql() {
diff --git a/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs b/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
@@ -167,6 +167,8 @@ class TestGuidIdToList {
 		}
 		[Fact]
 		public void ToOne() {
+			var testnotfind = select.Where("1=2").First(a => a.CreateTime);
+			Assert.Equal(default(DateTime), testnotfind);
 		}
 		[Fact]
 		public void ToSql() {
diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>0.5.1.1</Version>
+		<Version>0.5.1.2</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>YeXiangQin</Authors>
 		<Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description>
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -377,6 +377,8 @@ protected GetAllFieldExpressionTreeInfo GetAllFieldExpressionTree() {
 				var index = 0;
 				var otherindex = 0;
 				foreach (var prop in props.Values) {
+					if (tb.Table.ColumnsByCsIgnore.ContainsKey(prop.Name)) continue;
+
 					if (tb.Table.ColumnsByCs.TryGetValue(prop.Name, out var col)) { //普通字段
 						if (index > 0) field.Append(", ");
 						var quoteName = _commonUtils.QuoteSqlName(col.Attribute.Name);
diff --git a/FreeSql/Internal/Model/TableInfo.cs b/FreeSql/Internal/Model/TableInfo.cs
@@ -11,6 +11,7 @@ public class TableInfo {
 		public Dictionary<string, PropertyInfo> Properties { get; set; } = new Dictionary<string, PropertyInfo>(StringComparer.CurrentCultureIgnoreCase);
 		public Dictionary<string, ColumnInfo> Columns { get; set; } = new Dictionary<string, ColumnInfo>(StringComparer.CurrentCultureIgnoreCase);
 		public Dictionary<string, ColumnInfo> ColumnsByCs { get; set; } = new Dictionary<string, ColumnInfo>(StringComparer.CurrentCultureIgnoreCase);
+		public Dictionary<string, ColumnInfo> ColumnsByCsIgnore { get; set; } = new Dictionary<string, ColumnInfo>(StringComparer.CurrentCultureIgnoreCase);
 		public ColumnInfo[] Primarys { get; set; }
 		public string CsName { get; set; }
 		public string DbName { get; set; }
diff --git a/FreeSql/Internal/UtilsExpressionTree.cs b/FreeSql/Internal/UtilsExpressionTree.cs
@@ -70,7 +70,6 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common) {
 						IsPrimary = false,
 						IsIgnore = false
 					};
-				if (colattr.IsIgnore) continue;
 				if (string.IsNullOrEmpty(colattr.DbType)) colattr.DbType = tp?.dbtypeFull ?? "varchar(255)";
 				colattr.DbType = colattr.DbType.ToUpper();
 
@@ -104,6 +103,10 @@ internal static TableInfo GetTableByEntity(Type entity, CommonUtils common) {
 					CsType = p.PropertyType,
 					Attribute = colattr
 				};
+				if (colattr.IsIgnore) {
+					trytb.ColumnsByCsIgnore.Add(p.Name, col);
+					continue;
+				}
 				trytb.Columns.Add(colattr.Name, col);
 				trytb.ColumnsByCs.Add(p.Name, col);
 			}
@@ -807,6 +810,8 @@ internal static RowInfo ExecuteArrayRowReadClassOrTuple(Type type, int[] indexes
 						Expression.Assign(readpknullExp, Expression.Constant(false))
 					});
 					foreach (var ctorParm in ctorParms) {
+						if (typetb.ColumnsByCsIgnore.ContainsKey(ctorParm.Name)) continue;
+
 						var ispkExp = new List<Expression>();
 						Expression readVal = Expression.Assign(readpkvalExp, Expression.Call(rowExp, MethodDataReaderGetValue, dataIndexExp));
 						Expression readExpAssign = null; //加速缓存
@@ -823,7 +828,7 @@ internal static RowInfo ExecuteArrayRowReadClassOrTuple(Type type, int[] indexes
 
 								//判断主键为空，则整个对象不读取
 								//blockExp.Add(Expression.Assign(readpkvalExp, Expression.Call(rowExp, MethodDataReaderGetValue, dataIndexExp)));
-								if (typetb.ColumnsByCs.TryGetValue(ctorParm.Name, out var trycol) && trycol.Attribute.IsPrimary) {
+								if (typetb.ColumnsByCs.TryGetValue(ctorParm.Name, out var trycol) && trycol.Attribute.IsPrimary == true) {
 									ispkExp.Add(
 										Expression.IfThen(
 											Expression.AndAlso(
@@ -892,6 +897,8 @@ internal static RowInfo ExecuteArrayRowReadClassOrTuple(Type type, int[] indexes
 					var props = type.GetProperties();//.ToDictionary(a => a.Name, a => a, StringComparer.CurrentCultureIgnoreCase);
 					var propIndex = 0;
 					foreach (var prop in props) {
+						if (typetb.ColumnsByCsIgnore.ContainsKey(prop.Name)) continue;
+
 						var ispkExp = new List<Expression>();
 						var propGetSetMethod = prop.GetSetMethod();
 						Expression readVal = Expression.Assign(readpkvalExp, Expression.Call(rowExp, MethodDataReaderGetValue, tryidxExp));
@@ -909,7 +916,7 @@ internal static RowInfo ExecuteArrayRowReadClassOrTuple(Type type, int[] indexes
 
 								//判断主键为空，则整个对象不读取
 								//blockExp.Add(Expression.Assign(readpkvalExp, Expression.Call(rowExp, MethodDataReaderGetValue, dataIndexExp)));
-								if (typetb.ColumnsByCs.TryGetValue(prop.Name, out var trycol) && trycol.Attribute.IsPrimary) {
+								if (typetb.ColumnsByCs.TryGetValue(prop.Name, out var trycol) && trycol.Attribute.IsPrimary == true) {
 									ispkExp.Add(
 										Expression.IfThen(
 											Expression.AndAlso(

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,8 @@ class TestGuidIdToList {`
`246`	`246`	`}`
`247`	`247`	`[Fact]`
`248`	`248`	`public void ToOne() {`
	`249`	`+ var testnotfind = select.Where("1=2").First(a => a.CreateTime);`
	`250`	`+ Assert.Equal(default(DateTime), testnotfind);`
`249`	`251`	`}`
`250`	`252`	`[Fact]`
`251`	`253`	`public void ToSql() {`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,8 @@ class TestGuidIdToList {`
`156`	`156`	`}`
`157`	`157`	`[Fact]`
`158`	`158`	`public void ToOne() {`
	`159`	`+ var testnotfind = select.Where("1=2").First(a => a.CreateTime);`
	`160`	`+ Assert.Equal(default(DateTime), testnotfind);`
`159`	`161`	`}`
`160`	`162`	`[Fact]`
`161`	`163`	`public void ToSql() {`
Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,8 @@ class TestGuidIdToList {`
`226`	`226`	`}`
`227`	`227`	`[Fact]`
`228`	`228`	`public void ToOne() {`
	`229`	`+ var testnotfind = select.Where("1=2").First(a => a.CreateTime);`
	`230`	`+ Assert.Equal(default(DateTime), testnotfind);`
`229`	`231`	`}`
`230`	`232`	`[Fact]`
`231`	`233`	`public void ToSql() {`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,8 @@ class TestGuidIdToList {`
`158`	`158`	`}`
`159`	`159`	`[Fact]`
`160`	`160`	`public void ToOne() {`
	`161`	`+ var testnotfind = select.Where("1=2").First(a => a.CreateTime);`
	`162`	`+ Assert.Equal(default(DateTime), testnotfind);`
`161`	`163`	`}`
`162`	`164`	`[Fact]`
`163`	`165`	`public void ToSql() {`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,8 @@ class TestGuidIdToList {`
`167`	`167`	`}`
`168`	`168`	`[Fact]`
`169`	`169`	`public void ToOne() {`
	`170`	`+ var testnotfind = select.Where("1=2").First(a => a.CreateTime);`
	`171`	`+ Assert.Equal(default(DateTime), testnotfind);`
`170`	`172`	`}`
`171`	`173`	`[Fact]`
`172`	`174`	`public void ToSql() {`