发布x.3.1.77修复动态添加从库bug

xuejmnet · xuejmnet · commit 1d3f36b38864 · 2021-12-10T18:18:47.000+08:00
diff --git a/nuget-publish.bat b/nuget-publish.bat
@@ -1,9 +1,9 @@
 :start
 ::定义版本
-set EFCORE2=2.3.1.76
-set EFCORE3=3.3.1.76
-set EFCORE5=5.3.1.76
-set EFCORE6=6.3.1.76
+set EFCORE2=2.3.1.77
+set EFCORE3=3.3.1.77
+set EFCORE5=5.3.1.77
+set EFCORE6=6.3.1.77
 
 ::删除所有bin与obj下的文件
 @echo off
diff --git a/src/ShardingCore/DIExtensions/ShardingCoreConfigBuilder.cs b/src/ShardingCore/DIExtensions/ShardingCoreConfigBuilder.cs
@@ -103,7 +103,9 @@ public class ShardingCoreBeginOptions
         public bool? IgnoreCreateTableError { get; set; } = true;
         public int MaxQueryConnectionsLimit { get; set; } = Environment.ProcessorCount;
         public ConnectionModeEnum ConnectionMode { get; set; } = ConnectionModeEnum.SYSTEM_AUTO;
+        [Obsolete]
         public bool? EnableTableRouteCompileCache { get; set; }
+        [Obsolete]
         public bool? EnableDataSourceRouteCompileCache { get; set; }
 
         private readonly  ISet<Type> _createTableEntities = new HashSet<Type>();
diff --git a/src/ShardingCore/Extensions/DbContextExtension.cs b/src/ShardingCore/Extensions/DbContextExtension.cs
@@ -67,15 +67,6 @@ public static void RemoveDbContextRelationModelThatIsShardingTable(this DbContex
 #endif
         }
 
-        /// <summary>
-        /// 移除所有的没有分片的表
-        /// </summary>
-        /// <param name="dbContext"></param>
-        [Obsolete($"plz use {nameof(RemoveDbContextAllRelationModelThatIsNoSharding)}")]
-        public static void RemoveDbContextAllRelationModelThatIsNoShardingTable(this DbContext dbContext)
-        {
-            RemoveDbContextAllRelationModelThatIsNoSharding(dbContext);
-        }
         /// <summary>
         /// 移除所有的没有分片的表
         /// </summary>
diff --git a/src/ShardingCore/Sharding/ReadWriteConfigurations/ReadWriteShardingConnectionStringResolver.cs b/src/ShardingCore/Sharding/ReadWriteConfigurations/ReadWriteShardingConnectionStringResolver.cs
@@ -49,15 +49,20 @@ public bool AddConnectionString(string dataSourceName, string connectionString)
                 if (_readWriteOptions.ReadStrategy == ReadStrategyEnum.Loop)
                 {
                     connector= new ReadWriteLoopConnector(dataSourceName, new List<string> { connectionString });
+                    _connectors.TryAdd(dataSourceName, connector);
+                    return true;
                 }
                 else if (_readWriteOptions.ReadStrategy == ReadStrategyEnum.Random)
                 {
-                    connector= new ReadWriteLoopConnector(dataSourceName, new List<string> { connectionString });
+                    connector= new ReadWriteRandomConnector(dataSourceName, new List<string> { connectionString });
+                    _connectors.TryAdd(dataSourceName, connector);
+                    return true;
+                }
+                else
+                {
+                    throw new ShardingCoreInvalidOperationException(
+                        $"unknown read write strategy:[{_readWriteOptions.ReadStrategy}]");
                 }
-
-                throw new ShardingCoreInvalidOperationException(
-                    $"unknown read write strategy:[{_readWriteOptions.ReadStrategy}]");
-
             }
             else
             {
diff --git a/src/ShardingCore/ShardingCore.csproj b/src/ShardingCore/ShardingCore.csproj
@@ -4,7 +4,7 @@
         <Version>$(EFCORE6)</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;EFCORE6;</DefineConstants>
-        <LangVersion>10.0</LangVersion>
+        <LangVersion>9.0</LangVersion>
 	    <RepositoryUrl>https://github.com/xuejmnet/sharding-core</RepositoryUrl>
 	    <PackageIcon>logo.png</PackageIcon>
     </PropertyGroup>
diff --git a/src2x/ShardingCore.2x/ShardingCore.2x.csproj b/src2x/ShardingCore.2x/ShardingCore.2x.csproj
@@ -6,7 +6,7 @@
 		<Version>$(EFCORE2)</Version>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<DefineConstants>TRACE;DEBUG;EFCORE2;</DefineConstants>
-		<LangVersion>10.0</LangVersion>
+		<LangVersion>9.0</LangVersion>
 		<AssemblyName>ShardingCore</AssemblyName>
 		<RootNamespace>ShardingCore</RootNamespace>
 		<RepositoryUrl>https://github.com/xuejmnet/sharding-core</RepositoryUrl>
diff --git a/src3x/ShardingCore.3x/ShardingCore.3x.csproj b/src3x/ShardingCore.3x/ShardingCore.3x.csproj
@@ -6,7 +6,7 @@
         <Version>$(EFCORE3)</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;EFCORE3;</DefineConstants>
-	    <LangVersion>10.0</LangVersion>
+		<LangVersion>9.0</LangVersion>
         <AssemblyName>ShardingCore</AssemblyName>
         <RootNamespace>ShardingCore</RootNamespace>
 	    <RepositoryUrl>https://github.com/xuejmnet/sharding-core</RepositoryUrl>
diff --git a/src5x/ShardingCore.5x/ShardingCore.5x.csproj b/src5x/ShardingCore.5x/ShardingCore.5x.csproj
@@ -5,7 +5,7 @@
 		<Version>$(EFCORE5)</Version>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<DefineConstants>TRACE;DEBUG;EFCORE5;</DefineConstants>
-		<LangVersion>10.0</LangVersion>
+		<LangVersion>9.0</LangVersion>
 		<AssemblyName>ShardingCore</AssemblyName>
 		<RootNamespace>ShardingCore</RootNamespace>
 		<RepositoryUrl>https://github.com/xuejmnet/sharding-core</RepositoryUrl>

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,20 @@ public bool AddConnectionString(string dataSourceName, string connectionString)`
`49`	`49`	`if (_readWriteOptions.ReadStrategy == ReadStrategyEnum.Loop)`
`50`	`50`	`{`
`51`	`51`	`connector= new ReadWriteLoopConnector(dataSourceName, new List<string> { connectionString });`
	`52`	`+ _connectors.TryAdd(dataSourceName, connector);`
	`53`	`+ return true;`
`52`	`54`	`}`
`53`	`55`	`else if (_readWriteOptions.ReadStrategy == ReadStrategyEnum.Random)`
`54`	`56`	`{`
`55`		`- connector= new ReadWriteLoopConnector(dataSourceName, new List<string> { connectionString });`
	`57`	`+ connector= new ReadWriteRandomConnector(dataSourceName, new List<string> { connectionString });`
	`58`	`+ _connectors.TryAdd(dataSourceName, connector);`
	`59`	`+ return true;`
	`60`	`+ }`
	`61`	`+ else`
	`62`	`+ {`
	`63`	`+ throw new ShardingCoreInvalidOperationException(`
	`64`	`+ $"unknown read write strategy:[{_readWriteOptions.ReadStrategy}]");`
`56`	`65`	`}`
`57`		`-`
`58`		`- throw new ShardingCoreInvalidOperationException(`
`59`		`- $"unknown read write strategy:[{_readWriteOptions.ReadStrategy}]");`
`60`		`-`
`61`	`66`	`}`
`62`	`67`	`else`
`63`	`68`	`{`