repair bug: ILIst.Contains Expression #16

dotnetcore · Mar 16, 2019 · 4667698 · 4667698
1 parent c7394b7
commit 4667698
Show file tree

Hide file tree

Showing 10 changed files with 191 additions and 10 deletions.
diff --git a/FreeSql.Tests/MySql/MySqlExpression/OtherTest.cs b/FreeSql.Tests/MySql/MySqlExpression/OtherTest.cs
@@ -1,5 +1,6 @@
 using FreeSql.DataAnnotations;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -24,6 +25,20 @@ public void Array() {
 			var sql1111 = select.Where(a => inarray.Contains(a.testFieldInt)).ToList();
 			var sql1122 = select.Where(a => inarray.Contains(a.testFieldInt) == false).ToList();
 			var sql1133 = select.Where(a => !inarray.Contains(a.testFieldInt)).ToList();
+
+			//in not in
+			var sql11111 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
+			var sql11222 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt) == false).ToList();
+			var sql11333 = select.Where(a => !new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
+
+			var sql11111a = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt)).ToList();
+			var sql11222b = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt) == false).ToList();
+			var sql11333c = select.Where(a => !new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt)).ToList();
+
+			var inarray2 = new List<int>() { 1, 2, 3 };
+			var sql111111 = select.Where(a => inarray.Contains(a.testFieldInt)).ToList();
+			var sql112222 = select.Where(a => inarray.Contains(a.testFieldInt) == false).ToList();
+			var sql113333 = select.Where(a => !inarray.Contains(a.testFieldInt)).ToList();
 		}
 
 		[Table(Name = "tb_alltype")]

diff --git a/FreeSql.Tests/Oracle/OracleExpression/OtherTest.cs b/FreeSql.Tests/Oracle/OracleExpression/OtherTest.cs
@@ -1,5 +1,6 @@
 using FreeSql.DataAnnotations;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -23,6 +24,21 @@ public void Array() {
 			var sql1111 = select.Where(a => inarray.Contains(a.Int)).ToList();
 			//var sql1122 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
 			var sql1133 = select.Where(a => !inarray.Contains(a.Int)).ToList();
+
+
+			//in not in
+			var sql11111 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+			//var sql11222 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int) == false).ToList();
+			var sql11333 = select.Where(a => !new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+
+			var sql11111a = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+			//var sql11222b = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int) == false).ToList();
+			var sql11333c = select.Where(a => !new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+
+			var inarray2 = new List<int>() { 1, 2, 3 };
+			var sql111111 = select.Where(a => inarray.Contains(a.Int)).ToList();
+			//var sql112222 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
+			var sql113333 = select.Where(a => !inarray.Contains(a.Int)).ToList();
 		}
 
 		[Table(Name = "tb_alltype")]

diff --git a/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs b/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs
@@ -37,6 +37,21 @@ public void Array() {
 			var sql1122 = select.Where(a => inarray.Contains(a.testFieldInt) == false).ToSql();
 			var sql1133 = select.Where(a => !inarray.Contains(a.testFieldInt)).ToSql();
 
+			//in not in
+			var sql11111 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
+			var sql11222 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt) == false).ToList();
+			var sql11333 = select.Where(a => !new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
+
+			var sql11111a = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt)).ToList();
+			var sql11222b = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt) == false).ToList();
+			var sql11333c = select.Where(a => !new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt)).ToList();
+
+			var inarray2 = new List<int>() { 1, 2, 3 };
+			var sql111111 = select.Where(a => inarray.Contains(a.testFieldInt)).ToList();
+			var sql112222 = select.Where(a => inarray.Contains(a.testFieldInt) == false).ToList();
+			var sql113333 = select.Where(a => !inarray.Contains(a.testFieldInt)).ToList();
+
+
 			var sql3 = select.Where(a => a.testFieldIntArray.Any()).ToList();
 			var sql4 = select.Where(a => a.testFieldIntArray.Any() == false).ToList();
 

diff --git a/FreeSql.Tests/SqlServer/SqlServerExpression/OtherTest.cs b/FreeSql.Tests/SqlServer/SqlServerExpression/OtherTest.cs
@@ -1,6 +1,7 @@
 using FreeSql.DataAnnotations;
 using FreeSql.Tests.DataContext.SqlServer;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -28,6 +29,20 @@ public void Array() {
 			var sql1111 = select.Where(a => inarray.Contains(a.testFieldInt)).ToList();
 			//var sql1122 = select.Where(a => inarray.Contains(a.testFieldInt) == false).ToList();
 			var sql1133 = select.Where(a => !inarray.Contains(a.testFieldInt)).ToList();
+
+			//in not in
+			var sql11111 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
+			//var sql11222 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt) == false).ToList();
+			var sql11333 = select.Where(a => !new List<int>() { 1, 2, 3 }.Contains(a.testFieldInt)).ToList();
+
+			var sql11111a = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt)).ToList();
+			//var sql11222b = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt) == false).ToList();
+			var sql11333c = select.Where(a => !new List<int>(new[] { 1, 2, 3 }).Contains(a.testFieldInt)).ToList();
+
+			var inarray2 = new List<int>() { 1, 2, 3 };
+			var sql111111 = select.Where(a => inarray.Contains(a.testFieldInt)).ToList();
+			//var sql112222 = select.Where(a => inarray.Contains(a.testFieldInt) == false).ToList();
+			var sql113333 = select.Where(a => !inarray.Contains(a.testFieldInt)).ToList();
 		}
 
 		[Table(Name = "tb_alltype")]

diff --git a/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs b/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs
@@ -1,5 +1,6 @@
 using FreeSql.DataAnnotations;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -23,6 +24,20 @@ public void Array() {
 			var sql1111 = select.Where(a => inarray.Contains(a.Int)).ToList();
 			//var sql1122 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
 			var sql1133 = select.Where(a => !inarray.Contains(a.Int)).ToList();
+
+			//in not in
+			var sql11111 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+			//var sql11222 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int) == false).ToList();
+			var sql11333 = select.Where(a => !new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+
+			var sql11111a = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+			//var sql11222b = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int) == false).ToList();
+			var sql11333c = select.Where(a => !new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+
+			var inarray2 = new List<int>() { 1, 2, 3 };
+			var sql111111 = select.Where(a => inarray.Contains(a.Int)).ToList();
+			//var sql112222 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
+			var sql113333 = select.Where(a => !inarray.Contains(a.Int)).ToList();
 		}
 
 		[Table(Name = "tb_alltype")]

diff --git a/FreeSql/MySql/MySqlExpression.cs b/FreeSql/MySql/MySqlExpression.cs
@@ -1,6 +1,7 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -21,15 +22,15 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 					if (objType?.FullName == "System.Byte[]") return null;
 
 					var argIndex = 0;
-					if (objType == null && callExp.Method.DeclaringType.FullName == typeof(Enumerable).FullName) {
+					if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable)) {
 						objExp = callExp.Arguments.FirstOrDefault();
 						objType = objExp?.Type;
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
 					if (objType != null) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray == true) {
+						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 							switch (callExp.Method.Name) {
 								case "Contains":
 									//判断 in
@@ -46,7 +47,27 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						if (a > 0) arrSb.Append(",");
 						arrSb.Append(getExp(arrExp.Expressions[a]));
 					}
+					if (arrSb.Length == 1) arrSb.Append("NULL");
 					return arrSb.Append(")").ToString();
+				case ExpressionType.ListInit:
+					var listExp = exp as ListInitExpression;
+					var listSb = new StringBuilder();
+					listSb.Append("(");
+					for (var a = 0; a < listExp.Initializers.Count; a++) {
+						if (listExp.Initializers[a].Arguments.Any() == false) continue;
+						if (a > 0) listSb.Append(",");
+						listSb.Append(getExp(listExp.Initializers[a].Arguments.FirstOrDefault()));
+					}
+					if (listSb.Length == 1) listSb.Append("NULL");
+					return listSb.Append(")").ToString();
+				case ExpressionType.New:
+					var newExp = exp as NewExpression;
+					if (typeof(IList).IsAssignableFrom(newExp.Type)) {
+						if (newExp.Arguments.Count == 0) return "(NULL)";
+						if (typeof(IEnumerable).IsAssignableFrom(newExp.Arguments[0].Type) == false) return "(NULL)";
+						return getExp(newExp.Arguments[0]);
+					}
+					return null;
 			}
 			return null;
 		}

diff --git a/FreeSql/Oracle/OracleExpression.cs b/FreeSql/Oracle/OracleExpression.cs
@@ -1,6 +1,7 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -21,15 +22,15 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 					if (objType?.FullName == "System.Byte[]") return null;
 
 					var argIndex = 0;
-					if (objType == null && callExp.Method.DeclaringType.FullName == typeof(Enumerable).FullName) {
+					if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable)) {
 						objExp = callExp.Arguments.FirstOrDefault();
 						objType = objExp?.Type;
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
 					if (objType != null) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray == true) {
+						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 							switch (callExp.Method.Name) {
 								case "Contains":
 									//判断 in
@@ -46,7 +47,27 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						if (a > 0) arrSb.Append(",");
 						arrSb.Append(getExp(arrExp.Expressions[a]));
 					}
+					if (arrSb.Length == 1) arrSb.Append("NULL");
 					return arrSb.Append(")").ToString();
+				case ExpressionType.ListInit:
+					var listExp = exp as ListInitExpression;
+					var listSb = new StringBuilder();
+					listSb.Append("(");
+					for (var a = 0; a < listExp.Initializers.Count; a++) {
+						if (listExp.Initializers[a].Arguments.Any() == false) continue;
+						if (a > 0) listSb.Append(",");
+						listSb.Append(getExp(listExp.Initializers[a].Arguments.FirstOrDefault()));
+					}
+					if (listSb.Length == 1) listSb.Append("NULL");
+					return listSb.Append(")").ToString();
+				case ExpressionType.New:
+					var newExp = exp as NewExpression;
+					if (typeof(IList).IsAssignableFrom(newExp.Type)) {
+						if (newExp.Arguments.Count == 0) return "(NULL)";
+						if (typeof(IEnumerable).IsAssignableFrom(newExp.Arguments[0].Type) == false) return "(NULL)";
+						return getExp(newExp.Arguments[0]);
+					}
+					return null;
 			}
 			return null;
 		}

diff --git a/FreeSql/PostgreSQL/PostgreSQLExpression.cs b/FreeSql/PostgreSQL/PostgreSQLExpression.cs
@@ -2,6 +2,7 @@
 using FreeSql.Internal.Model;
 using Newtonsoft.Json.Linq;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -26,15 +27,15 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 					if (objType?.FullName == "System.Byte[]") return null;
 
 					var argIndex = 0;
-					if (objType == null && callExp.Method.DeclaringType.FullName == typeof(Enumerable).FullName) {
+					if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable)) {
 						objExp = callExp.Arguments.FirstOrDefault();
 						objType = objExp?.Type;
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
 					if (objType != null) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray == true) {
+						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(')')}]";
@@ -141,7 +142,27 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						if (a > 0) arrSb.Append(",");
 						arrSb.Append(getExp(arrExp.Expressions[a]));
 					}
+					if (arrSb.Length == 1) arrSb.Append("NULL");
 					return arrSb.Append("]").ToString();
+				case ExpressionType.ListInit:
+					var listExp = exp as ListInitExpression;
+					var listSb = new StringBuilder();
+					listSb.Append("(");
+					for (var a = 0; a < listExp.Initializers.Count; a++) {
+						if (listExp.Initializers[a].Arguments.Any() == false) continue;
+						if (a > 0) listSb.Append(",");
+						listSb.Append(getExp(listExp.Initializers[a].Arguments.FirstOrDefault()));
+					}
+					if (listSb.Length == 1) listSb.Append("NULL");
+					return listSb.Append(")").ToString();
+				case ExpressionType.New:
+					var newExp = exp as NewExpression;
+					if (typeof(IList).IsAssignableFrom(newExp.Type)) {
+						if (newExp.Arguments.Count == 0) return "(NULL)";
+						if (typeof(IEnumerable).IsAssignableFrom(newExp.Arguments[0].Type) == false) return "(NULL)";
+						return getExp(newExp.Arguments[0]);
+					}
+					return null;
 			}
 			return null;
 		}

diff --git a/FreeSql/SqlServer/SqlServerExpression.cs b/FreeSql/SqlServer/SqlServerExpression.cs
@@ -1,6 +1,7 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -21,15 +22,15 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 					if (objType?.FullName == "System.Byte[]") return null;
 
 					var argIndex = 0;
-					if (objType == null && callExp.Method.DeclaringType.FullName == typeof(Enumerable).FullName) {
+					if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable)) {
 						objExp = callExp.Arguments.FirstOrDefault();
 						objType = objExp?.Type;
 						argIndex++;
 					}
 					if (objType == null) objType = callExp.Method.DeclaringType;
 					if (objType != null) {
 						var left = objExp == null ? null : getExp(objExp);
-						if (objType.IsArray == true) {
+						if (objType.IsArray || typeof(IList).IsAssignableFrom(callExp.Method.DeclaringType)) {
 							switch (callExp.Method.Name) {
 								case "Contains":
 									//判断 in
@@ -46,7 +47,27 @@ internal override string ExpressionLambdaToSqlOther(Expression exp, List<SelectT
 						if (a > 0) arrSb.Append(",");
 						arrSb.Append(getExp(arrExp.Expressions[a]));
 					}
+					if (arrSb.Length == 1) arrSb.Append("NULL");
 					return arrSb.Append(")").ToString();
+				case ExpressionType.ListInit:
+					var listExp = exp as ListInitExpression;
+					var listSb = new StringBuilder();
+					listSb.Append("(");
+					for (var a = 0; a < listExp.Initializers.Count; a++) {
+						if (listExp.Initializers[a].Arguments.Any() == false) continue;
+						if (a > 0) listSb.Append(",");
+						listSb.Append(getExp(listExp.Initializers[a].Arguments.FirstOrDefault()));
+					}
+					if (listSb.Length == 1) listSb.Append("NULL");
+					return listSb.Append(")").ToString();
+				case ExpressionType.New:
+					var newExp = exp as NewExpression;
+					if (typeof(IList).IsAssignableFrom(newExp.Type)) {
+						if (newExp.Arguments.Count == 0) return "(NULL)";
+						if (typeof(IEnumerable).IsAssignableFrom(newExp.Arguments[0].Type) == false) return "(NULL)";
+						return getExp(newExp.Arguments[0]);
+					}
+					return null;
 			}
 			return null;
 		}