补充表达式解析 Equals 为 = #28

dotnetcore · Apr 4, 2019 · b1578f8 · b1578f8
1 parent 8b49dd8
commit b1578f8
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 2 deletions.
diff --git a/FreeSql.Tests/MySql/MySqlExpression/StringTest.cs b/FreeSql.Tests/MySql/MySqlExpression/StringTest.cs
@@ -32,6 +32,16 @@ class TestTypeParentInfo {
 
 			public List<TestTypeInfo> Types { get; set; }
 		}
+		class TestEqualsGuid {
+			public Guid id { get; set; }
+		}
+
+		[Fact]
+		public void Equals__() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.Equals("aaa")).ToList());
+			list.Add(g.sqlite.Select<TestEqualsGuid>().Where(a => a.id.Equals(Guid.Empty)).ToList());
+		}
 
 		[Fact]
 		public void Empty() {

diff --git a/FreeSql.Tests/Oracle/OracleExpression/StringTest.cs b/FreeSql.Tests/Oracle/OracleExpression/StringTest.cs
@@ -32,6 +32,17 @@ class TestTypeParentInfo {
 
 			public List<TestTypeInfo> Types { get; set; }
 		}
+		class TestEqualsGuid {
+			public Guid id { get; set; }
+		}
+
+		[Fact]
+		public void Equals__() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.Equals("aaa")).ToList());
+			list.Add(g.oracle.Select<TestEqualsGuid>().Where(a => a.id.Equals(Guid.Empty)).ToList());
+		}
+
 
 		[Fact]
 		public void Empty() {

diff --git a/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/StringTest.cs b/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/StringTest.cs
@@ -32,6 +32,17 @@ class TestTypeParentInfo {
 
 			public List<TestTypeInfo> Types { get; set; }
 		}
+		class TestEqualsGuid {
+			public Guid id { get; set; }
+		}
+
+		[Fact]
+		public void Equals__() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.Equals("aaa")).ToList());
+			list.Add(g.pgsql.Select<TestEqualsGuid>().Where(a => a.id.Equals(Guid.Empty)).ToList());
+		}
+
 
 		[Fact]
 		public void Empty() {

diff --git a/FreeSql.Tests/SqlServer/SqlServerExpression/StringTest.cs b/FreeSql.Tests/SqlServer/SqlServerExpression/StringTest.cs
@@ -41,6 +41,16 @@ class TestTypeParentInfo {
 
 			public List<TestTypeInfo> Types { get; set; }
 		}
+		class TestEqualsGuid {
+			public Guid id { get; set; }
+		}
+
+		[Fact]
+		public void Equals__() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.Equals("aaa")).ToList());
+			list.Add(_sqlserverFixture.SqlServer.Select<TestEqualsGuid>().Where(a => a.id.Equals(Guid.Empty)).ToList());
+		}
 
 		[Fact]
 		public void Empty() {

diff --git a/FreeSql.Tests/Sqlite/SqliteExpression/StringTest.cs b/FreeSql.Tests/Sqlite/SqliteExpression/StringTest.cs
@@ -32,6 +32,16 @@ class TestTypeParentInfo {
 
 			public List<TestTypeInfo> Types { get; set; }
 		}
+		class TestEqualsGuid {
+			public Guid id { get; set; }
+		}
+
+		[Fact]
+		public void Equals__() {
+			var list = new List<object>();
+			list.Add(select.Where(a => a.Title.Equals("aaa")).ToList());
+			list.Add(g.sqlite.Select<TestEqualsGuid>().Where(a => a.id.Equals(Guid.Empty)).ToList());
+		}
 
 		[Fact]
 		public void Empty() {

diff --git a/FreeSql.Tests/g.cs b/FreeSql.Tests/g.cs
@@ -50,7 +50,7 @@ public class g {
 				Console.WriteLine(traceLog);
 			}) //监听SQL命令对象，在执行后
 		.Build());
-	public static IFreeSql oracle = oracleLazy.Value;
+	public static IFreeSql oracle => oracleLazy.Value;
 
 	static Lazy<IFreeSql> sqliteLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
 		.UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\document.db;Attachs=xxxtb.db;Pooling=true;Max Pool Size=10")
@@ -64,5 +64,5 @@ public class g {
 				Console.WriteLine(traceLog);
 			}) //监听SQL命令对象，在执行后
 		.Build());
-	public static IFreeSql sqlite = sqliteLazy.Value;
+	public static IFreeSql sqlite => sqliteLazy.Value;
 }
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
@@ -306,6 +306,18 @@ internal string ExpressionLambdaToSql(Expression exp, List<SelectTableInfo> _tab
 					return $"case when {ExpressionLambdaToSql(condExp.Test, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName, isDisableDiyParse, style)} then {ExpressionLambdaToSql(condExp.IfTrue, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName, isDisableDiyParse, style)} else {ExpressionLambdaToSql(condExp.IfFalse, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName, isDisableDiyParse, style)} end";
 				case ExpressionType.Call:
 					var exp3 = exp as MethodCallExpression;
+					if (exp3.Method.Name == "Equals" && exp3.Object != null && exp3.Arguments.Count > 0) {
+						var tmptryoper = "=";
+						var tmpleft = ExpressionLambdaToSql(exp3.Object, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName, isDisableDiyParse, style);
+						var tmpright = ExpressionLambdaToSql(exp3.Arguments[0], _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName, isDisableDiyParse, style);
+						if (tmpleft == "NULL") {
+							var tmp33 = tmpright;
+							tmpright = tmpleft;
+							tmpleft = tmp33;
+						}
+						if (tmpright == "NULL") tmptryoper = " IS ";
+						return $"{tmpleft}{tmptryoper}{tmpright}";
+					}
 					var callType = exp3.Object?.Type ?? exp3.Method.DeclaringType;
 					switch (callType.FullName) {
 						case "System.String": return ExpressionLambdaToSqlCallString(exp3, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName, isDisableDiyParse, style);