lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-24 13:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Union all subquery bug

Browse Source
This commit is contained in:
sunkaixuna
2021-10-05 17:28:58 +08:00
parent c0d1026f2e
commit e04c742b39
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs
View File

@@ -154,6 +154,21 @@ namespace OrmTest
)) ))
.Select<ViewOrder>().ToList(); .Select<ViewOrder>().ToList();
var test16 = db.Queryable<Order>().Select(it => SqlFunc.SqlServer_DateDiff("day", DateTime.Now.AddDays(-1), DateTime.Now)).ToList(); var test16 = db.Queryable<Order>().Select(it => SqlFunc.SqlServer_DateDiff("day", DateTime.Now.AddDays(-1), DateTime.Now)).ToList();
var test17 =
db.Queryable<Order>()
.Select<Order>()
.MergeTable()
.Select(MergeTable => new ViewOrder()
{
Name = SqlFunc.Subqueryable<Order>().Where(s=>s.Id== MergeTable.Id).Select(s => s.Name)
}).ToList(); ;
var test18 = db.UnionAll(
db.Queryable<Order>() ,
db.Queryable<Order>()
)
.Select(it=>new ViewOrder(){
Name=SqlFunc.Subqueryable<Order>().Where(s=>s.Id==it.Id).Select(s=>s.Name)
}).ToList();
Console.WriteLine("#### Examples End ####"); Console.WriteLine("#### Examples End ####");
} }

5
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@@ -610,6 +610,11 @@ namespace SqlSugar
{ {
TableShortName = null; TableShortName = null;
} }
if (IsSingle() && result.Contains("unionTable") && result.Trim().EndsWith(" unionTable")&& TableShortName!=null)
{
result = result.Replace(" ) unionTable ", ") "+TableShortName);
TableShortName = null;
}
if (this.TableShortName.HasValue()) if (this.TableShortName.HasValue())
{ {
result += (TableShortName + UtilConstants.Space); result += (TableShortName + UtilConstants.Space);