[#266] 7.x.1.21

dotnetcore · Apr 20, 2024 · 1e715ff · 1e715ff
1 parent b730c4e
commit 1e715ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/nuget-publish.bat b/nuget-publish.bat
@@ -1,11 +1,11 @@
 :start
 ::定义版本
-set EFCORE8=7.8.1.20
-set EFCORE7=7.7.1.20
-set EFCORE6=7.6.1.20
-set EFCORE5=7.5.1.20
-set EFCORE3=7.3.1.20
-set EFCORE2=7.2.1.20
+set EFCORE8=7.8.1.21
+set EFCORE7=7.7.1.21
+set EFCORE6=7.6.1.21
+set EFCORE5=7.5.1.21
+set EFCORE3=7.3.1.21
+set EFCORE2=7.2.1.21
 
 ::删除所有bin与obj下的文件
 @echo off

diff --git a/...ualRoutes/DataSourceRoutes/Abstractions/AbstractShardingOperatorVirtualDataSourceRoute.cs b/...ualRoutes/DataSourceRoutes/Abstractions/AbstractShardingOperatorVirtualDataSourceRoute.cs
@@ -35,6 +35,10 @@ protected override List<string> DoRouteWithPredicate(List<string> allDataSourceN
 
         public virtual object GetCompareValueByShardingKey(object shardingKey, string shardingPropertyName)
         {
+            if (EntityMetadata.IsMainShardingDataSourceKey(shardingPropertyName))
+            {
+                return ShardingKeyToDataSourceName(shardingKey);
+            }
             return shardingKey;
         }
 

diff --git a/.../Core/VirtualRoutes/TableRoutes/Abstractions/AbstractShardingOperatorVirtualTableRoute.cs b/.../Core/VirtualRoutes/TableRoutes/Abstractions/AbstractShardingOperatorVirtualTableRoute.cs
@@ -40,8 +40,13 @@ protected override List<TableRouteUnit> DoRouteWithPredicate(DataSourceRouteResu
             return sqlRouteUnits;
         }
 
+
         public virtual object GetCompareValueByShardingKey(object shardingKey, string shardingPropertyName)
         {
+            if (EntityMetadata.IsMainShardingTableKey(shardingPropertyName))
+            {
+                return ShardingKeyToTail(shardingKey);
+            }
             return shardingKey;
         }