- 补充 Expression IEnumerable<T>.Contains 的支持，之前只能数组或IList<T>；

FreeSql.Tests/MySql/MySqlExpression/OtherTest.cs

@@ -21,6 +21,9 @@ namespace FreeSql.Tests.MySqlExpression {
 			Assert.Throws<MySqlException>(() => { select.Where(a => nullarr.Contains(a.testFieldInt)).ToList(); });
 			Assert.Throws<MySqlException>(() => { select.Where(a => new int[0].Contains(a.testFieldInt)).ToList(); });
 
+			IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
+			var testlinq = select.Where(a => testlinqlist.Contains(a.testFieldInt)).ToList();
+
 			//in not in
 			var sql111 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
 			var sql112 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.testFieldInt) == false).ToList();

FreeSql.Tests/Oracle/OracleExpression/OtherTest.cs

@@ -15,6 +15,9 @@ namespace FreeSql.Tests.OracleExpression {
 
 		[Fact]
 		public void Array() {
+			IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
+			var testlinq = select.Where(a => testlinqlist.Contains(a.Int)).ToList();
+
 			//in not in
 			var sql111 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int)).ToList();
 			//var sql112 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int) == false).ToList();

FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs

@@ -23,6 +23,8 @@ namespace FreeSql.Tests.PostgreSQLExpression {
 
 		[Fact]
 		public void Array() {
+			IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
+			var testlinq = select.Where(a => testlinqlist.Contains(a.testFieldInt)).ToList();
 
 			var sql1 = select.Where(a => a.testFieldIntArray.Contains(1)).ToList();
 			var sql2 = select.Where(a => a.testFieldIntArray.Contains(1) == false).ToList();

FreeSql.Tests/SqlServer/SqlServerExpression/OtherTest.cs

@@ -20,6 +20,9 @@ namespace FreeSql.Tests.SqlServerExpression {
 
 		[Fact]
 		public void Array() {
+			IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
+			var testlinq = select.Where(a => testlinqlist.Contains(a.testFieldInt)).ToList();
+
 			//in not in
 			var sql111 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
 			//var sql112 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.testFieldInt) == false).ToList();

FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs

@@ -15,6 +15,9 @@ namespace FreeSql.Tests.SqliteExpression {
 
 		[Fact]
 		public void Array() {
+			IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
+			var testlinq = select.Where(a => testlinqlist.Contains(a.Int)).ToList();
+
 			//in not in
 			var sql111 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int)).ToList();
 			//var sql112 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int) == false).ToList();

FreeSql/DataAnnotations/ColumnAttribute.cs

@@ -42,5 +42,10 @@ namespace FreeSql.DataAnnotations {
 		/// 数据库默认值
 		/// </summary>
 		internal object DbDefautValue { get; set; }
+
+		/// <summary>
+		/// 类型映射，比如：可将 enum 属性映射成 typeof(string)
+		/// </summary>
+		public Type Mapping { get; set; }
 	}
 }

FreeSql/MySql/MySqlExpression.cs

@@ -90,16 +90,14 @@ namespace FreeSql.MySql {
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
-					if (objType != null) {
+					if (objType != null || objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						switch (callExp.Method.Name) {
 							case "Contains":
 								//判断 in
 								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
-					}
 					break;
 				case ExpressionType.NewArrayInit:
 					var arrExp = exp as NewArrayExpression;

FreeSql/Oracle/OracleExpression.cs

@@ -90,16 +90,14 @@ namespace FreeSql.Oracle {
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
-					if (objType != null) {
+					if (objType != null || objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						switch (callExp.Method.Name) {
 							case "Contains":
 								//判断 in
 								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
-					}
 					break;
 				case ExpressionType.NewArrayInit:
 					var arrExp = exp as NewArrayExpression;

FreeSql/PostgreSQL/PostgreSQLExpression.cs

@@ -95,7 +95,7 @@ namespace FreeSql.PostgreSQL {
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
-					if (objType != null) {
+					if (objType != null || objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						var left = objExp == null ? null : getExp(objExp);
 						switch (objType.FullName) {
 							case "Newtonsoft.Json.Linq.JToken":
@@ -134,7 +134,6 @@ namespace FreeSql.PostgreSQL {
 								case "Values": return $"avals({left})";
 							}
 						}
-						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						switch (callExp.Method.Name) {
 							case "Any":
 								if (left.StartsWith("(") || left.EndsWith(")")) left = $"array[{left.TrimStart('(').TrimEnd(')')}]";
@@ -161,7 +160,6 @@ namespace FreeSql.PostgreSQL {
 								return $"case when {left} is null then 0 else array_length({left},1) end";
 						}
 					}
-					}
 					break;
 				case ExpressionType.MemberAccess:
 					var memExp = exp as MemberExpression;

FreeSql/SqlServer/SqlServerExpression.cs

@@ -93,16 +93,14 @@ namespace FreeSql.SqlServer {
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
-					if (objType != null) {
+					if (objType != null || objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						switch (callExp.Method.Name) {
 							case "Contains":
 								//判断 in
 								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
-					}
 					break;
 				case ExpressionType.NewArrayInit:
 					var arrExp = exp as NewArrayExpression;

FreeSql/Sqlite/SqliteExpression.cs

@@ -90,16 +90,14 @@ namespace FreeSql.Sqlite {
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
-					if (objType != null) {
+					if (objType != null || objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 						switch (callExp.Method.Name) {
 							case "Contains":
 								//判断 in
 								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
-					}
 					break;
 				case ExpressionType.NewArrayInit:
 					var arrExp = exp as NewArrayExpression;