Merge pull request #40 from 2881099/dev_type_mapping

- 补充 Expression IEnumerable<T>.Contains 的支持，之前只能数组或IList<T>；
dotnetcore · Apr 25, 2019 · e26a124 · e26a124
2 parents 169cf59 + 205421f
commit e26a124
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 55 deletions.
diff --git a/FreeSql.Tests/MySql/MySqlExpression/OtherTest.cs b/FreeSql.Tests/MySql/MySqlExpression/OtherTest.cs
@@ -21,6 +21,9 @@ public void Array() {
 			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();

diff --git a/FreeSql.Tests/Oracle/OracleExpression/OtherTest.cs b/FreeSql.Tests/Oracle/OracleExpression/OtherTest.cs
@@ -15,6 +15,9 @@ public OtherTest() {
 
 		[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();

diff --git a/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs b/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs
@@ -23,6 +23,8 @@ public OtherTest() {
 
 		[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();

diff --git a/FreeSql.Tests/SqlServer/SqlServerExpression/OtherTest.cs b/FreeSql.Tests/SqlServer/SqlServerExpression/OtherTest.cs
@@ -20,6 +20,9 @@ public OtherTest(SqlServerFixture sqlserverFixture)
 
 		[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();

diff --git a/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs b/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs
@@ -15,6 +15,9 @@ public OtherTest() {
 
 		[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();

diff --git a/FreeSql/DataAnnotations/ColumnAttribute.cs b/FreeSql/DataAnnotations/ColumnAttribute.cs
@@ -42,5 +42,10 @@ public class ColumnAttribute : Attribute {
 		/// 数据库默认值
 		/// </summary>
 		internal object DbDefautValue { get; set; }
+
+		/// <summary>
+		/// 类型映射，比如：可将 enum 属性映射成 typeof(string)
+		/// </summary>
+		public Type Mapping { get; set; }
 	}
 }
diff --git a/FreeSql/MySql/MySqlExpression.cs b/FreeSql/MySql/MySqlExpression.cs
@@ -90,14 +90,12 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						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}";
-							}
+						switch (callExp.Method.Name) {
+							case "Contains":
+								//判断 in
+								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
 					break;

diff --git a/FreeSql/Oracle/OracleExpression.cs b/FreeSql/Oracle/OracleExpression.cs
@@ -90,14 +90,12 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						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}";
-							}
+						switch (callExp.Method.Name) {
+							case "Contains":
+								//判断 in
+								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
 					break;

diff --git a/FreeSql/PostgreSQL/PostgreSQLExpression.cs b/FreeSql/PostgreSQL/PostgreSQLExpression.cs
@@ -95,7 +95,7 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						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,32 +134,30 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 								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(')')}]";
-									return $"(case when {left} is null then 0 else array_length({left},1) end > 0)";
-								case "Contains":
-									//判断 in 或 array @> array
-									var right1 = getExp(callExp.Arguments[argIndex]);
-									if (left.StartsWith("array[") || left.EndsWith("]"))
-										return $"{right1} in ({left.Substring(6, left.Length - 7)})";
-									if (left.StartsWith("(") || left.EndsWith(")"))
-										return $"{right1} in {left}";
-									if (right1.StartsWith("(") || right1.EndsWith(")")) right1 = $"array[{right1.TrimStart('(').TrimEnd(')')}]";
-									return $"({left} @> array[{right1}])";
-								case "Concat":
-									if (left.StartsWith("(") || left.EndsWith(")")) left = $"array[{left.TrimStart('(').TrimEnd(')')}]";
-									var right2 = getExp(callExp.Arguments[argIndex]);
-									if (right2.StartsWith("(") || right2.EndsWith(")")) right2 = $"array[{right2.TrimStart('(').TrimEnd(')')}]";
-									return $"({left} || {right2})";
-								case "GetLength":
-								case "GetLongLength":
-								case "Length":
-								case "Count":
-									if (left.StartsWith("(") || left.EndsWith(")")) left = $"array[{left.TrimStart('(').TrimEnd(')')}]";
-									return $"case when {left} is null then 0 else array_length({left},1) end";
-							}
+						switch (callExp.Method.Name) {
+							case "Any":
+								if (left.StartsWith("(") || left.EndsWith(")")) left = $"array[{left.TrimStart('(').TrimEnd(')')}]";
+								return $"(case when {left} is null then 0 else array_length({left},1) end > 0)";
+							case "Contains":
+								//判断 in 或 array @> array
+								var right1 = getExp(callExp.Arguments[argIndex]);
+								if (left.StartsWith("array[") || left.EndsWith("]"))
+									return $"{right1} in ({left.Substring(6, left.Length - 7)})";
+								if (left.StartsWith("(") || left.EndsWith(")"))
+									return $"{right1} in {left}";
+								if (right1.StartsWith("(") || right1.EndsWith(")")) right1 = $"array[{right1.TrimStart('(').TrimEnd(')')}]";
+								return $"({left} @> array[{right1}])";
+							case "Concat":
+								if (left.StartsWith("(") || left.EndsWith(")")) left = $"array[{left.TrimStart('(').TrimEnd(')')}]";
+								var right2 = getExp(callExp.Arguments[argIndex]);
+								if (right2.StartsWith("(") || right2.EndsWith(")")) right2 = $"array[{right2.TrimStart('(').TrimEnd(')')}]";
+								return $"({left} || {right2})";
+							case "GetLength":
+							case "GetLongLength":
+							case "Length":
+							case "Count":
+								if (left.StartsWith("(") || left.EndsWith(")")) left = $"array[{left.TrimStart('(').TrimEnd(')')}]";
+								return $"case when {left} is null then 0 else array_length({left},1) end";
 						}
 					}
 					break;

diff --git a/FreeSql/SqlServer/SqlServerExpression.cs b/FreeSql/SqlServer/SqlServerExpression.cs
@@ -93,14 +93,12 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						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}";
-							}
+						switch (callExp.Method.Name) {
+							case "Contains":
+								//判断 in
+								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
 					break;

diff --git a/FreeSql/Sqlite/SqliteExpression.cs b/FreeSql/Sqlite/SqliteExpression.cs
@@ -90,14 +90,12 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						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}";
-							}
+						switch (callExp.Method.Name) {
+							case "Contains":
+								//判断 in
+								return $"({getExp(callExp.Arguments[argIndex])}) in {left}";
 						}
 					}
 					break;