From 8951662a7e7edcf3f3f396ff1961ab423935cb84 Mon Sep 17 00:00:00 2001 From: 28810 <2881099@qq.com> Date: Thu, 9 Oct 2025 11:11:42 +0800 Subject: [PATCH] - fix: ClickHouse .LimitBy #2114 --- Examples/base_entity/Program.cs | 2 + FreeSql.DbContext/FreeSql.DbContext.xml | 8 -- FreeSql/FreeSql.xml | 109 ------------------ .../ClickHouseExtensions.cs | 7 +- .../Curd/ClickHouseSelect.cs | 4 +- 5 files changed, 10 insertions(+), 120 deletions(-) diff --git a/Examples/base_entity/Program.cs b/Examples/base_entity/Program.cs index b72229e1c..ee39eab1c 100644 --- a/Examples/base_entity/Program.cs +++ b/Examples/base_entity/Program.cs @@ -621,6 +621,8 @@ namespace base_entity BaseEntity.Initialization(fsql, () => _asyncUow.Value); #endregion + var skdkdk1 = fsql.Select().LimitBy2(a => a.Sort, 1).ToSql(); + fsql.Insert(new User1 { Nickname = "nickname11", Username = "username11", Description = "desc11" }).ExecuteAffrows(); Task.Run(async () => diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 7cc8aea60..9721afddf 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -764,13 +764,5 @@ - - - 批量注入 Repository，可以参考代码自行调整 - - - - - diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 8c2e57c49..767141eeb 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -1097,93 +1097,6 @@ - - - 动态创建实体类型 - - - - - 配置Class - - 类名 - 类标记的特性[Table(Name = "xxx")] [Index(xxxx)] - - - - - 获取类型构建器，可作为要构建的Type来引用 - - - - - 配置属性 - - 属性名称 - 属性类型 - 属性标记的特性-支持多个 - - - - - 配置属性 - - 属性名称 - 属性类型 - 该属性是否重写父类属性 - 属性标记的特性-支持多个 - - - - - 配置属性 - - 属性名称 - 属性类型 - 该属性是否重写父类属性 - 属性默认值 - 属性标记的特性-支持多个 - - - - - 配置父类 - - 父类类型 - - - - - Override属性 - - - - - - Emit动态创建出Class - Type - - - - - - Emit动态创建出Class - Type，不附带获取TableInfo - - - - - - 首字母小写 - - - - - - - 首字母大写 - - - - 获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 "" @@ -5990,28 +5903,6 @@ 对象池 - - - 动态构建Class Type - - - - - - 根据字典，创建 table 对应的实体对象 - - - - - - - - 根据实体对象，创建 table 对应的字典 - - - - - C#： that >= between && that <= and diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseExtensions.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseExtensions.cs index 2e4d0a7fc..8dbd81d74 100644 --- a/Providers/FreeSql.Provider.ClickHouse/ClickHouseExtensions.cs +++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseExtensions.cs @@ -34,7 +34,12 @@ public static partial class FreeSqlClickHouseGlobalExtensions try { s0p.InternalOrderBy(selector); - s0p._limitBy = $"LIMIT {(offset > 0 ? $"{offset}, " : "")}{limit} BY {s0p._orderby}"; + s0p._limitBy = s0p._orderby; + if (s0p._limitBy.StartsWith(" \r\nORDER BY ")) + s0p._limitBy = string.Concat( + $" \r\nLIMIT {(offset > 0 ? $"{offset}, " : "")}{limit} BY ", + s0p._limitBy.Substring(" \r\nORDER BY ".Length) + ); } finally { diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseSelect.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseSelect.cs index 58b617277..8b4cc58fe 100644 --- a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseSelect.cs +++ b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseSelect.cs @@ -119,7 +119,7 @@ namespace FreeSql.ClickHouse.Curd } sb.Append(_orderby); if (string.IsNullOrEmpty(_limitBy) == false) - sb.Append(" \r\n").Append(_limitBy); + sb.Append(_limitBy); if (_skip > 0 || _limit > 0) sb.Append(" \r\nLIMIT ").Append(Math.Max(0, _skip)).Append(",").Append(_limit > 0 ? _limit : -1); @@ -146,7 +146,7 @@ namespace FreeSql.ClickHouse.Curd public override ISelect From(Expression, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, ISelectFromExpression>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect.CopyData(this, ret, exp?.Parameters); return ret; } public override ISelect From(Expression, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, ISelectFromExpression>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect.CopyData(this, ret, exp?.Parameters); return ret; } public override ISelect From(Expression, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, ISelectFromExpression>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect.CopyData(this, ret, exp?.Parameters); return ret; } - public override string ToSql(string field = null) => ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm, _limitBy); + public override string ToSql(string field = null) => ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm, _limitBy, _sample); } class ClickHouseSelect : FreeSql.Internal.CommonProvider.Select2Provider where T2 : class {