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

- 修复 Ado.Query 查询字段重复时报错；#162 #165 #161 - 增加 FreeSql.Provider.MsAccess 支持 Access 数据库操作，已通过 2003/2007 版本测试；

Browse Source
This commit is contained in:
28810
2019-12-24 06:16:52 +08:00
parent d5ed1c8a30
commit a92c279c72
69 changed files with 10380 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/Curd/MySqlSelectTest.cs
View File

@ -1025,6 +1025,83 @@ WHERE (((cast(a.`Id` as char)) in (SELECT b.`Title`
a.Id,
a.Clicks
});
var sqltmp12 = g.mysql.Select<WF_Task>()
.Where(t => t.IsFinished && (t.AuditorId == "1" || t.AuditorId == "1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3"))
.GroupBy(t => new { t.ProcessId, t.NodeId, t.NodeName })
.ToSql(t => new WF_TaskGroupBy
{
TaskId = t.Max(t.Value.Id),
TaskType = t.Max(t.Value.Type),
ProcessId = t.Key.ProcessId,
NodeId = t.Key.NodeId,
NodeName = t.Key.NodeName
}, FieldAliasOptions.AsProperty);
var groupsql12 = g.mysql.Select<WF_TaskGroupBy, WF_ProcessInstance>()
.AsTable((type, old) => type == typeof(WF_TaskGroupBy) ? $"( {sqltmp12} )" : null)
.LeftJoin((a, p) => p.Id == a.ProcessId)
.Where((a, p) => (p.IsFinished || a.TaskType == 3) && p.EnabledMark)
.ToSql((a, p) => new
{
WF_Task = a,
WF_ProcessInstance = p
});
Assert.Equal(@"SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
FROM `WF_Task` a
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName`", sqltmp12);
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
FROM ( SELECT max(a.`Id`) TaskId, max(a.`Type`) TaskType, a.`ProcessId` ProcessId, a.`NodeId` NodeId, a.`NodeName` NodeName
FROM `WF_Task` a
WHERE (a.`IsFinished` = 1 AND (a.`AuditorId` = '1' OR a.`AuditorId` = '1cb71584-a6dd-4b26-8c88-ed9fb8cf87a3'))
GROUP BY a.`ProcessId`, a.`NodeId`, a.`NodeName` ) a
LEFT JOIN `WF_ProcessInstance` b ON b.`Id` = a.`ProcessId`
WHERE ((b.`IsFinished` OR a.`TaskType` = 3) AND b.`EnabledMark` = 1)", groupsql12);
var grouplist12 = g.mysql.Select<WF_TaskGroupBy, WF_ProcessInstance>()
.AsTable((type, old) => $"( {sqltmp12} )")
.LeftJoin((a, p) => p.Id == a.ProcessId)
.Where((a, p) => (p.IsFinished || a.TaskType == 3) && p.EnabledMark)
.ToList((a, p) => new
{
WF_Task = a,
WF_ProcessInstance = p
});
}
[Table(DisableSyncStructure = true)]
class WF_TaskGroupBy
{
public int TaskId { get; set; }
public int TaskType { get; set; }
public int ProcessId { get; set; }
public int NodeId { get; set; }
public string NodeName { get; set; }
}
class WF_Task
{
[Column(IsIdentity = true)]
public int Id { get; set; }
public int Type { get; set; }
public int ProcessId { get; set; }
public int NodeId { get; set; }
public string NodeName { get; set; }
public string AuditorId { get; set; }
public DateTime CreateTime { get; set; }
public bool IsFinished { get; set; }
}
class WF_ProcessInstance
{
[Column(IsIdentity = true)]
public int Id { get; set; }
public int TaskType { get; set; }
public int ProcessId { get; set; }
public int NodeId { get; set; }
public DateTime CreateTime { get; set; }
public bool IsFinished { get; set; }
public bool EnabledMark { get; set; }
}
public class TestInclude_OneToManyModel1