tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 17:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix WithTempQuery + FromQuery AsTable bug

Browse Source
This commit is contained in:
2881099
2022-07-26 10:49:45 +08:00
parent 6870f92735
commit cb842706ec
3 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs
View File

@@ -559,6 +559,31 @@ WHERE ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02'))";
Assert.Equal(list06[1].remark, "remark05");
var sql061 = fsql.Select<TwoTablePartitionBy_User>()
.WithTempQuery(a => new
{
user = a,
rownum = SqlExt.RowNumber().Over().PartitionBy(a.Nickname).OrderBy(a.Id).ToValue()
})
.Where(a => a.rownum == 1)
.WithTempQuery(a => a.user)
.From<TwoTablePartitionBy_UserExt>()
.AsTable((type, old) => type == typeof(TwoTablePartitionBy_UserExt) ? old.Replace("TwoTablePartitionBy_", "") : old)
.InnerJoin((a, b) => a.Id == b.UserId)
.Where((a, b) => a.Nickname == "name03" || a.Nickname == "name02")
.ToSql((a, b) => new TwoTablePartitionBy_UserDto());
var assertSql061 = @"SELECT a.[Id] as1, b.[Remark] as2
FROM (
SELECT a.[Id], a.[Nickname]
FROM (
SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum]
FROM [TwoTablePartitionBy_User] a ) a
WHERE (a.[rownum] = 1) ) a
INNER JOIN [UserExt] b ON a.[Id] = b.[UserId]
WHERE ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02'))";
Assert.Equal(sql061, assertSql061);
var sql07 = fsql.Select<TwoTablePartitionBy_User>()
.WithTempQuery(a => new
{
@@ -855,6 +880,29 @@ GROUP BY a.[Nickname]";
Assert.Equal("name03", list12[2].Key.Nickname);
Assert.Equal(11, list12[2].sum1);
Assert.Equal(11, list12[2].sum2);
var sql13 = fsql.Select<TwoTablePartitionBy_User>().AsTable((_, old) => old.Replace("TwoTablePartitionBy_", ""))
.FromQuery(fsql.Select<TwoTablePartitionBy_UserExt>().AsTable((_, old) => old.Replace("TwoTablePartitionBy_", ""))
.Where(b => b.UserId > 0))
.LeftJoin((a, b) => a.Id == b.UserId)
.Where((a, b) => a.Id > 0 && b.UserId > 0)
.GroupBy((a, b) => new { a.Nickname })
.ToSql(g => new
{
g.Key,
sum1 = g.Sum(g.Value.Item1.Id),
sum2 = g.Sum(g.Value.Item2.UserId),
});
var assertSql13 = @"SELECT a.[Nickname], sum(a.[Id]) as1, sum(b.[UserId]) as2
FROM [User] a
LEFT JOIN (
SELECT a.[UserId], a.[Remark]
FROM [UserExt] a
WHERE (a.[UserId] > 0)) b ON a.[Id] = b.[UserId]
WHERE (a.[Id] > 0 AND b.[UserId] > 0)
GROUP BY a.[Nickname]";
Assert.Equal(sql13, assertSql13);
}
class TwoTablePartitionBy_User
{

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

@@ -873,9 +873,9 @@ namespace FreeSql.Internal.CommonProvider
_tableRules.Clear();
tableRule = (type, old) =>
{
var tbname = newTableRule(type, null);
if (tbname != null) return tbname;
return oldTableRule(type, old);
old = oldTableRule(type, old);
var newname = newTableRule(type, old);
return string.IsNullOrWhiteSpace(newname) ? old : newname;
};
}
if (tableRule != null) _tableRules.Add(tableRule);

20
FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs
View File

@@ -146,7 +146,25 @@ namespace FreeSql.Internal.CommonProvider
if (string.IsNullOrWhiteSpace(sql2))
sql2 = select2?.ToSql("*");
}
return ret.WithSql(null, $" \r\n{sql2}");
if (retsp._tableRules.Count > 0)
{
var tbrules = retsp._tableRules.ToList();
retsp._tableRules.Clear();
tbrules.ForEach(tbrule =>
{
var tbruler1 = tbrule(typeof(T1), retsp._tables[0].Table.DbName);
if (string.IsNullOrWhiteSpace(tbruler1) == false)
retsp._tableRules.Add((type, old) =>
{
if (type == typeof(T1)) return tbruler1;
if (type == typeof(T2)) return $"( \r\n{sql2})";
return old;
});
});
}
if (retsp._tableRules.Count == 0) ret.WithSql(null, $" \r\n{sql2}");
return ret;
}
public ISelectGrouping<TKey, T1> GroupBy<TKey>(Expression<Func<T1, TKey>> columns)