diff --git a/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs b/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs index 8ec3ac226..24ba017bb 100644 --- a/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs +++ b/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs @@ -46,7 +46,7 @@ namespace SqlSugar resolveExpress.Clear(); } - protected void Where(string whereString, object whereObj, SqlSugarClient context, ISqlBuilder builder) where T : class, new() + protected void Where(string whereString, object whereObj, SqlSugarClient context, ISqlBuilder builder) { var SqlBuilder = builder; var whereValue = SqlBuilder.LambadaQueryBuilder.WhereInfos; diff --git a/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 23dcbc297..0e1946c02 100644 --- a/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -9,7 +9,7 @@ using System.Text.RegularExpressions; namespace SqlSugar { - public partial class QueryableProvider : QueryableAccessory, ISugarQueryable where T : class, new() + public partial class QueryableProvider : QueryableAccessory, ISugarQueryable { public SqlSugarClient Context { get; set; } public IDb Db { get { return Context.Database; } } @@ -64,32 +64,32 @@ namespace SqlSugar base.Where(whereString, whereObj, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable Where(string whereString, object whereObj = null) where T2 : class, new() + public ISugarQueryable Where(string whereString, object whereObj = null) { base.Where(whereString, whereObj, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable Where(Expression> expression) where T2 : class, new() + public ISugarQueryable Where(Expression> expression) { base.Where(expression, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new() + public ISugarQueryable Where(Expression> expression) { base.Where(expression, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() + public ISugarQueryable Where(Expression> expression) { base.Where(expression, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() + public ISugarQueryable Where(Expression> expression) { base.Where(expression, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() where T6 : class, new() + public ISugarQueryable Where(Expression> expression) { base.Where(expression, this.Context, this.SqlBuilder); return this; @@ -106,37 +106,37 @@ namespace SqlSugar base.Where(whereString, whereObj, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null) where T2 : class, new() + public ISugarQueryable WhereIF(bool isWhere, string whereString, object whereObj = null) { if (!isWhere) return this; base.Where(whereString, whereObj, this.Context, this.SqlBuilder); return this; } - public ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (!isWhere) return this; this.Where(expression); return this; } - public ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new() + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (!isWhere) return this; this.Where(expression); return this; } - public ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (!isWhere) return this; this.Where(expression); return this; } - public ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (!isWhere) return this; this.Where(expression); return this; } - public ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() where T6 : class, new() + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (!isWhere) return this; this.Where(expression); @@ -258,40 +258,40 @@ namespace SqlSugar throw new NotImplementedException(); } - public ISugarQueryable Select(Expression> expression) where TResult : class, new() + public ISugarQueryable Select(Expression> expression) { return SelectMehtod(expression); } - public ISugarQueryable Select(Expression> expression) where TResult : class, new() + public ISugarQueryable Select(Expression> expression) { return SelectMehtod(expression); } - public ISugarQueryable Select(Expression> expression) where TResult : class, new() + public ISugarQueryable Select(Expression> expression) { return SelectMehtod(expression); } - public ISugarQueryable Select(Expression> expression) where TResult : class, new() + public ISugarQueryable Select(Expression> expression) { return SelectMehtod(expression); } - public ISugarQueryable Select(Expression> expression) where TResult : class, new() + public ISugarQueryable Select(Expression> expression) { return SelectMehtod(expression); } - public ISugarQueryable Select(Expression> expression) where TResult : class, new() + public ISugarQueryable Select(Expression> expression) { return SelectMehtod(expression); } - public ISugarQueryable Select(Expression> expression) where TResult : class, new() + public ISugarQueryable Select(Expression> expression) { return SelectMehtod(expression); } - private ISugarQueryable SelectMehtod(Expression expression) where TResult : class, new() + private ISugarQueryable SelectMehtod(Expression expression) { var reval = InstanceFactory.GetQueryable(this.Context.CurrentConnectionConfig); reval.Context = this.Context; diff --git a/SqlSugar/Databases/SqlServer/Queryable/SqlServerQueryable.cs b/SqlSugar/Databases/SqlServer/Queryable/SqlServerQueryable.cs index 8546e8ff9..084d6c231 100644 --- a/SqlSugar/Databases/SqlServer/Queryable/SqlServerQueryable.cs +++ b/SqlSugar/Databases/SqlServer/Queryable/SqlServerQueryable.cs @@ -7,7 +7,7 @@ using System.Text; namespace SqlSugar { - public class SqlServerQueryable:QueryableProvider where T:class,new() + public class SqlServerQueryable:QueryableProvider { } diff --git a/SqlSugar/InstanceFactory.cs b/SqlSugar/InstanceFactory.cs index d590cc1ca..2a9ea0ca4 100644 --- a/SqlSugar/InstanceFactory.cs +++ b/SqlSugar/InstanceFactory.cs @@ -10,7 +10,7 @@ namespace SqlSugar { static Assembly assembly = Assembly.Load(PubConst.AssemblyName); static Dictionary typeCache = new Dictionary(); - public static ISugarQueryable GetQueryable(IConnectionConfig currentConnectionConfig)where T:class,new() + public static ISugarQueryable GetQueryable(IConnectionConfig currentConnectionConfig) { CheckConfig(currentConnectionConfig); string className = "Queryable"; @@ -79,7 +79,7 @@ namespace SqlSugar { return PubConst.AssemblyName + "." + type + name; } - private static Restult CreateInstance(string className, string dbType) where T:class,new() + private static Restult CreateInstance(string className, string dbType) { var cacheKey = className + typeof(T).FullName; Type type; diff --git a/SqlSugar/Interface/IQueryable.cs b/SqlSugar/Interface/IQueryable.cs index 21428d896..50ce9fac9 100644 --- a/SqlSugar/Interface/IQueryable.cs +++ b/SqlSugar/Interface/IQueryable.cs @@ -7,7 +7,7 @@ using System.Linq.Expressions; using System.Text; namespace SqlSugar { - public partial interface ISugarQueryable where T : class, new() + public partial interface ISugarQueryable { SqlSugarClient Context { get; set; } ISqlBuilder SqlBuilder { get; set; } @@ -19,18 +19,18 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(string whereString, object whereObj = null); - ISugarQueryable Where(Expression> expression) where T2 : class, new(); - ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new(); - ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new(); - ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new(); - ISugarQueryable Where(Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() where T6 : class, new(); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression); + ISugarQueryable Where(Expression> expression) ; + ISugarQueryable Where(Expression> expression) ; ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere,string whereString, object whereObj = null); - ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new(); - ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new(); - ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new(); - ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new(); - ISugarQueryable WhereIF(bool isWhere, Expression> expression) where T2 : class, new() where T3 : class, new() where T4 : class, new() where T5 : class, new() where T6 : class, 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 In(params object[] pkValues); T InSingle(object pkValue); @@ -61,13 +61,13 @@ namespace SqlSugar T FirstOrDefault(Expression> expression); bool Any(Expression> expression); bool Any(); - ISugarQueryable Select(Expression> expression) where TResult : class, new(); - ISugarQueryable Select(Expression> expression) where TResult : class, new(); - ISugarQueryable Select(Expression> expression) where TResult : class, new(); - ISugarQueryable Select(Expression> expression) where TResult : class, new(); - ISugarQueryable Select(Expression> expression) where TResult : class, new(); - ISugarQueryable Select(Expression> expression) where TResult : class, new(); - ISugarQueryable Select(Expression> expression) where TResult : class, new(); + 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(string select) where TResult : class, new(); ISugarQueryable Select(string select);