v11.10.2023.1201 优化实体过滤器；优化字段缓存

NewLifeX · Dec 1, 2023 · 44680a5 · 44680a5
1 parent d6cfa4c
commit 44680a5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -39,7 +39,7 @@
     <PackageReference Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
     <PackageReference Include="MySql.Data" Version="8.2.0" />
     <PackageReference Include="NewLife.Redis" Version="5.5.2023.1102" />
-    <PackageReference Include="NewLife.Remoting" Version="2.5.2023.1102" />
+    <PackageReference Include="NewLife.Remoting" Version="2.7.2023.1201" />
     <PackageReference Include="NewLife.Stardust" Version="2.9.2023.1103" />
     <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.120" />
     <PackageReference Include="SapHana.DotNetCore.Data.Provider" Version="2.11.14" />

diff --git a/XCode/XCode.csproj b/XCode/XCode.csproj
@@ -29,7 +29,7 @@
     <RepositoryUrl>https://github.com/NewLifeX/X</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
-    <PackageReleaseNotes>改进Valid；改进反向工程；优化代码生成器</PackageReleaseNotes>
+    <PackageReleaseNotes>优化实体过滤器；优化字段缓存</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -44,7 +44,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.6.2023.1115" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2023.1201" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="build\**" />

diff --git a/XUnitTest.XCode/Common/PageParameterTest.cs b/XUnitTest.XCode/Common/PageParameterTest.cs
@@ -123,7 +123,7 @@ public void SearchData_5()
             pager.OrderBy = null;
             pager.Sort = $"{History._.CreateTime} desc,{History._.Action} asc";
             var query = History.FindAll(null, pager);
-            Assert.True(str.ToLower().Contains($"{History._.ID}".ToLower()), "多Sort出错");
+            Assert.True(str.ToLower().Contains($"{History._.Action}".ToLower()), "多Sort出错");
         }
 
         [Fact(DisplayName = "单复杂OrderBy")]

diff --git a/XUnitTest.XCode/DataAccessLayer/HanaTests.cs b/XUnitTest.XCode/DataAccessLayer/HanaTests.cs
@@ -193,13 +193,13 @@ public void TablePrefixTest()
     private IDisposable CreateForBatch(String action)
     {
         var connStr = _ConnStr.Replace("Database=sys;", "Database=Membership_Batch;");
-        DAL.AddConnStr("Membership_Batch", connStr, null, "Hana");
+        DAL.AddConnStr("Membership_Batch_hana", connStr, null, "Hana");
 
         var dt = Role2.Meta.Table.DataTable.Clone() as IDataTable;
         dt.TableName = $"Role2_{action}";
 
         // 分表
-        var split = Role2.Meta.CreateSplit("Membership_Batch", dt.TableName);
+        var split = Role2.Meta.CreateSplit("Membership_Batch_hana", dt.TableName);
 
         var session = Role2.Meta.Session;
         session.Dal.SetTables(dt);
@@ -305,8 +305,8 @@ public void BatchReplace()
     [Fact]
     public void GetTables()
     {
-        DAL.AddConnStr("member", _ConnStr.Replace("Database=sys", "Database=membership"), null, "Hana");
-        var dal = DAL.Create("member");
+        DAL.AddConnStr("member_hana", _ConnStr.Replace("Database=sys", "Database=membership"), null, "Hana");
+        var dal = DAL.Create("member_hana");
         var tables = dal.Tables;
 
         Assert.True(tables.Count > 0);

diff --git a/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs b/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs
@@ -193,13 +193,13 @@ public void TablePrefixTest()
     private IDisposable CreateForBatch(String action)
     {
         var connStr = _ConnStr.Replace("Database=sys;", "Database=Membership_Batch;");
-        DAL.AddConnStr("Membership_Batch", connStr, null, "MySql");
+        DAL.AddConnStr("Membership_Batch_mysql", connStr, null, "MySql");
 
         var dt = Role2.Meta.Table.DataTable.Clone() as IDataTable;
         dt.TableName = $"Role2_{action}";
 
         // 分表
-        var split = Role2.Meta.CreateSplit("Membership_Batch", dt.TableName);
+        var split = Role2.Meta.CreateSplit("Membership_Batch_mysql", dt.TableName);
 
         var session = Role2.Meta.Session;
         session.Dal.SetTables(dt);
@@ -305,8 +305,8 @@ public void BatchReplace()
     [Fact]
     public void GetTables()
     {
-        DAL.AddConnStr("member", _ConnStr.Replace("Database=sys", "Database=membership"), null, "MySql");
-        var dal = DAL.Create("member");
+        DAL.AddConnStr("member_mysql", _ConnStr.Replace("Database=sys", "Database=membership"), null, "MySql");
+        var dal = DAL.Create("member_mysql");
         var tables = dal.Tables;
 
         Assert.True(tables.Count > 0);

diff --git a/XUnitTest.XCode/Membership/AreaTests.cs b/XUnitTest.XCode/Membership/AreaTests.cs
@@ -389,8 +389,8 @@ public void SearchIP(String ip, Int32 areaId)
     [TestOrder(80)]
     [Theory]
     [InlineData("112.32.148.126", 340100)]
-    [InlineData("116.234.90.174", 310113)]
-    [InlineData("116.233.20.228", 310104)]
+    [InlineData("116.234.90.174", 310000)]
+    [InlineData("116.233.20.228", 310000)]
     [InlineData("122.231.253.198", 330400)]
     public void SearchIP2(String ip, Int32 areaId)
     {