weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-07 00:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 ISelectGroupingAggregate 自定义解析方法报错的问题；

Browse Source
This commit is contained in:
2881099
2025-02-25 21:20:07 +08:00
parent e55e70a15b
commit 58bb0667c3
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Examples/base_entity/Program.cs
View File

@@ -13,6 +13,7 @@ using NetTopologySuite.Geometries;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Npgsql; using Npgsql;
using Org.BouncyCastle.Tls;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Concurrent; using System.Collections.Concurrent;
@@ -620,6 +621,18 @@ namespace base_entity
BaseEntity.Initialization(fsql, () => _asyncUow.Value); BaseEntity.Initialization(fsql, () => _asyncUow.Value);
#endregion #endregion
var sql20250205 = fsql.Select<OrderLine, Product>()
.InnerJoin((l, p) => l.ProductId == p.ID)
.GroupBy((l, p) => new { p.ID, ShopType = l.ShopType ?? 0 })
.ToSql(x => new
{
TradeId = x.Key.ID,
ShopType = x.Key.ShopType,
FieldCount = x.CountDistinct(x.Value.Item2.ID),
Count = x.Count(x.Value.Item1.Id),
Kb = (long)x.Sum(x.Value.Item1.Amount)
});
var res = fsql.Select<MemberActionDayCountModel>() var res = fsql.Select<MemberActionDayCountModel>()
.Where(x => x.Date >= 20230101 && x.Date < 20240101 && x.ScanCode > 0) .Where(x => x.Date >= 20230101 && x.Date < 20240101 && x.ScanCode > 0)
.Where(x => .Where(x =>
@@ -3511,3 +3524,13 @@ public sealed class MemberActionDayCountModel
public decimal ScanCodeAmount { get; set; } public decimal ScanCodeAmount { get; set; }
#endregion #endregion
} }
[ExpressionCall]
public static class ExpressionCallExtesions
{
static ThreadLocal<ExpressionCallContext> context = new ThreadLocal<ExpressionCallContext>();
public static int CountDistinct<TKey, TValue>(this ISelectGroupingAggregate<TKey, TValue> that, object column)
{
context.Value.Result = $"count(distinct {context.Value.ParsedContent["column"]})";
return 0;
}
}

1
FreeSql/Internal/CommonExpression.cs
View File

@@ -2055,6 +2055,7 @@ namespace FreeSql.Internal
{ {
var expStackFirst = expStack.First() as ParameterExpression; var expStackFirst = expStack.First() as ParameterExpression;
var bidx = expStackFirst.Type.FullName.StartsWith("FreeSql.ISelectGroupingAggregate`") ? 2 : 1; //.Key .Value var bidx = expStackFirst.Type.FullName.StartsWith("FreeSql.ISelectGroupingAggregate`") ? 2 : 1; //.Key .Value
if (bidx == 2 && expStack.Count == 1) return ""; //不解析
var diyexpMembers = expStack.Where((a, b) => b >= bidx).ToArray(); var diyexpMembers = expStack.Where((a, b) => b >= bidx).ToArray();
if (diyexpMembers.Any() == false && diymemexp != null && diymemexp is Select0Provider.WithTempQueryParser tempQueryParser && tempQueryParser.GetOutsideSelectTable(expStackFirst) != null) if (diyexpMembers.Any() == false && diymemexp != null && diymemexp is Select0Provider.WithTempQueryParser tempQueryParser && tempQueryParser.GetOutsideSelectTable(expStackFirst) != null)
diyexpMembers = expStack.ToArray(); diyexpMembers = expStack.ToArray();