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

fix FromQuery 别名 bug

Browse Source
This commit is contained in:
2881099
2022-07-26 11:12:43 +08:00
parent cb842706ec
commit ce1fabd712
3 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
View File

@ -203,6 +203,8 @@ namespace FreeSql.Internal.CommonProvider
{
ParseExpMapResult = null;
ParseExpMatchedTable = GetOutsideSelectTable(members.FirstOrDefault()?.GetParameter());
if (ParseExpMatchedTable == null) return null;
var insideIndex = _outsideTable.FindIndex(a => a == ParseExpMatchedTable);
if (insideIndex == -1)
{
@ -226,14 +228,14 @@ namespace FreeSql.Internal.CommonProvider
}
public SelectTableInfo GetOutsideSelectTable(ParameterExpression parameterExp)
{
if (parameterExp == null) return _outsideTable[0];
if (parameterExp == null) return null;
var find = _outsideTable.Where(a => a.Parameter == parameterExp).ToArray();
if (find.Length == 1) return find[0];
find = _outsideTable.Where(a => a.Table.Type == parameterExp.Type).ToArray();
if (find.Length == 1) return find[0];
find = _outsideTable.Where(a => a.Alias == parameterExp.Name).ToArray();
if (find.Length == 1) return find[0];
return _outsideTable[0];
return null;
}
}