diff --git a/Src/Asp.Net/SqlSugar/SqlSugar.nuspec b/Src/Asp.Net/SqlSugar/SqlSugar.nuspec index 955323513..a77663a00 100644 --- a/Src/Asp.Net/SqlSugar/SqlSugar.nuspec +++ b/Src/Asp.Net/SqlSugar/SqlSugar.nuspec @@ -2,7 +2,7 @@ sqlSugar - 4.2.1.6 + 4.2.1.7 SqlSugar SqlServer ORM sun kaixuan landa diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs index 22300c3c8..6cb1a8bd4 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/DbBindAccessory.cs @@ -135,7 +135,7 @@ namespace SqlSugar } else { - reval.Add((T)Convert.ChangeType(re.GetValue(0), type)); + reval.Add((T)Convert.ChangeType(re.GetValue(0),PubMethod.GetUnderType(type))); } } } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs index a3b83628a..885655b53 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbMaintenanceProvider/Methods.cs @@ -111,6 +111,7 @@ namespace SqlSugar } public virtual bool IsAnySystemTablePermissions() { + this.Context.Ado.CheckConnection(); string sql = this.CheckSystemTablePermissionsSql; this.Context.Ado.CheckConnection(); try diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs index 5782cd62f..f9fba01b0 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs @@ -10,5 +10,6 @@ namespace SqlSugar public class QueryableAccessory { protected ILambdaExpressions _LambdaExpressions; + protected bool _RestoreMapping = true; } } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 41516fb47..22e209b0c 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -490,8 +490,11 @@ namespace SqlSugar } public virtual DataTable ToDataTablePage(int pageIndex, int pageSize, ref int totalNumber) { + _RestoreMapping = false; totalNumber = this.Count(); - return ToDataTablePage(pageIndex, pageSize); + var result = ToDataTablePage(pageIndex, pageSize); + _RestoreMapping = true; + return result; } public virtual List ToList() @@ -516,11 +519,15 @@ namespace SqlSugar } public virtual List ToPageList(int pageIndex, int pageSize, ref int totalNumber) { + _RestoreMapping = false; + List result = null; totalNumber = this.Count(); if (totalNumber == 0) - return new List(); + result = new List(); else - return ToPageList(pageIndex, pageSize); + result = ToPageList(pageIndex, pageSize); + _RestoreMapping = true; + return result; } public virtual KeyValuePair> ToSql() @@ -671,7 +678,7 @@ namespace SqlSugar } protected void RestoreMapping() { - if (IsAs) + if (IsAs && _RestoreMapping) { this.Context.MappingTables = OldMappingTableList == null ? new MappingTableList() : OldMappingTableList; } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs index 31d54824d..9d6b04136 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs @@ -17,5 +17,5 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("1c022a5c-4e4d-4026-a8a3-f659b9740a1a")] -[assembly: AssemblyVersion("4.2.1.5")] -[assembly: AssemblyFileVersion("4.2.1.5")] +[assembly: AssemblyVersion("4.2.1.7")] +[assembly: AssemblyFileVersion("4.2.1.7")] diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec index 2192c5970..cea63223e 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.2.1.5 + 4.2.1.7 sunkaixuan Landa http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqliteTest/DataBase/SqlSugar4xTest.sqlite b/Src/Asp.NetCore/SqlServerTest/src/SqliteTest/DataBase/SqlSugar4xTest.sqlite index ee99c4227..96af80ba8 100644 Binary files a/Src/Asp.NetCore/SqlServerTest/src/SqliteTest/DataBase/SqlSugar4xTest.sqlite and b/Src/Asp.NetCore/SqlServerTest/src/SqliteTest/DataBase/SqlSugar4xTest.sqlite differ