diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs index 409acd5b1..9d92cd5e7 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/AdoProvider/AdoProvider.cs @@ -352,7 +352,7 @@ namespace SqlSugar ExecuteBefore(sql, parameters); IDbCommand sqlCommand = GetCommand(sql, parameters); object scalar = sqlCommand.ExecuteScalar(); - scalar = (scalar == null ? 0 : scalar); + //scalar = (scalar == null ? 0 : scalar); if (this.IsClearParameters) sqlCommand.Parameters.Clear(); ExecuteAfter(sql, parameters); @@ -730,7 +730,7 @@ namespace SqlSugar private void SetConnectionEnd(string sql) { - if (this.IsMasterSlaveSeparation && IsRead(sql)) + if (this.IsMasterSlaveSeparation && IsRead(sql)&&this.Transaction==null) { this.Connection = this.MasterConnection; this.Context.CurrentConnectionConfig.ConnectionString = this.MasterConnection.ConnectionString; diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs index 67e17c8b2..8904fb6b2 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DbBindProvider/DbBindProvider.cs @@ -140,7 +140,7 @@ namespace SqlSugar public virtual string GetPropertyTypeName(string dbTypeName) { dbTypeName = dbTypeName.ToLower(); - var propertyTypes = MappingTypes.Where(it => it.Key.Equals(dbTypeName,StringComparison.CurrentCultureIgnoreCase)); + var propertyTypes = MappingTypes.Where(it => it.Key.Equals(dbTypeName, StringComparison.CurrentCultureIgnoreCase)); if (dbTypeName == "int32") { return "int"; @@ -161,6 +161,10 @@ namespace SqlSugar { return "string"; } + else if (dbTypeName.IsContainsIn("boolean", "bool")) + { + return "bool"; + } else if (propertyTypes == null || propertyTypes.Count() == 0) { Check.ThrowNotSupportedException(string.Format(" \"{0}\" Type NotSupported, DbBindProvider.GetPropertyTypeName error.", dbTypeName)); diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs index 26a68a642..9d07e8fef 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -28,6 +28,7 @@ namespace SqlSugar string sql = DeleteBuilder.ToSqlString(); var paramters = DeleteBuilder.Parameters == null ? null : DeleteBuilder.Parameters.ToArray(); RestoreMapping(); + AutoRemoveDataCache(); return Db.ExecuteCommand(sql, paramters); } public bool ExecuteCommandHasChange() @@ -270,6 +271,17 @@ namespace SqlSugar } } + private void AutoRemoveDataCache() + { + var moreSetts = this.Context.CurrentConnectionConfig.MoreSettings; + var extService = this.Context.CurrentConnectionConfig.ConfigureExternalServices; + if (moreSetts != null && moreSetts.IsAutoRemoveDataCache && extService != null && extService.DataInfoCacheService != null) + { + this.RemoveDataCache(); + } + } + + private IDeleteable CopyDeleteable() { var asyncContext = this.Context.Utilities.CopyContext(true); diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index fc8d75d51..92a12641c 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -32,6 +32,7 @@ namespace SqlSugar { InsertBuilder.IsReturnIdentity = false; PreToSql(); + AutoRemoveDataCache(); string sql = InsertBuilder.ToSqlString(); RestoreMapping(); return Ado.ExecuteCommand(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()); @@ -41,6 +42,7 @@ namespace SqlSugar { InsertBuilder.IsReturnIdentity = true; PreToSql(); + AutoRemoveDataCache(); string sql = InsertBuilder.ToSqlString(); RestoreMapping(); return new KeyValuePair>(sql, InsertBuilder.Parameters); @@ -49,6 +51,7 @@ namespace SqlSugar { InsertBuilder.IsReturnIdentity = true; PreToSql(); + AutoRemoveDataCache(); string sql = InsertBuilder.ToSqlString(); RestoreMapping(); return Ado.GetInt(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()); @@ -57,6 +60,7 @@ namespace SqlSugar { InsertBuilder.IsReturnIdentity = true; PreToSql(); + AutoRemoveDataCache(); string sql = InsertBuilder.ToSqlString(); RestoreMapping(); return Convert.ToInt64( Ado.GetScalar(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray())); @@ -194,6 +198,15 @@ namespace SqlSugar #endregion #region Protected Methods + private void AutoRemoveDataCache() + { + var moreSetts = this.Context.CurrentConnectionConfig.MoreSettings; + var extService = this.Context.CurrentConnectionConfig.ConfigureExternalServices; + if (moreSetts != null && moreSetts.IsAutoRemoveDataCache && extService != null && extService.DataInfoCacheService != null) + { + this.RemoveDataCache(); + } + } protected virtual void PreToSql() { #region Identities diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 375348c71..e1c782f24 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -439,6 +439,7 @@ namespace SqlSugar { Check.Exception(this.QueryBuilder.SelectValue.IsNullOrEmpty(), "MergeTable need to use Queryable.Select Method ."); Check.Exception(this.QueryBuilder.Skip > 0 || this.QueryBuilder.Take > 0 || this.QueryBuilder.OrderByValue.HasValue(), "MergeTable Queryable cannot Take Skip OrderBy PageToList "); + ToSqlBefore(); var sql = QueryBuilder.ToSqlString(); var tableName = this.SqlBuilder.GetPackTable(sql, "MergeTable"); var mergeQueryable = this.Context.Queryable(); @@ -607,6 +608,7 @@ namespace SqlSugar public virtual KeyValuePair> ToSql() { InitMapping(); + ToSqlBefore(); string sql = QueryBuilder.ToSqlString(); RestoreMapping(); return new KeyValuePair>(sql, QueryBuilder.Parameters); @@ -1059,12 +1061,21 @@ namespace SqlSugar protected int GetCount() { var sql = string.Empty; + ToSqlBefore(); sql = QueryBuilder.ToSqlString(); sql = QueryBuilder.ToCountSql(sql); var reval = Context.Ado.GetInt(sql, QueryBuilder.Parameters.ToArray()); return reval; } + private void ToSqlBefore() + { + var moreSetts = this.Context.CurrentConnectionConfig.MoreSettings; + if (moreSetts != null && moreSetts.IsWithNoLockQuery&&string.IsNullOrEmpty(QueryBuilder.TableWithString)) { + this.With(SqlWith.NoLock); + } + } + protected List GetData(KeyValuePair> sqlObj) { List result; @@ -1286,6 +1297,24 @@ namespace SqlSugar _GroupBy(expression); return this; } + + public new ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public new ISugarQueryable Having(string whereString, object whereObj) + { + base.Having(whereString, whereObj); + return this; + } #endregion #region Aggr @@ -1425,6 +1454,30 @@ namespace SqlSugar _GroupBy(expression); return this; } + + public new ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public new ISugarQueryable Having(string whereString, object whereObj) + { + base.Having(whereString, whereObj); + return this; + } #endregion #region Order @@ -1819,6 +1872,35 @@ namespace SqlSugar _GroupBy(expression); return this; } + public new ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public ISugarQueryable Having(Expression> expression) + { + this._Having(expression); + return this; + } + + public new ISugarQueryable Having(string whereString, object whereObj) + { + base.Having(whereString, whereObj); + return this; + } #endregion #region Aggr diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 8be0ce83f..b72f301fb 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -432,7 +432,7 @@ namespace SqlSugar { result += (TableShortName + UtilConstants.Space); } - if (this.TableWithString.HasValue()) + if (this.TableWithString.HasValue()&&this.TableWithString!= SqlWith.Null) { result += TableWithString + UtilConstants.Space; } @@ -443,7 +443,7 @@ namespace SqlSugar if (this.EasyJoinInfos.IsValuable()) { - if (this.TableWithString.HasValue()) + if (this.TableWithString.HasValue() && this.TableWithString != SqlWith.Null) { result += "," + string.Join(",", this.EasyJoinInfos.Select(it => string.Format("{0} {1} {2} ", GetTableName(it.Value), it.Key, TableWithString))); } diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs index 2603165d2..b4f6a1420 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs @@ -28,6 +28,7 @@ namespace SqlSugar public virtual int ExecuteCommand() { PreToSql(); + AutoRemoveDataCache(); Check.Exception(UpdateBuilder.WhereValues.IsNullOrEmpty() && GetPrimaryKeys().IsNullOrEmpty(), "You cannot have no primary key and no conditions"); string sql = UpdateBuilder.ToSqlString(); RestoreMapping(); @@ -93,7 +94,15 @@ namespace SqlSugar UpdateBuilder.SetValues.Add(new KeyValuePair(leftResultString, resultString)); return this; } - + private void AutoRemoveDataCache() + { + var moreSetts = this.Context.CurrentConnectionConfig.MoreSettings; + var extService = this.Context.CurrentConnectionConfig.ConfigureExternalServices; + if (moreSetts != null && moreSetts.IsAutoRemoveDataCache && extService!=null&& extService.DataInfoCacheService!=null) + { + this.RemoveDataCache(); + } + } public KeyValuePair> ToSql() { PreToSql(); diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnMoreSettings.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnMoreSettings.cs new file mode 100644 index 000000000..6add7d964 --- /dev/null +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnMoreSettings.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace SqlSugar +{ + public class ConnMoreSettings + { + public bool IsAutoRemoveDataCache { get; set; } + public bool IsWithNoLockQuery { get; set; } + } +} diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnectionConfig.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnectionConfig.cs index d98c824be..d96c3691d 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnectionConfig.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/ConnectionConfig.cs @@ -39,6 +39,10 @@ namespace SqlSugar /// All operations within a transaction is ConnectionString /// public List SlaveConnectionConfigs { get; set; } + /// + /// More Gobal Settings + /// + public ConnMoreSettings MoreSettings { get; set; } } public class ConfigureExternalServices diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/SqlWith.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/SqlWith.cs index 0560e0226..0d7876ef8 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/SqlWith.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Entities/SqlWith.cs @@ -15,5 +15,6 @@ namespace SqlSugar public const string TabLockX = "WITH(TABLOCKX)"; public const string UpdLock = "WITH(UPDLOCK)"; public const string RowLock = "WITH(ROWLOCK)"; + public const string Null = "Non"; } } diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs index 1fe6b24b7..a56e5695a 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs @@ -231,7 +231,11 @@ namespace SqlSugar { foreach (var item in args) { - AppendItem(parameter, name, args, model, item); + var expItem = item; + if (item is UnaryExpression) { + expItem = (item as UnaryExpression).Operand; + } + AppendItem(parameter, name, args, model, expItem); } if (appendArgs != null) { diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Infrastructure/SqlSugarAccessory.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Infrastructure/SqlSugarAccessory.cs index 9afac5e6f..1e4e46733 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Infrastructure/SqlSugarAccessory.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Infrastructure/SqlSugarAccessory.cs @@ -137,8 +137,50 @@ namespace SqlSugar var reval = this.Context.EntityMaintenance.GetEntityInfo(type); return reval; }); - InitMppingInfo(entityInfo); + var copyObj = CopyEntityInfo(entityInfo); + InitMppingInfo(copyObj); } + + private EntityInfo CopyEntityInfo(EntityInfo entityInfo) + { + EntityInfo result = new EntityInfo() + { + DbTableName = entityInfo.DbTableName, + EntityName = entityInfo.EntityName, + Type = entityInfo.Type + }; + List columns = new List(); + if (entityInfo.Columns.HasValue()) + { + foreach (var item in entityInfo.Columns) + { + EntityColumnInfo column = new EntityColumnInfo() + { + ColumnDescription = item.ColumnDescription, + DataType = item.DataType, + DbColumnName = item.DbColumnName, + DbTableName = item.DbTableName, + DecimalDigits = item.DecimalDigits, + DefaultValue = item.DefaultValue, + EntityName = item.EntityName, + IsIdentity = item.IsIdentity, + IsIgnore = item.IsIgnore, + IsNullable = item.IsNullable, + IsOnlyIgnoreInsert = item.IsOnlyIgnoreInsert, + IsPrimarykey = item.IsPrimarykey, + Length = item.Length, + OldDbColumnName = item.OldDbColumnName, + OracleSequenceName = item.OracleSequenceName, + PropertyInfo = item.PropertyInfo, + PropertyName = item.PropertyName + }; + columns.Add(item); + } + } + result.Columns = columns; + return result; + } + private void InitMppingInfo(EntityInfo entityInfo) { if (this.Context.MappingTables == null) diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IQueryable.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IQueryable.cs index e30ff8e00..be78ba5b0 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IQueryable.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Interface/IQueryable.cs @@ -18,7 +18,7 @@ namespace SqlSugar ISugarQueryable AS(string tableName); ISugarQueryable AS(string tableName); ISugarQueryable With(string withString); - ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter= false); + ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); ISugarQueryable AddParameters(object parameters); ISugarQueryable AddParameters(SugarParameter[] parameters); ISugarQueryable AddParameters(List parameters); @@ -45,7 +45,7 @@ namespace SqlSugar ISugarQueryable OrderBy(string orderFileds); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderByIF(bool isOrderBy,string orderFileds); + ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); @@ -66,7 +66,7 @@ namespace SqlSugar T First(); Task FirstAsync(); T First(Expression> expression); - Task FirstAsync(Expression> expression); + Task FirstAsync(Expression> expression); bool Any(Expression> expression); Task AnyAsync(Expression> expression); @@ -107,7 +107,7 @@ namespace SqlSugar string ToJsonPage(int pageIndex, int pageSize); Task ToJsonPageAsync(int pageIndex, int pageSize); string ToJsonPage(int pageIndex, int pageSize, ref int totalNumber); - Task> ToJsonPageAsync(int pageIndex, int pageSize, int totalNumber); + Task> ToJsonPageAsync(int pageIndex, int pageSize, int totalNumber); KeyValuePair> ToSql(); @@ -116,12 +116,12 @@ namespace SqlSugar DataTable ToDataTablePage(int pageIndex, int pageSize); Task ToDataTablePageAsync(int pageIndex, int pageSize); DataTable ToDataTablePage(int pageIndex, int pageSize, ref int totalNumber); - Task> ToDataTablePageAsync(int pageIndex, int pageSize, int totalNumber); + Task> ToDataTablePageAsync(int pageIndex, int pageSize, int totalNumber); List ToPageList(int pageIndex, int pageSize); Task> ToPageListAsync(int pageIndex, int pageSize); List ToPageList(int pageIndex, int pageSize, ref int totalNumber); - Task,int>> ToPageListAsync(int pageIndex, int pageSize, int totalNumber); + Task, int>> ToPageListAsync(int pageIndex, int pageSize, int totalNumber); ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); string ToClassString(string className); @@ -132,13 +132,13 @@ namespace SqlSugar #region Where new ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(List conditionalModels); - new ISugarQueryable WhereIF(bool isWhere,Expression> expression); + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -146,43 +146,46 @@ namespace SqlSugar #endregion #region OrderBy - new ISugarQueryable OrderBy(string orderFileds); + new ISugarQueryable OrderBy(string orderFileds); new ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); + new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); new ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); #endregion #region GroupBy new ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); + new ISugarQueryable Having(Expression> expression); + ISugarQueryable Having(Expression> expression); + new ISugarQueryable Having(string whereString, object whereObj = null); #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } public partial interface ISugarQueryable : ISugarQueryable @@ -191,14 +194,14 @@ namespace SqlSugar new ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(List conditionalModels); new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -210,42 +213,46 @@ namespace SqlSugar 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); - new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); - new ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); + new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); + new ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); #endregion #region GroupBy new ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); + new ISugarQueryable Having(Expression> expression); + ISugarQueryable Having(Expression> expression); + ISugarQueryable Having(Expression> expression); + new ISugarQueryable Having(string whereString, object whereObj = null); #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache,int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } public partial interface ISugarQueryable : ISugarQueryable @@ -255,14 +262,14 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(List conditionalModels); new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion @@ -277,11 +284,11 @@ namespace SqlSugar ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); - new ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); + new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); + new ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); #endregion #region GroupBy @@ -289,32 +296,37 @@ namespace SqlSugar ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); + new ISugarQueryable Having(Expression> expression); + ISugarQueryable Having(Expression> expression); + ISugarQueryable Having(Expression> expression); + ISugarQueryable Having(Expression> expression); + new ISugarQueryable Having(string whereString, object whereObj = null); #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache,int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } public partial interface ISugarQueryable : ISugarQueryable @@ -325,7 +337,7 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(List conditionalModels); new ISugarQueryable WhereIF(bool isWhere, Expression> expression); @@ -334,8 +346,8 @@ namespace SqlSugar ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -351,12 +363,12 @@ namespace SqlSugar ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); + new ISugarQueryable OrderByIF(bool isOrderBy, string orderFileds); new ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderByIF(bool isOrderBy, Expression> expression, OrderByType type = OrderByType.Asc); #endregion #region GroupBy @@ -368,29 +380,29 @@ namespace SqlSugar #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache,int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } public partial interface ISugarQueryable : ISugarQueryable @@ -402,7 +414,7 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(List conditionalModels); new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); @@ -411,8 +423,8 @@ namespace SqlSugar ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -442,29 +454,29 @@ namespace SqlSugar #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } public partial interface ISugarQueryable : ISugarQueryable @@ -477,7 +489,7 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(List conditionalModels); new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); @@ -487,8 +499,8 @@ namespace SqlSugar ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -521,29 +533,29 @@ namespace SqlSugar #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } public partial interface ISugarQueryable : ISugarQueryable @@ -557,7 +569,7 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(List conditionalModels); new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); @@ -568,8 +580,8 @@ namespace SqlSugar ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -605,150 +617,59 @@ namespace SqlSugar #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } #region 9-12 - public partial interface ISugarQueryable : ISugarQueryable + public partial interface ISugarQueryable : ISugarQueryable { #region Where - new ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + new ISugarQueryable Where(List conditionalModels); - new ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); - #endregion - - #region Select - ISugarQueryable Select(Expression> expression); - ISugarQueryable Select(Expression> expression); - ISugarQueryable Select(Expression> expression); - ISugarQueryable Select(Expression> expression); - ISugarQueryable Select(Expression> expression); - ISugarQueryable Select(Expression> expression); - 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); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - 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); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - #endregion - - #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); - #endregion - - #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); - #endregion - - #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); - #endregion - } - public partial interface ISugarQueryable : ISugarQueryable - { - #region Where - new ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); - - new ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -760,91 +681,86 @@ namespace SqlSugar ISugarQueryable Select(Expression> expression); ISugarQueryable Select(Expression> expression); 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); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + 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); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + 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); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); + new ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache,int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } - public partial interface ISugarQueryable : ISugarQueryable + public partial interface ISugarQueryable : ISugarQueryable { #region Where - new ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + new ISugarQueryable Where(List conditionalModels); - new ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -857,95 +773,90 @@ namespace SqlSugar ISugarQueryable Select(Expression> expression); ISugarQueryable Select(Expression> expression); 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); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + 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); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + 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); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); + new ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } - public partial interface ISugarQueryable : ISugarQueryable + public partial interface ISugarQueryable : ISugarQueryable { #region Where - new ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - ISugarQueryable Where(Expression> expression); - new ISugarQueryable Where(List conditionalModels); + new ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + new ISugarQueryable Where(List conditionalModels); - new ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); - new ISugarQueryable Where(string whereString, object whereObj = null); - new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); #endregion #region Select @@ -959,63 +870,164 @@ namespace SqlSugar ISugarQueryable Select(Expression> expression); ISugarQueryable Select(Expression> expression); 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); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + 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); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + #endregion + + #region Aggr + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); + #endregion + + #region In + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + #endregion + + #region Other + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); + #endregion + } + public partial interface ISugarQueryable : ISugarQueryable + { + #region Where + new ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + new ISugarQueryable Where(List conditionalModels); + + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + + new ISugarQueryable Where(string whereString, object whereObj = null); + new ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null); + #endregion + + #region Select + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + ISugarQueryable Select(Expression> expression); + 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); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); - ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); + ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc); 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); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); ISugarQueryable GroupBy(Expression> expression); - ISugarQueryable GroupBy(Expression> expression); + ISugarQueryable GroupBy(Expression> expression); #endregion #region Aggr - TResult Max(Expression> expression); - TResult Min(Expression> expression); - TResult Sum(Expression> expression); - TResult Avg(Expression> expression); + TResult Max(Expression> expression); + TResult Min(Expression> expression); + TResult Sum(Expression> expression); + TResult Avg(Expression> expression); #endregion #region In - new ISugarQueryable In(Expression> expression, params FieldType[] inValues); - new ISugarQueryable In(Expression> expression, List inValues); - new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); + new ISugarQueryable In(Expression> expression, params FieldType[] inValues); + new ISugarQueryable In(Expression> expression, List inValues); + new ISugarQueryable In(Expression> expression, ISugarQueryable childQueryExpression); #endregion #region Other - new ISugarQueryable AS(string tableName); - new ISugarQueryable AS(string tableName); - new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); - new ISugarQueryable AddParameters(object parameters); - new ISugarQueryable AddParameters(SugarParameter[] parameters); - new ISugarQueryable AddParameters(List parameters); - new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); - new ISugarQueryable With(string withString); - new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); - new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable AS(string tableName); + new ISugarQueryable AS(string tableName); + new ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + new ISugarQueryable AddParameters(object parameters); + new ISugarQueryable AddParameters(SugarParameter[] parameters); + new ISugarQueryable AddParameters(List parameters); + new ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); + new ISugarQueryable With(string withString); + new ISugarQueryable WithCache(int cacheDurationInSeconds = int.MaxValue); + new ISugarQueryable WithCacheIF(bool isCache, int cacheDurationInSeconds = int.MaxValue); #endregion } #endregion diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarClient.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarClient.cs index fcb82cd50..87494f3de 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarClient.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarClient.cs @@ -376,7 +376,7 @@ namespace SqlSugar } var allSql = sqlBuilder.GetUnionAllSql(allItems.Select(it => it.Key).ToList()); var allParameters = allItems.SelectMany(it => it.Value).ToArray(); - var resulut = base.Context.Queryable().AS(UtilMethods.GetPackTable(allSql, "unionTable")); + var resulut = base.Context.Queryable().AS(UtilMethods.GetPackTable(allSql, "unionTable")).With(SqlWith.Null); resulut.AddParameters(allParameters); return resulut.Select(sqlBuilder.SqlSelectAll); } @@ -391,7 +391,7 @@ namespace SqlSugar public ISugarQueryable SqlQueryable(string sql) where T : class, new() { var sqlBuilder = InstanceFactory.GetSqlbuilder(base.Context.CurrentConnectionConfig); - return base.Context.Queryable().AS(sqlBuilder.GetPackTable(sql, sqlBuilder.GetDefaultShortName())).Select("*"); + return base.Context.Queryable().AS(sqlBuilder.GetPackTable(sql, sqlBuilder.GetDefaultShortName())).With(SqlWith.Null).Select("*"); } #endregion