diff --git a/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs b/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs index 5e6327a3a..f5c313c09 100644 --- a/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs +++ b/Src/Asp.Net/SqlServerTest/Demos/1_Query.cs @@ -226,8 +226,8 @@ namespace OrmTest.Demo var list3 = db.Queryable((st, sc) => new object[] { JoinType.Left,st.SchoolId==sc.Id }) - .WhereIf(false, (st, sc) => sc.Id == 1) - .WhereIf(false, (st, sc) => st.Id == 1).ToList(); + .WhereIF(false, (st, sc) => sc.Id == 1) + .WhereIF(false, (st, sc) => st.Id == 1).ToList(); } public static void Join() { diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/DataTest2.cs b/Src/Asp.Net/SqlServerTest/UnitTest/DataTest2.cs new file mode 100644 index 000000000..83e2818d9 --- /dev/null +++ b/Src/Asp.Net/SqlServerTest/UnitTest/DataTest2.cs @@ -0,0 +1,39 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace OrmTest.UnitTest +{ + public class DataTest2 : UnitTestBase + { + public interface IEntity { + T ID { get; set; } + } + public abstract class Entity : IEntity + { + public virtual T ID { get; set; } + } + public class MyModel: Entity + { + public override int ID { get; set; } + } + private DataTest2() { } + public DataTest2(int eachCount) + { + this.Count = eachCount; + } + + public void Init() + { + var db = GetInstance(); + var t1 = db.Queryable().AS("Student").ToList(); + } + public SqlSugarClient GetInstance() + { + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true }); + return db; + } + } +} diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index de46ec849..27e1cda8b 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -665,13 +665,13 @@ namespace SqlSugar _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); @@ -788,21 +788,21 @@ namespace SqlSugar return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere,Expression> expression) + public ISugarQueryable WhereIF(bool isWhere,Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); @@ -837,28 +837,28 @@ namespace SqlSugar return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); @@ -958,35 +958,35 @@ namespace SqlSugar return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); @@ -1105,42 +1105,42 @@ namespace SqlSugar return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); @@ -1278,49 +1278,49 @@ namespace SqlSugar return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); @@ -1478,56 +1478,56 @@ namespace SqlSugar return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIf(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); diff --git a/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs b/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs index 5f57353d3..d5447bb7e 100644 --- a/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs +++ b/Src/Asp.Net/SqlSugar/Interface/IQueryable.cs @@ -97,8 +97,8 @@ namespace SqlSugar new ISugarQueryable Where(Expression> expression); ISugarQueryable Where(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); #endregion #region Select @@ -122,9 +122,9 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(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); #endregion #region Select @@ -152,10 +152,10 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(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); + 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); #endregion #region Select @@ -188,11 +188,11 @@ namespace SqlSugar ISugarQueryable Where(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); #endregion #region Select @@ -228,12 +228,12 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(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); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); #endregion #region Select @@ -273,13 +273,13 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(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); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); + ISugarQueryable WhereIF(bool isWhere, Expression> expression); #endregion #region Select @@ -323,14 +323,14 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(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); + 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); #endregion #region Select diff --git a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs index 1915ce28c..8ef16d344 100644 --- a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs +++ b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.1.0.3")] -[assembly: AssemblyFileVersion("4.1.0.3")] +[assembly: AssemblyVersion("4.1.0.4")] +[assembly: AssemblyFileVersion("4.1.0.4")] diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec index 0b15b2c38..609b4c2db 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec @@ -2,7 +2,7 @@ sqlSugarCore - 4.1.0.2 + 4.1.0.3 sunkaixuan Landa http://www.apache.org/licenses/LICENSE-2.0.html