From fb61eb4bccdbe97e82d6303581b60cb3b73ad3e6 Mon Sep 17 00:00:00 2001 From: xuejiaming <326308290@qq.com> Date: Mon, 13 Dec 2021 09:06:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TableEnsureManager=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ShardingCore/DIExtensions/ShardingCoreConfigEndBuilder.cs | 1 + src/ShardingCore/DIExtensions/ShardingDataBaseOrTableBuilder.cs | 1 + src/ShardingCore/DIExtensions/ShardingDataSourceRouteBuilder.cs | 1 + .../DIExtensions/ShardingReadWriteSeparationBuilder.cs | 1 + src/ShardingCore/DIExtensions/ShardingTableBuilder.cs | 1 + .../DynamicDataSources/DefaultDataSourceInitializer.cs | 2 +- src/ShardingCore/ShardingConfigOption.cs | 1 + .../{ => Abstractions}/AbstractTableEnsureManager.cs | 2 +- .../TableExists/{ => Abstractions}/ITableEnsureManager.cs | 2 +- src/ShardingCore/TableExists/EmptyTableEnsureManager.cs | 1 + src/ShardingCore/TableExists/MySqlTableEnsureManager.cs | 1 + src/ShardingCore/TableExists/SqlServerTableEnsureManager.cs | 1 + 12 files changed, 12 insertions(+), 3 deletions(-) rename src/ShardingCore/TableExists/{ => Abstractions}/AbstractTableEnsureManager.cs (97%) rename src/ShardingCore/TableExists/{ => Abstractions}/ITableEnsureManager.cs (92%) diff --git a/src/ShardingCore/DIExtensions/ShardingCoreConfigEndBuilder.cs b/src/ShardingCore/DIExtensions/ShardingCoreConfigEndBuilder.cs index e3c975ac..00adebf5 100644 --- a/src/ShardingCore/DIExtensions/ShardingCoreConfigEndBuilder.cs +++ b/src/ShardingCore/DIExtensions/ShardingCoreConfigEndBuilder.cs @@ -13,6 +13,7 @@ using ShardingCore.Sharding.ReadWriteConfigurations.Abstractions; using ShardingCore.Sharding.ShardingComparision; using ShardingCore.Sharding.ShardingComparision.Abstractions; using ShardingCore.TableExists; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.DIExtensions { diff --git a/src/ShardingCore/DIExtensions/ShardingDataBaseOrTableBuilder.cs b/src/ShardingCore/DIExtensions/ShardingDataBaseOrTableBuilder.cs index 9ff026b2..8e97ecf1 100644 --- a/src/ShardingCore/DIExtensions/ShardingDataBaseOrTableBuilder.cs +++ b/src/ShardingCore/DIExtensions/ShardingDataBaseOrTableBuilder.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using ShardingCore.Sharding.Abstractions; using ShardingCore.Sharding.ShardingComparision.Abstractions; using ShardingCore.TableExists; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.DIExtensions { diff --git a/src/ShardingCore/DIExtensions/ShardingDataSourceRouteBuilder.cs b/src/ShardingCore/DIExtensions/ShardingDataSourceRouteBuilder.cs index d04571fa..c8ca2ae3 100644 --- a/src/ShardingCore/DIExtensions/ShardingDataSourceRouteBuilder.cs +++ b/src/ShardingCore/DIExtensions/ShardingDataSourceRouteBuilder.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using ShardingCore.Sharding.Abstractions; using ShardingCore.Sharding.ShardingComparision.Abstractions; using ShardingCore.TableExists; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.DIExtensions { diff --git a/src/ShardingCore/DIExtensions/ShardingReadWriteSeparationBuilder.cs b/src/ShardingCore/DIExtensions/ShardingReadWriteSeparationBuilder.cs index 4f25d144..c6b4b8c6 100644 --- a/src/ShardingCore/DIExtensions/ShardingReadWriteSeparationBuilder.cs +++ b/src/ShardingCore/DIExtensions/ShardingReadWriteSeparationBuilder.cs @@ -6,6 +6,7 @@ using ShardingCore.Sharding.Abstractions; using ShardingCore.Sharding.ReadWriteConfigurations; using ShardingCore.Sharding.ShardingComparision.Abstractions; using ShardingCore.TableExists; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.DIExtensions { diff --git a/src/ShardingCore/DIExtensions/ShardingTableBuilder.cs b/src/ShardingCore/DIExtensions/ShardingTableBuilder.cs index 7a5641c3..68b77fb4 100644 --- a/src/ShardingCore/DIExtensions/ShardingTableBuilder.cs +++ b/src/ShardingCore/DIExtensions/ShardingTableBuilder.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using ShardingCore.Sharding.Abstractions; using ShardingCore.Sharding.ShardingComparision.Abstractions; using ShardingCore.TableExists; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.DIExtensions { diff --git a/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs b/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs index 9043b310..64f85508 100644 --- a/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs +++ b/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs @@ -21,6 +21,7 @@ using ShardingCore.Sharding.Abstractions; using ShardingCore.Sharding.ParallelTables; using ShardingCore.TableCreator; using ShardingCore.TableExists; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.DynamicDataSources { @@ -68,7 +69,6 @@ namespace ShardingCore.DynamicDataSources foreach (var entity in context.Model.GetEntityTypes()) { var entityType = entity.ClrType; - if (_virtualDataSource.IsDefault(dataSourceName)) { if (_entityMetadataManager.IsShardingTable(entityType)) diff --git a/src/ShardingCore/ShardingConfigOption.cs b/src/ShardingCore/ShardingConfigOption.cs index ffecdd17..a0ca3174 100644 --- a/src/ShardingCore/ShardingConfigOption.cs +++ b/src/ShardingCore/ShardingConfigOption.cs @@ -15,6 +15,7 @@ using ShardingCore.Sharding.ParallelTables; using ShardingCore.Sharding.ShardingComparision; using ShardingCore.Sharding.ShardingComparision.Abstractions; using ShardingCore.TableExists; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore { diff --git a/src/ShardingCore/TableExists/AbstractTableEnsureManager.cs b/src/ShardingCore/TableExists/Abstractions/AbstractTableEnsureManager.cs similarity index 97% rename from src/ShardingCore/TableExists/AbstractTableEnsureManager.cs rename to src/ShardingCore/TableExists/Abstractions/AbstractTableEnsureManager.cs index a438c516..c5d9d1b0 100644 --- a/src/ShardingCore/TableExists/AbstractTableEnsureManager.cs +++ b/src/ShardingCore/TableExists/Abstractions/AbstractTableEnsureManager.cs @@ -10,7 +10,7 @@ using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails; using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails.Abstractions; using ShardingCore.Sharding.Abstractions; -namespace ShardingCore.TableExists +namespace ShardingCore.TableExists.Abstractions { public abstract class AbstractTableEnsureManager : ITableEnsureManager where TShardingDbContext : DbContext, IShardingDbContext { diff --git a/src/ShardingCore/TableExists/ITableEnsureManager.cs b/src/ShardingCore/TableExists/Abstractions/ITableEnsureManager.cs similarity index 92% rename from src/ShardingCore/TableExists/ITableEnsureManager.cs rename to src/ShardingCore/TableExists/Abstractions/ITableEnsureManager.cs index 678f7b5a..ba78e52d 100644 --- a/src/ShardingCore/TableExists/ITableEnsureManager.cs +++ b/src/ShardingCore/TableExists/Abstractions/ITableEnsureManager.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using ShardingCore.Sharding.Abstractions; -namespace ShardingCore.TableExists +namespace ShardingCore.TableExists.Abstractions { public interface ITableEnsureManager { diff --git a/src/ShardingCore/TableExists/EmptyTableEnsureManager.cs b/src/ShardingCore/TableExists/EmptyTableEnsureManager.cs index d2adabde..05cb2ade 100644 --- a/src/ShardingCore/TableExists/EmptyTableEnsureManager.cs +++ b/src/ShardingCore/TableExists/EmptyTableEnsureManager.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using ShardingCore.Sharding.Abstractions; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.TableExists { diff --git a/src/ShardingCore/TableExists/MySqlTableEnsureManager.cs b/src/ShardingCore/TableExists/MySqlTableEnsureManager.cs index fd731a30..39ae1ce1 100644 --- a/src/ShardingCore/TableExists/MySqlTableEnsureManager.cs +++ b/src/ShardingCore/TableExists/MySqlTableEnsureManager.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using ShardingCore.Sharding.Abstractions; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.TableExists { diff --git a/src/ShardingCore/TableExists/SqlServerTableEnsureManager.cs b/src/ShardingCore/TableExists/SqlServerTableEnsureManager.cs index 42fd9dda..d22fe6e4 100644 --- a/src/ShardingCore/TableExists/SqlServerTableEnsureManager.cs +++ b/src/ShardingCore/TableExists/SqlServerTableEnsureManager.cs @@ -9,6 +9,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails; using ShardingCore.Sharding.Abstractions; +using ShardingCore.TableExists.Abstractions; namespace ShardingCore.TableExists {