lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-05-04 20:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
sunkaixuan 2017-08-09 13:15:11 +08:00
parent 3d54765485
commit d50c720bc7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@ -398,6 +398,7 @@ namespace SqlSugar
public virtual int Count() public virtual int Count()
{ {
InitMapping(); InitMapping();
QueryBuilder.IsCount = true;
var sql = string.Empty; var sql = string.Empty;
sql = QueryBuilder.ToSqlString(); sql = QueryBuilder.ToSqlString();
sql = QueryBuilder.ToCountSql(sql); sql = QueryBuilder.ToCountSql(sql);

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

@ -249,9 +249,10 @@ namespace SqlSugar
var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", GetOrderByString); var rowNumberString = string.Format(",ROW_NUMBER() OVER({0}) AS RowIndex ", GetOrderByString);
string groupByValue = GetGroupByString + HavingInfos; string groupByValue = GetGroupByString + HavingInfos;
string orderByValue = (!isRowNumber && this.OrderByValue.IsValuable()) ? GetOrderByString : null; string orderByValue = (!isRowNumber && this.OrderByValue.IsValuable()) ? GetOrderByString : null;
if (this.IsCount) { orderByValue = null; }
sql.AppendFormat(SqlTemplate, GetSelectValue, GetTableNameString, GetWhereValueString, groupByValue, orderByValue); sql.AppendFormat(SqlTemplate, GetSelectValue, GetTableNameString, GetWhereValueString, groupByValue, orderByValue);
sql.Replace("{$:OrderByString:$}", isRowNumber ? (this.IsCount ? null : rowNumberString) : null); sql.Replace("{$:OrderByString:$}", isRowNumber ? (this.IsCount ? null : rowNumberString) : null);
if (IsCount) { return sql.ToString(); } if (this.IsCount) { return sql.ToString(); }
var result = ToPageSql(sql.ToString(), this.Take, this.Skip); var result = ToPageSql(sql.ToString(), this.Take, this.Skip);
if (ExternalPageIndex > 0) if (ExternalPageIndex > 0)
{ {
@ -335,7 +336,6 @@ namespace SqlSugar
{ {
get get
{ {
if (this.IsCount) return "COUNT(1) AS [Count] ";
string reval = string.Empty; string reval = string.Empty;
if (this.SelectValue == null || this.SelectValue is string) if (this.SelectValue == null || this.SelectValue is string)
{ {