- 修复 pgsql 表达式解析 Contains ilike 判断；

28810 · 28810 · commit 2565dbd8194b · 2020-07-24T23:46:22.000+08:00
diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs
@@ -334,7 +334,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (exp.Arguments.Count > 1)
                         {
                             if (exp.Arguments[1].Type == typeof(bool) ||
-                                exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";
+                                exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text || '%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' || ({args0Value})::text)")}";
diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs
@@ -356,7 +356,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (exp.Arguments.Count > 1)
                         {
                             if (exp.Arguments[1].Type == typeof(bool) ||
-                                exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";
+                                exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text || '%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' || ({args0Value})::text)")}";
diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs
@@ -387,7 +387,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (exp.Arguments.Count > 1)
                         {
                             if (exp.Arguments[1].Type == typeof(bool) ||
-                                exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";
+                                exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text || '%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' || ({args0Value})::text)")}";
diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs
@@ -317,7 +317,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,
                         if (exp.Arguments.Count > 1)
                         {
                             if (exp.Arguments[1].Type == typeof(bool) ||
-                                exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";
+                                exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";
                         }
                         if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text || '%')")}";
                         if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' || ({args0Value})::text)")}";

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,`
`334`	`334`	`if (exp.Arguments.Count > 1)`
`335`	`335`	`{`
`336`	`336`	`if (exp.Arguments[1].Type == typeof(bool) \|\|`
`337`		`- exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";`
	`337`	`+ exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";`
`338`	`338`	`}`
`339`	`339`	`if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text \|\| '%')")}";`
`340`	`340`	`if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' \|\| ({args0Value})::text)")}";`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,`
`356`	`356`	`if (exp.Arguments.Count > 1)`
`357`	`357`	`{`
`358`	`358`	`if (exp.Arguments[1].Type == typeof(bool) \|\|`
`359`		`- exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";`
	`359`	`+ exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";`
`360`	`360`	`}`
`361`	`361`	`if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text \|\| '%')")}";`
`362`	`362`	`if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' \|\| ({args0Value})::text)")}";`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,`
`387`	`387`	`if (exp.Arguments.Count > 1)`
`388`	`388`	`{`
`389`	`389`	`if (exp.Arguments[1].Type == typeof(bool) \|\|`
`390`		`- exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";`
	`390`	`+ exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";`
`391`	`391`	`}`
`392`	`392`	`if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text \|\| '%')")}";`
`393`	`393`	`if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' \|\| ({args0Value})::text)")}";`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp,`
`317`	`317`	`if (exp.Arguments.Count > 1)`
`318`	`318`	`{`
`319`	`319`	`if (exp.Arguments[1].Type == typeof(bool) \|\|`
`320`		`- exp.Arguments[1].Type == typeof(StringComparison) && getExp(exp.Arguments[0]).Contains("IgnoreCase")) likeOpt = "ILIKE";`
	`320`	`+ exp.Arguments[1].Type == typeof(StringComparison)) likeOpt = "ILIKE";`
`321`	`321`	`}`
`322`	`322`	`if (exp.Method.Name == "StartsWith") return $"({left}) {likeOpt} {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"(({args0Value})::text \|\| '%')")}";`
`323`	`323`	`if (exp.Method.Name == "EndsWith") return $"({left}) {likeOpt} {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"('%' \|\| ({args0Value})::text)")}";`