diff --git a/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 80d85181f..3edcdf32f 100644 --- a/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -16,26 +16,102 @@ namespace SqlSugar } public partial class QueryableProvider : QueryableProvider, ISugarQueryable { - - } - public partial class QueryableProvider : QueryableProvider, ISugarQueryable - { - public new ISugarQueryable Where(Expression> expression) + #region Group + public ISugarQueryable GroupBy(Expression> expression) { - _Where(expression); + _GroupBy(expression); return this; } + + public ISugarQueryable GroupBy(Expression> expression) + { + _GroupBy(expression); + return this; + } + public new ISugarQueryable GroupBy(Expression> expression) + { + _GroupBy(expression); + return this; + } + #endregion + + #region Order + public ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc) + { + _OrderBy(expression); + return this; + } + + public ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc) + { + _OrderBy(expression); + return this; + } + public new ISugarQueryable OrderBy(Expression> expression, OrderByType type) + { + _OrderBy(expression); + return this; + } + #endregion + + #region Select + public ISugarQueryable Select(Expression> expression) + { + return _Select(expression); + } + public ISugarQueryable Select(Expression> expression) { return _Select(expression); } - public ISugarQueryable Where(Expression> expression) + public ISugarQueryable Where(Expression> expression) + { + _Where(expression); + return this; + } + #endregion + + #region Where + public ISugarQueryable Where(Expression> expression) { _Where(expression); return this; } + public new ISugarQueryable Where(Expression> expression) + { + _Where(expression); + return this; + } + + #endregion + + } + public partial class QueryableProvider : QueryableProvider, ISugarQueryable + { + #region Where + public new ISugarQueryable Where(Expression> expression) + { + _Where(expression); + return this; + } + public ISugarQueryable Where(Expression> expression) + { + _Where(expression); + return this; + } + #endregion + + #region Select + public ISugarQueryable Select(Expression> expression) + { + return _Select(expression); + } + + #endregion + + #region Order public ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc) { _OrderBy(expression, type); @@ -47,7 +123,9 @@ namespace SqlSugar _OrderBy(expression, type); return this; } + #endregion + #region GroupBy public new ISugarQueryable GroupBy(Expression> expression) { _GroupBy(expression); @@ -59,6 +137,7 @@ namespace SqlSugar _GroupBy(expression); return this; } + #endregion } public partial class QueryableProvider : QueryableAccessory, ISugarQueryable { diff --git a/SqlSugar/Interface/IQueryable.cs b/SqlSugar/Interface/IQueryable.cs index 2095191a9..839ef2660 100644 --- a/SqlSugar/Interface/IQueryable.cs +++ b/SqlSugar/Interface/IQueryable.cs @@ -109,17 +109,49 @@ namespace SqlSugar } public partial interface ISugarQueryable : ISugarQueryable { - new ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Select(Expression> expression); - new ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - new ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); + #region Where + new ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + #endregion + + #region Select + ISugarQueryable Select(Expression> expression); + #endregion + + #region OrderBy + new ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + #endregion + + #region GroupBy + new ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + #endregion } public partial interface ISugarQueryable : ISugarQueryable { + #region Where + new ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + #endregion + #region Select + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + #endregion + + #region OrderBy + new ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + #endregion + + #region GroupBy + new ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + #endregion } public partial interface ISugarQueryable : ISugarQueryable {