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

- 优化 WithTempQuery 场景的 DTO 映射查询；

Browse Source
This commit is contained in:
2881099
2023-02-28 14:41:03 +08:00
parent 4a2f9eb77e
commit 24b5c265b9
6 changed files with 195 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FreeSql.Tests/FreeSql.Tests/Internal/UtilsTest.cs
View File

@ -23,7 +23,7 @@ namespace FreeSql.Tests.Internal
(name, type, value) =>
{
if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };
var ret = new SqlParameter { ParameterName = name, Value = value };
return ret;
});
Assert.Single(ps);
@ -39,7 +39,7 @@ namespace FreeSql.Tests.Internal
(name, type, value) =>
{
if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };
var ret = new SqlParameter { ParameterName = name, Value = value };
return ret;
});
Assert.Single(ps2);
@ -55,7 +55,7 @@ namespace FreeSql.Tests.Internal
Func<string, Type, object, DbParameter> constructorParamter = (name, type, value) =>
{
if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };
var ret = new SqlParameter { ParameterName = name, Value = value };
return ret;
};

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

@ -9,7 +9,83 @@ namespace FreeSql.Tests.SqlServer
{
public class SqlServerSelectWithTempQueryTest
{
#region issues #1215
[Fact]
public void IssuesWithTempQueryAndDto()
{
var fsql = g.sqlserver;
var lpsPgi = fsql.Select<UnitLog, LoadPlan, Instruction>()
.InnerJoin((a, b, c) => a.LoadNo == b.LoadNo && a.UnitTransactionType == "TO")
.InnerJoin((a, b, c) => b.InstructionNo == c.InstructionNo)
.WithTempQuery((a, b, c) => new
{
a.LoadNo,
a.SeqNoLog,
c.DeliveryInstractionStatus,
c.UpTime,
RN = SqlExt.RowNumber().Over().PartitionBy(a.UnitId).OrderByDescending(a.SeqNoLog).ToValue()
});
var sql = fsql.Select<UnitLog>()
.FromQuery(lpsPgi)
.InnerJoin((a, b) => a.SeqNoLog == b.SeqNoLog)
.WithTempQuery((a, b) => new { Item1 = a, Item2 = b })
.From<Unit>()
.InnerJoin((a, b) => a.Item1.UnitId == b.UnitId)
.Where((a, b) => a.Item2.RN < 2)
.ToSql((a, b) => new MB51_View
{
//CkassIfCation = a.Item1.CkassIfCation,
PGI = a.Item2.DeliveryInstractionStatus,
PGITime = a.Item2.UpTime,
IsDelayPGI = true,
RunNo = b.RunNo
});
Assert.Equal(@"SELECT a.[CkassIfCation] as1, a.[DeliveryInstractionStatus] as2, a.[UpTime] as3, 1 as4, b.[RunNo] as5
FROM (
SELECT a.[UnitId], a.[LoadNo], a.[UnitTransactionType], a.[SeqNoLog], a.[CkassIfCation], b.[LoadNo] [LoadNo2], b.[SeqNoLog] [SeqNoLog2], b.[DeliveryInstractionStatus], b.[UpTime], b.[RN]
FROM [UnitLog] a
INNER JOIN (
SELECT a.[LoadNo], a.[SeqNoLog], c.[DeliveryInstractionStatus], c.[UpTime], row_number() over( partition by a.[UnitId] order by a.[SeqNoLog] desc) [RN]
FROM [UnitLog] a
INNER JOIN [LoadPlan] b ON a.[LoadNo] = b.[LoadNo] AND a.[UnitTransactionType] = N'TO'
INNER JOIN [Instruction] c ON b.[InstructionNo] = c.[InstructionNo] ) b ON a.[SeqNoLog] = b.[SeqNoLog] ) a
INNER JOIN [Unit] b ON a.[UnitId] = b.[UnitId]
WHERE (a.[RN] < 2)", sql);
}
class MB51_View
{
public string CkassIfCation { get; set; }
public string PGI { get; set; }
public DateTime PGITime { get; set; }
public bool IsDelayPGI { get; set; }
public string RunNo { get; set; }
}
class Unit
{
public string UnitId { get; set; }
public string RunNo { get; set; }
public string CkassIfCation { get; set; }
}
class UnitLog
{
public string UnitId { get; set; }
public string LoadNo { get; set; }
public string UnitTransactionType { get; set; }
public string SeqNoLog { get; set; }
public string CkassIfCation { get; set; }
}
class LoadPlan
{
public string LoadNo { get; set; }
public string InstructionNo { get; set; }
}
class Instruction
{
public string InstructionNo { get; set; }
public string DeliveryInstractionStatus { get; set; }
public DateTime UpTime { get; set; }
}
[Fact]
public void IssuesParameter01()
@ -49,13 +125,15 @@ INNER JOIN [QLR_TO_LSH] b ON a.[BBH] = b.[BBH] AND b.[QLRZJHM] = N'qlrzjh' AND b
.First();
}
}
class QLR_TO_LSH
class QLR_TO_LSH
{
public string QLRZJHM { get; set; }
public string QZH { get; set; }
public int BBH { get; set; }
}
#region issues #1215
[Fact]
public void VicDemo20220815()
{
@ -1275,7 +1353,7 @@ WHERE ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02'))";
.InnerJoin((a, b) => a.user.Id == b.UserId)
.Where((a, b) => a.user.Nickname == "name03" || a.user.Nickname == "name02")
.ToSql((a, b) => new TwoTablePartitionBy_UserDto());
var assertSql08 = @"SELECT a.[rownum] as1, b.[Remark] as2
var assertSql08 = @"SELECT a.[Id] as1, a.[rownum] as2, b.[Remark] as3
FROM (
SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum]
FROM [TwoTablePartitionBy_User] a ) a
@ -1298,10 +1376,10 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.ToList<TwoTablePartitionBy_UserDto>();
Assert.Equal(list08.Count, 2);
Assert.Equal(list08[0].rownum, 1);
Assert.Equal(list08[0].Id, 0);
Assert.Equal(list08[0].Id, 4);
Assert.Equal(list08[0].remark, "remark04");
Assert.Equal(list08[1].rownum, 1);
Assert.Equal(list08[1].Id, 0);
Assert.Equal(list08[1].Id, 5);
Assert.Equal(list08[1].remark, "remark05");
@ -1316,7 +1394,7 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.InnerJoin((a, b) => a.user.Id == b.UserId)
.Where((a, b) => a.user.Nickname == "name03" || a.user.Nickname == "name02")
.ToSql((a, b) => new TwoTablePartitionBy_UserDto());
var assertSql09 = @"SELECT a.[rownum] as1, b.[Remark] as2
var assertSql09 = @"SELECT a.[Id] as1, a.[rownum] as2, b.[Remark] as3
FROM (
SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum]
FROM [TwoTablePartitionBy_User] a ) a
@ -1339,10 +1417,10 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.ToList<TwoTablePartitionBy_UserDto>();
Assert.Equal(list09.Count, 2);
Assert.Equal(list09[0].rownum, 1);
Assert.Equal(list09[0].Id, 0);
Assert.Equal(list09[0].Id, 4);
Assert.Equal(list09[0].remark, "remark04");
Assert.Equal(list09[1].rownum, 1);
Assert.Equal(list09[1].Id, 0);
Assert.Equal(list09[1].Id, 5);
Assert.Equal(list09[1].remark, "remark05");
@ -1357,7 +1435,7 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.InnerJoin((a, b) => a.user.Id == b.UserId)
.Where((a, b) => a.user.Nickname == "name03" || a.user.Nickname == "name02")
.ToSql((a, b) => new TwoTablePartitionBy_UserDto());
var assertSql091 = @"SELECT a.[rownum] as1, b.[Remark] as2
var assertSql091 = @"SELECT a.[Id] as1, a.[rownum] as2, b.[Remark] as3
FROM (
SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum]
FROM [TwoTablePartitionBy_User] a ) a
@ -1381,10 +1459,10 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.ToList<TwoTablePartitionBy_UserDto>();
Assert.Equal(list091.Count, 2);
Assert.Equal(list091[0].rownum, 1);
Assert.Equal(list091[0].Id, 0);
Assert.Equal(list091[0].Id, 4);
Assert.Equal(list091[0].remark, "remark04");
Assert.Equal(list091[1].rownum, 1);
Assert.Equal(list091[1].Id, 0);
Assert.Equal(list091[1].Id, 5);
Assert.Equal(list091[1].remark, "remark05");
@ -1399,7 +1477,7 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.InnerJoin((a, b) => a.user.Id == b.Key.UserId)
.Where((a, b) => a.user.Nickname == "name03" || a.user.Nickname == "name02")
.ToSql((a, b) => new TwoTablePartitionBy_UserDto());
var assertSql10 = @"SELECT a.[rownum] as1
var assertSql10 = @"SELECT a.[Id] as1, a.[rownum] as2, b.[Remark] as3
FROM (
SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum]
FROM [TwoTablePartitionBy_User] a ) a
@ -1423,11 +1501,11 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.ToList<TwoTablePartitionBy_UserDto>();
Assert.Equal(list10.Count, 2);
Assert.Equal(list10[0].rownum, 1);
Assert.Equal(list10[0].Id, 0);
Assert.Null(list10[0].remark);
Assert.Equal(list10[0].Id, 4);
Assert.Equal(list10[0].remark, "remark04");
Assert.Equal(list10[1].rownum, 1);
Assert.Equal(list10[1].Id, 0);
Assert.Null(list10[1].remark);
Assert.Equal(list10[1].Id, 5);
Assert.Equal(list10[1].remark, "remark05");
var sql11 = fsql.Select<TwoTablePartitionBy_User>()
@ -1441,7 +1519,7 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.InnerJoin((a, b) => a.user.Id == b.uid)
.Where((a, b) => a.user.Nickname == "name03" || a.user.Nickname == "name02")
.ToSql((a, b) => new TwoTablePartitionBy_UserDto());
var assertSql11 = @"SELECT a.[rownum] as1
var assertSql11 = @"SELECT a.[Id] as1, a.[rownum] as2
FROM (
SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum]
FROM [TwoTablePartitionBy_User] a ) a
@ -1465,11 +1543,11 @@ WHERE (a.[rownum] = 1) AND ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02
.ToList<TwoTablePartitionBy_UserDto>();
Assert.Equal(list11.Count, 2);
Assert.Equal(list11[0].rownum, 1);
Assert.Equal(list11[0].Id, 0);
Assert.Equal(list11[0].Id, 4);
Assert.Null(list11[0].remark);
Assert.Equal(list11[1].rownum, 1);
Assert.Equal(list11[1].Id, 0);
Assert.Null(list11[1].remark);
Assert.Equal(list11[1].Id, 5);
Assert.Null(list11[0].remark);
var sql12 = fsql.Select<TwoTablePartitionBy_User>()

12
FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs
View File

@ -28,7 +28,7 @@ namespace FreeSql.Tests.SqliteExpression
}.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a
WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t1);
WHERE ((('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10)))", t1);
var t2 = fsql.Select<ArrayAny01>().Where(a => new[] {
new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@ -36,7 +36,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t1);
}.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a
WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t2);
WHERE ((('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10)))", t2);
var aa03 = new[] {
new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@ -44,7 +44,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name
var t3 = fsql.Select<ArrayAny01>().Where(a => aa03.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a
WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t3);
WHERE ((('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10)))", t3);
var aa04 = new[] {
new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@ -53,7 +53,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t3);
var t4 = fsql.Select<ArrayAny01>().Where(a => aa04.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a
WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t4);
WHERE ((('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10)))", t4);
// List
@ -63,7 +63,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name
var t5 = fsql.Select<ArrayAny01>().Where(a => aa05.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a
WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t5);
WHERE ((('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10)))", t5);
var aa06 = new List<ArrayAny02> {
new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@ -72,7 +72,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t5);
var t6 = fsql.Select<ArrayAny01>().Where(a => aa06.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a
WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t6);
WHERE ((('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10)))", t6);
}
class ArrayAny01
{