Skip to content

Commit ede456f

Browse files
2881028810
authored andcommitted
update tests
1 parent 3c812d4 commit ede456f

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlSelectTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,12 +1126,12 @@ public void AsTable()
11261126
WF_ProcessInstance = p
11271127
});
11281128

1129-
Assert.Equal(@"SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
1129+
Assert.Equal(@"SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId`, a.`NodeId`, a.`NodeName`
11301130
FROM `WF_Task` a
11311131
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
11321132
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName`", sqltmp12);
11331133
Assert.Equal(@"SELECT a.`TaskId` as1, a.`TaskType` as2, a.`ProcessId` as3, a.`NodeId` as4, a.`NodeName` as5, b.`Id` as6, b.`TaskType` as7, b.`ProcessId` as8, b.`NodeId` as9, b.`CreateTime` as10, b.`IsFinished` as11, b.`EnabledMark` as12
1134-
FROM ( SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
1134+
FROM ( SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId`, a.`NodeId`, a.`NodeName`
11351135
FROM `WF_Task` a
11361136
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
11371137
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName` ) a

FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlSelectTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,12 +1137,12 @@ public void AsTable()
11371137
WF_ProcessInstance = p
11381138
});
11391139

1140-
Assert.Equal(@"SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
1140+
Assert.Equal(@"SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId`, a.`NodeId`, a.`NodeName`
11411141
FROM `WF_Task` a
11421142
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
11431143
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName`", sqltmp12);
11441144
Assert.Equal(@"SELECT a.`TaskId` as1, a.`TaskType` as2, a.`ProcessId` as3, a.`NodeId` as4, a.`NodeName` as5, b.`Id` as6, b.`TaskType` as7, b.`ProcessId` as8, b.`NodeId` as9, b.`CreateTime` as10, b.`IsFinished` as11, b.`EnabledMark` as12
1145-
FROM ( SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
1145+
FROM ( SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId`, a.`NodeId`, a.`NodeName`
11461146
FROM `WF_Task` a
11471147
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
11481148
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName` ) a

FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlSelectTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,12 +1168,12 @@ public void AsTable()
11681168
});
11691169

11701170
Assert.Equal(@"SELECT a.`Id` as1, a.`Clicks` as2
1171-
FROM (SELECT * from (SELECT a.`Id` Id, a.`Clicks` Clicks
1171+
FROM (SELECT * from (SELECT a.`Id`, a.`Clicks`
11721172
FROM `tb_topic_1` a) ftb
11731173
11741174
UNION ALL
11751175
1176-
SELECT * from (SELECT a.`Id` Id, a.`Clicks` Clicks
1176+
SELECT * from (SELECT a.`Id`, a.`Clicks`
11771177
FROM `tb_topic_2` a) ftb) a
11781178
limit 0,20", select
11791179
.AsTable((type, old) => type == typeof(Topic) ? $"({sqlsss})" : null)
@@ -1206,12 +1206,12 @@ UNION ALL
12061206
WF_ProcessInstance = p
12071207
});
12081208

1209-
Assert.Equal(@"SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
1209+
Assert.Equal(@"SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId`, a.`NodeId`, a.`NodeName`
12101210
FROM `WF_Task` a
12111211
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
12121212
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName`", sqltmp12);
12131213
Assert.Equal(@"SELECT a.`TaskId` as1, a.`TaskType` as2, a.`ProcessId` as3, a.`NodeId` as4, a.`NodeName` as5, b.`Id` as6, b.`TaskType` as7, b.`ProcessId` as8, b.`NodeId` as9, b.`CreateTime` as10, b.`IsFinished` as11, b.`EnabledMark` as12
1214-
FROM ( SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
1214+
FROM ( SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId`, a.`NodeId`, a.`NodeName`
12151215
FROM `WF_Task` a
12161216
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
12171217
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName` ) a

FreeSql.Tests/FreeSql.Tests/MySql/MySqlDbFirstTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ public void GetTableByName()
3232
Assert.Equal(t1.Columns.Count, t2.Columns.Count);
3333
var t3 = fsql.DbFirst.GetTableByName("notexists_tb");
3434
Assert.Null(t3);
35+
36+
var t11 = fsql.DbFirst.GetTableByName("blog");
37+
3538
}
3639

3740
[Fact]

FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleSelectTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,10 +909,10 @@ public void Avg()
909909
Assert.Equal(@"SELECT a.""ID"" as1, a.""CLICKS"" as2, a.""TYPEGUID"" as3, a.""TITLE"" as4, a.""CREATETIME"" as5, (SELECT avg(b.""ID"")
910910
FROM ""TB_TOPIC22"" b) as6
911911
FROM ""TB_TOPIC22"" a", subquery);
912-
var subqueryList = select.Limit(100).ToList(a => new
912+
var subqueryList = select.Limit(10).ToList(a => new
913913
{
914914
all = a,
915-
count = select.As("b").Avg(b => b.Id)
915+
count = select.As("b").Limit(10).Avg(b => b.Id)
916916
});
917917
}
918918
[Fact]

0 commit comments

Comments
 (0)