tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 Where(a => bool && id > 0) bool 未解析正确的 bug；

Browse Source 
> （之前大多数类似的表达都能解析，这次是一个特殊情况）
This commit is contained in:
28810
2019-11-17 21:01:49 +08:00
parent 1cb8bb92f0
commit 769c1f020c
12 changed files with 256 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FreeSql/Internal/CommonExpression.cs
View File

@ -420,7 +420,7 @@ namespace FreeSql.Internal
var left = ExpressionLambdaToSql(leftExp, tsc);
var leftMapColumn = SearchColumnByField(tsc._tables, tsc.currentTable, left);
var isLeftMapType = leftMapColumn != null && (leftMapColumn.Attribute.MapType != rightExp.Type || leftMapColumn.CsType != rightExp.Type);
var isLeftMapType = leftMapColumn != null && new[] { "AND", "OR" }.Contains(oper) == false && (leftMapColumn.Attribute.MapType != rightExp.Type || leftMapColumn.CsType != rightExp.Type);
ColumnInfo rightMapColumn = null;
var isRightMapType = false;
if (isLeftMapType) tsc.mapType = leftMapColumn.Attribute.MapType;
@ -435,7 +435,7 @@ namespace FreeSql.Internal
if (leftMapColumn == null)
{
rightMapColumn = SearchColumnByField(tsc._tables, tsc.currentTable, right);
isRightMapType = rightMapColumn != null && (rightMapColumn.Attribute.MapType != leftExp.Type || rightMapColumn.CsType != leftExp.Type);
isRightMapType = rightMapColumn != null && new[] { "AND", "OR" }.Contains(oper) == false && (rightMapColumn.Attribute.MapType != leftExp.Type || rightMapColumn.CsType != leftExp.Type);
if (isRightMapType)
{
tsc.mapType = rightMapColumn.Attribute.MapType;
@ -485,8 +485,10 @@ namespace FreeSql.Internal
break;
case "AND":
case "OR":
left = GetBoolString(left);
right = GetBoolString(right);
if (leftMapColumn != null) left = $"{left} = {formatSql(true, null)}";
else left = GetBoolString(left);
if (rightMapColumn != null) right = $"{right} = {formatSql(true, null)}";
else right = GetBoolString(right);
break;
}
tsc.mapType = null;