修复影子属性使用时GetProperty导致的bug,发布6.8.0.1

xuejmnet · xuejmnet · commit 9f26b1947ffc · 2022-10-24T22:17:38.000+08:00
diff --git a/benchmarks/ShardingCoreBenchmark/EFCoreCrud.cs b/benchmarks/ShardingCoreBenchmark/EFCoreCrud.cs
@@ -50,7 +50,6 @@ public EFCoreCrud()
                 }).AddShardingCore();
 
             var buildServiceProvider = services.BuildServiceProvider();
-            buildServiceProvider.UseAutoShardingCreate();
             buildServiceProvider.UseAutoTryCompensateTable();
             ICollection<Order> orders = new LinkedList<Order>();
 
diff --git a/benchmarks/ShardingCoreBenchmark5x/EFCoreCrud.cs b/benchmarks/ShardingCoreBenchmark5x/EFCoreCrud.cs
@@ -48,7 +48,6 @@ public EFCoreCrud()
                 }).ReplaceService<ITableEnsureManager,SqlServerTableEnsureManager>().EnsureConfig();
 
             var buildServiceProvider = services.BuildServiceProvider();
-            buildServiceProvider.UseAutoShardingCreate();
             buildServiceProvider.UseAutoTryCompensateTable();
             ICollection<Order> orders = new LinkedList<Order>();
 
diff --git a/samples/Sample.AutoCreateIfPresent/AreaDevice.cs b/samples/Sample.AutoCreateIfPresent/AreaDevice.cs
@@ -1,5 +1,8 @@
-﻿namespace Sample.AutoCreateIfPresent
+﻿using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Sample.AutoCreateIfPresent
 {
+    [Table("aaa")]
     public class AreaDevice
     {
         public string Id { get; set; }
diff --git a/samples/Sample.AutoCreateIfPresent/Program.cs b/samples/Sample.AutoCreateIfPresent/Program.cs
@@ -50,7 +50,6 @@
     // app.UseSwagger();
     // app.UseSwaggerUI();
 }
-app.Services.UseAutoShardingCreate();
 app.Services.UseAutoTryCompensateTable();
 
 
diff --git a/samples/Sample.BulkConsole/Program.cs b/samples/Sample.BulkConsole/Program.cs
@@ -47,7 +47,6 @@ static void Main(string[] args)
 
                 }).ReplaceService<ITableEnsureManager,SqlServerTableEnsureManager>().EnsureConfig();
             var serviceProvider = services.BuildServiceProvider();
-            serviceProvider.UseAutoShardingCreate();
             serviceProvider.UseAutoTryCompensateTable();
             using (var serviceScope = serviceProvider.CreateScope())
             {
diff --git a/samples/Sample.MySql/Startup.cs b/samples/Sample.MySql/Startup.cs
@@ -181,7 +181,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             }
             // app.ApplicationServices.UseAutoTryCompensateTable();
            
-            // app.ApplicationServices.UseAutoShardingCreate();
             // var shardingRuntimeContext = app.ApplicationServices.GetRequiredService<IShardingRuntimeContext>();
             // var entityMetadataManager = shardingRuntimeContext.GetEntityMetadataManager();
             // var entityMetadata = entityMetadataManager.TryGet<SysUserMod>();
diff --git a/samples/Sample.NoShardingMultiLevel/Program.cs b/samples/Sample.NoShardingMultiLevel/Program.cs
@@ -50,7 +50,7 @@
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
-app.Services.UseAutoShardingCreate();
+// app.Services.UseAutoShardingCreate();
 app.Services.UseAutoTryCompensateTable();
 app.UseAuthorization();
 
diff --git a/samples/Sample.SqlServer/Startup.cs b/samples/Sample.SqlServer/Startup.cs
@@ -125,7 +125,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 var migrator = defaultShardingDbContext.GetService<IMigrator>();
                 migrator.Migrate("InitialCreate");
             }
-                app.ApplicationServices.UseAutoShardingCreate();
             app.ApplicationServices.UseAutoTryCompensateTable();
 
             app.UseRouting();
diff --git a/samples/Sample.SqlServer/UnionAllMerge/UnionAllMergeSqlServerQuerySqlGeneratorFactory.cs b/samples/Sample.SqlServer/UnionAllMerge/UnionAllMergeSqlServerQuerySqlGeneratorFactory.cs
@@ -69,7 +69,7 @@ private Expression OverrideVisitTable(TableExpression tableExpression)
                 {
                     var tails = tableRouteResults.Select(o => o.ReplaceTables.FirstOrDefault(r => r.EntityType==entityMetadatas[0].EntityType)?.Tail).ToHashSet();
 
-                    var sqlGenerationHelper = typeof(QuerySqlGenerator).GetTypeFieldValue(this, "_sqlGenerationHelper") as ISqlGenerationHelper;
+                    var sqlGenerationHelper = ObjectExtension.GetTypeFieldValue(typeof(QuerySqlGenerator),this, "_sqlGenerationHelper") as ISqlGenerationHelper;
                     string newTableName = null;
                     if (tails.Count == 1)
                     {
@@ -80,7 +80,7 @@ private Expression OverrideVisitTable(TableExpression tableExpression)
                         newTableName = "(" + string.Join(" union all ", tails.Select(tail => $"select * from {sqlGenerationHelper.DelimitIdentifier($"{tableExpression.Name}{entityMetadatas[0].TableSeparator}{tail}", tableExpression.Schema)}")) + ")";
                     }
 
-                    var relationalCommandBuilder = typeof(QuerySqlGenerator).GetTypeFieldValue(this, "_relationalCommandBuilder") as IRelationalCommandBuilder;
+                    var relationalCommandBuilder = ObjectExtension.GetTypeFieldValue(typeof(QuerySqlGenerator),this, "_relationalCommandBuilder") as IRelationalCommandBuilder;
                     relationalCommandBuilder.Append(newTableName).Append(this.AliasSeparator).Append(sqlGenerationHelper.DelimitIdentifier(tableExpression.Alias));
                     return tableExpression;
                 }
diff --git a/samples/Sample.SqlServer3x/Startup.cs b/samples/Sample.SqlServer3x/Startup.cs
@@ -90,7 +90,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.ApplicationServices.UseAutoShardingCreate();
             app.ApplicationServices.UseAutoTryCompensateTable();
             app.UseRouting();
 
diff --git a/samples/Sample.SqlServerShardingAll/StartupExtension.cs b/samples/Sample.SqlServerShardingAll/StartupExtension.cs
@@ -13,7 +13,6 @@ public static class StartupExtension
     {
         public static void UseShardingCore(this IApplicationBuilder app)
         {
-            app.ApplicationServices.UseAutoShardingCreate();
             app.ApplicationServices.UseAutoTryCompensateTable();
         }
         public static void InitSeed(this IApplicationBuilder app)
diff --git a/samples/Sample.SqlServerShardingDataSource/StartupExtension.cs b/samples/Sample.SqlServerShardingDataSource/StartupExtension.cs
@@ -13,7 +13,6 @@ public static class StartupExtension
     {
         public static void UseShardingCore(this IApplicationBuilder app)
         {
-            app.ApplicationServices.UseAutoShardingCreate();
             app.ApplicationServices.UseAutoTryCompensateTable();
         }
         public static void InitSeed(this IApplicationBuilder app)
diff --git a/samples/Sample.SqlServerShardingTable/StartupExtension.cs b/samples/Sample.SqlServerShardingTable/StartupExtension.cs
@@ -14,7 +14,6 @@ public static class StartupExtension
     {
         public static void UseShardingCore(this IApplicationBuilder app)
         {
-            app.ApplicationServices.UseAutoShardingCreate();
             app.ApplicationServices.UseAutoTryCompensateTable();
         }
         public static void InitSeed(this IApplicationBuilder app)
diff --git a/samples/Samples.AbpSharding/AbstractShardingAbpZeroDbContext.cs b/samples/Samples.AbpSharding/AbstractShardingAbpZeroDbContext.cs
@@ -28,7 +28,7 @@ namespace Samples.AbpSharding
 {
     public abstract class AbstractShardingAbpZeroDbContext<TTenant, TRole, TUser, TSelf>
         : AbpZeroDbContext<TTenant, TRole, TUser, TSelf>,
-        IShardingDbContext
+        IShardingDbContext,IShardingTableDbContext
         where TTenant : AbpTenant<TUser>
         where TRole : AbpRole<TUser>
         where TUser : AbpUser<TUser>
diff --git a/samples/Samples.AutoByDate.SqlServer/DIExtension.cs b/samples/Samples.AutoByDate.SqlServer/DIExtension.cs
@@ -15,7 +15,6 @@ public static class DIExtension
     {
         public static IApplicationBuilder UseShardingCore(this IApplicationBuilder app)
         {
-            app.ApplicationServices.UseAutoShardingCreate();
             app.ApplicationServices.UseAutoTryCompensateTable();
             return app;
         }
diff --git a/src/ShardingCore/Core/EntityMetadatas/EntityMetadataDataSourceBuilder.cs b/src/ShardingCore/Core/EntityMetadatas/EntityMetadataDataSourceBuilder.cs
@@ -3,6 +3,7 @@
 using System.Linq.Expressions;
 using System.Text;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using ShardingCore.Extensions;
 
 #if NETCOREAPP2_0
 using Microsoft.EntityFrameworkCore.Internal;
@@ -37,7 +38,7 @@ public EntityMetadataDataSourceBuilder<TEntity> ShardingProperty<TProperty>(Expr
         /// <returns></returns>
         public EntityMetadataDataSourceBuilder<TEntity> ShardingProperty(string propertyName)
         {
-            var propertyInfo = typeof(TEntity).GetProperty(propertyName);
+            var propertyInfo = typeof(TEntity).GetUltimateShadowingProperty(propertyName);
             _entityMetadata.SetShardingDataSourceProperty(propertyInfo);
             return this;
         }
@@ -49,7 +50,7 @@ public EntityMetadataDataSourceBuilder<TEntity> ShardingExtraProperty<TProperty>
         }
         public EntityMetadataDataSourceBuilder<TEntity> ShardingExtraProperty(string propertyName)
         {
-            var propertyInfo = typeof(TEntity).GetProperty(propertyName);
+            var propertyInfo = typeof(TEntity).GetUltimateShadowingProperty(propertyName);
             _entityMetadata.AddExtraSharingDataSourceProperty(propertyInfo);
             return this;
         }
diff --git a/src/ShardingCore/Core/EntityMetadatas/EntityMetadataTableBuilder.cs b/src/ShardingCore/Core/EntityMetadatas/EntityMetadataTableBuilder.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using ShardingCore.Extensions;
 
 #if NETCOREAPP2_0
 using Microsoft.EntityFrameworkCore.Internal;
@@ -34,7 +35,7 @@ public EntityMetadataTableBuilder<TEntity> ShardingProperty<TProperty>(Expressio
         }
         public EntityMetadataTableBuilder<TEntity> ShardingProperty(string propertyName)
         {
-            var propertyInfo = typeof(TEntity).GetProperty(propertyName);
+            var propertyInfo = typeof(TEntity).GetUltimateShadowingProperty(propertyName);
             _entityMetadata.SetShardingTableProperty(propertyInfo);
             return this;
         }
@@ -46,7 +47,7 @@ public EntityMetadataTableBuilder<TEntity> ShardingExtraProperty<TProperty>(Expr
         }
         public EntityMetadataTableBuilder<TEntity> ShardingExtraProperty(string propertyName)
         {
-            var propertyInfo = typeof(TEntity).GetProperty(propertyName);
+            var propertyInfo = typeof(TEntity).GetUltimateShadowingProperty(propertyName);
             _entityMetadata.AddExtraSharingTableProperty(propertyInfo);
             return this;
         }
diff --git a/src/ShardingCore/Extensions/ExpressionExtension.cs b/src/ShardingCore/Extensions/ExpressionExtension.cs
@@ -19,7 +19,7 @@ public static class ExpressionExtension
         public static void SetPropertyValue<T>(this T t, string name, object value)
         {
             Type type = t.GetType();
-            PropertyInfo p = type.GetProperty(name);
+            PropertyInfo p = type.GetUltimateShadowingProperty(name);
             if (p == null)
             {
                 throw new Exception($"type:{typeof(T)} not found [{name}] properity ");
@@ -56,21 +56,21 @@ public static (Type propertyType,object value) GetValueByExpression(this object
             if (propertyExpression.Contains("."))
             {
                 String[] childProperties = propertyExpression.Split('.');
-                property = entityType.GetProperty(childProperties[0]);
+                property = entityType.GetUltimateShadowingProperty(childProperties[0]);
                 //propertyAccess = Expression.MakeMemberAccess(parameter, property);
                 for (int i = 1; i < childProperties.Length; i++)
                 {
                     if (property == null)
                     {
                         throw new ShardingCoreException($"property:[{propertyExpression}] not in type:[{entityType}]");
                     }
-                    property = property.PropertyType.GetProperty(childProperties[i]);
+                    property = property.PropertyType.GetUltimateShadowingProperty(childProperties[i]);
                     //propertyAccess = Expression.MakeMemberAccess(propertyAccess, property);
                 }
             }
             else
             {
-                property = entityType.GetProperty(propertyExpression);
+                property = entityType.GetUltimateShadowingProperty(propertyExpression);
                 //propertyAccess = Expression.MakeMemberAccess(parameter, property);
             }
 
diff --git a/src/ShardingCore/Extensions/ObjectExtension.cs b/src/ShardingCore/Extensions/ObjectExtension.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using ShardingCore.Core;
 
 namespace ShardingCore.Extensions
 {
@@ -43,7 +44,7 @@ public static object GetFieldValue(this object obj, string fieldName)
         /// <returns></returns>
         public static object GetPropertyValue(this object obj, string propertyName)
         {
-            var property = obj.GetType().GetProperty(propertyName, _bindingFlags);
+            var property = obj.GetType().GetUltimateShadowingProperty(propertyName, _bindingFlags);
             if (property != null)
             {
                 return property.GetValue(obj);
@@ -62,7 +63,7 @@ public static object GetPropertyValue(this object obj, string propertyName)
         /// <returns></returns>
         public static object GetTypePropertyValue(this Type type,object obj, string propertyName)
         {
-            var property=type.GetProperty(propertyName, _bindingFlags);
+            var property=type.GetUltimateShadowingProperty(propertyName, _bindingFlags);
             if (property != null)
             {
                 return property.GetValue(obj);
@@ -74,7 +75,7 @@ public static object GetTypePropertyValue(this Type type,object obj, string prop
         }
         public static PropertyInfo GetObjectProperty(this object obj, string propertyName)
         {
-            return obj.GetType().GetProperty(propertyName, _bindingFlags);
+            return obj.GetType().GetUltimateShadowingProperty(propertyName,_bindingFlags);
         }
         /// <summary>
         /// 类型X是否包含某个属性
@@ -84,7 +85,7 @@ public static PropertyInfo GetObjectProperty(this object obj, string propertyNam
         /// <returns></returns>
         public static bool ContainPropertyName(this Type type, string propertyName)
         {
-            var property = type.GetProperty(propertyName, _bindingFlags);
+            var property = type.GetUltimateShadowingProperty(propertyName, _bindingFlags);
             return property != null;
         }
 
@@ -98,6 +99,52 @@ public static Type GetGenericType1(this Type genericType,Type arg0Type, Type arg
         {
             return genericType.MakeGenericType(arg0Type, arg1Type);
         }
+        public static PropertyInfo GetUltimateShadowingProperty(this Type type, string name)
+        {
+
+            return type.GetUltimateShadowingProperty(name,_bindingFlags);
+        }
+        /// <summary>
+        /// https://github.com/nunit/nunit/blob/111fc6b5550f33b4fceb6ac8693c5692e99a5747/src/NUnitFramework/framework/Internal/Reflect.cs
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="name"></param>
+        /// <param name="bindingFlags"></param>
+        /// <returns></returns>
+        public static PropertyInfo GetUltimateShadowingProperty(this Type type, string name, BindingFlags bindingFlags)
+        {
+            Check.NotNull(type, nameof(type));
+            Check.NotNull(name, nameof(name));
+            if ((bindingFlags & BindingFlags.DeclaredOnly) != 0)
+            {
+                // If you're asking us to search a hierarchy but only want properties declared in the given type,
+                // you're in the wrong place but okay:
+                return type.GetProperty(name, bindingFlags);
+            }
+
+            if ((bindingFlags & (BindingFlags.Public | BindingFlags.NonPublic)) == (BindingFlags.Public | BindingFlags.NonPublic))
+            {
+                // If we're searching for both public and nonpublic properties, search for only public first
+                // because chances are if there is a public property, it would be very surprising to detect the private shadowing property.
+
+                for (var publicSearchType = type; publicSearchType != null; publicSearchType = publicSearchType.GetTypeInfo().BaseType)
+                {
+                    var property = publicSearchType.GetProperty(name, (bindingFlags | BindingFlags.DeclaredOnly) & ~BindingFlags.NonPublic);
+                    if (property != null) return property;
+                }
+
+                // There is no public property, so may as well not ask to include them during the second search.
+                bindingFlags &= ~BindingFlags.Public;
+            }
+
+            for (var searchType = type; searchType != null; searchType = searchType.GetTypeInfo().BaseType)
+            {
+                var property = searchType.GetProperty(name, bindingFlags | BindingFlags.DeclaredOnly);
+                if (property != null) return property;
+            }
+
+            return null;
+        }
 
     }
 }
diff --git a/src/ShardingCore/Extensions/ShardingPageExtensions/ShardingPageExtension.cs b/src/ShardingCore/Extensions/ShardingPageExtensions/ShardingPageExtension.cs
@@ -23,7 +23,7 @@ private static IShardingDbContext GetShardingDbContext<T>(IQueryable<T> source)
             
             var entityQueryProvider = source.Provider as EntityQueryProvider??throw new ShardingCoreInvalidOperationException($"cant use sharding page that {nameof(IQueryable)} provider not {nameof(EntityQueryProvider)}");
 
-            var shardingQueryCompiler = entityQueryProvider.GetFieldValue("_queryCompiler") as ShardingQueryCompiler??throw new ShardingCoreInvalidOperationException($"cant use sharding page that {nameof(EntityQueryProvider)} not contains {nameof(ShardingQueryCompiler)} filed named _queryCompiler");
+            var shardingQueryCompiler = ObjectExtension.GetFieldValue(entityQueryProvider,"_queryCompiler") as ShardingQueryCompiler??throw new ShardingCoreInvalidOperationException($"cant use sharding page that {nameof(EntityQueryProvider)} not contains {nameof(ShardingQueryCompiler)} filed named _queryCompiler");
             var dbContextAvailable = shardingQueryCompiler as IShardingDbContextAvailable;
             if (dbContextAvailable == null)
             {
diff --git a/src/ShardingCore/Extensions/StringFieldOrderExtension.cs b/src/ShardingCore/Extensions/StringFieldOrderExtension.cs
@@ -31,17 +31,17 @@ private static LambdaExpression GenerateSelector(Type entityType,String property
             if (propertyName.Contains('.'))
             {
                 String[] childProperties = propertyName.Split('.');
-                property = entityType.GetProperty(childProperties[0]);
+                property = entityType.GetUltimateShadowingProperty(childProperties[0]);
                 propertyAccess = Expression.MakeMemberAccess(parameter, property);
                 for (int i = 1; i < childProperties.Length; i++)
                 {
-                    property = property.PropertyType.GetProperty(childProperties[i]);
+                    property = property.PropertyType.GetUltimateShadowingProperty(childProperties[i]);
                     propertyAccess = Expression.MakeMemberAccess(propertyAccess, property);
                 }
             }
             else
             {
-                property = entityType.GetProperty(propertyName);
+                property = entityType.GetUltimateShadowingProperty(propertyName);
                 propertyAccess = Expression.MakeMemberAccess(parameter, property);
             }
 
diff --git a/src/ShardingCore/Sharding/Enumerators/AggregateExtensions/AggregateExtension.cs b/src/ShardingCore/Sharding/Enumerators/AggregateExtensions/AggregateExtension.cs
diff --git a/src/ShardingCore/Sharding/Visitors/QuerySelectDiscoverVisitor.cs b/src/ShardingCore/Sharding/Visitors/QuerySelectDiscoverVisitor.cs
diff --git a/src/ShardingCore/Sharding/Visitors/QueryableExtraDiscoverVisitor.cs b/src/ShardingCore/Sharding/Visitors/QueryableExtraDiscoverVisitor.cs
diff --git a/src/ShardingCore/ShardingCoreExtension.cs b/src/ShardingCore/ShardingCoreExtension.cs
diff --git a/test/ShardingCore.Test/Startup.cs b/test/ShardingCore.Test/Startup.cs
diff --git a/test/ShardingCore.Test2x/Startup.cs b/test/ShardingCore.Test2x/Startup.cs
diff --git a/test/ShardingCore.Test3x/Startup.cs b/test/ShardingCore.Test3x/Startup.cs
diff --git a/test/ShardingCore.Test5x/Startup.cs b/test/ShardingCore.Test5x/Startup.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`		`-namespace Sample.AutoCreateIfPresent`
	`1`	`+using System.ComponentModel.DataAnnotations.Schema;`
	`2`	`+`
	`3`	`+namespace Sample.AutoCreateIfPresent`
`2`	`4`	`{`
	`5`	`+ [Table("aaa")]`
`3`	`6`	`public class AreaDevice`
`4`	`7`	`{`
`5`	`8`	`public string Id { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@`
`50`	`50`	`// app.UseSwagger();`
`51`	`51`	`// app.UseSwaggerUI();`
`52`	`52`	`}`
`53`		`-app.Services.UseAutoShardingCreate();`
`54`	`53`	`app.Services.UseAutoTryCompensateTable();`
`55`	`54`
`56`	`55`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ static void Main(string[] args)`
`47`	`47`
`48`	`48`	`}).ReplaceService<ITableEnsureManager,SqlServerTableEnsureManager>().EnsureConfig();`
`49`	`49`	`var serviceProvider = services.BuildServiceProvider();`
`50`		`- serviceProvider.UseAutoShardingCreate();`
`51`	`50`	`serviceProvider.UseAutoTryCompensateTable();`
`52`	`51`	`using (var serviceScope = serviceProvider.CreateScope())`
`53`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`181`	`181`	`}`
`182`	`182`	`// app.ApplicationServices.UseAutoTryCompensateTable();`
`183`	`183`
`184`		`- // app.ApplicationServices.UseAutoShardingCreate();`
`185`	`184`	`// var shardingRuntimeContext = app.ApplicationServices.GetRequiredService<IShardingRuntimeContext>();`
`186`	`185`	`// var entityMetadataManager = shardingRuntimeContext.GetEntityMetadataManager();`
`187`	`186`	`// var entityMetadata = entityMetadataManager.TryGet<SysUserMod>();`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`125`	`125`	`var migrator = defaultShardingDbContext.GetService<IMigrator>();`
`126`	`126`	`migrator.Migrate("InitialCreate");`
`127`	`127`	`}`
`128`		`- app.ApplicationServices.UseAutoShardingCreate();`
`129`	`128`	`app.ApplicationServices.UseAutoTryCompensateTable();`
`130`	`129`
`131`	`130`	`app.UseRouting();`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private Expression OverrideVisitTable(TableExpression tableExpression)`
`69`	`69`	`{`
`70`	`70`	`var tails = tableRouteResults.Select(o => o.ReplaceTables.FirstOrDefault(r => r.EntityType==entityMetadatas[0].EntityType)?.Tail).ToHashSet();`
`71`	`71`
`72`		`- var sqlGenerationHelper = typeof(QuerySqlGenerator).GetTypeFieldValue(this, "_sqlGenerationHelper") as ISqlGenerationHelper;`
	`72`	`+ var sqlGenerationHelper = ObjectExtension.GetTypeFieldValue(typeof(QuerySqlGenerator),this, "_sqlGenerationHelper") as ISqlGenerationHelper;`
`73`	`73`	`string newTableName = null;`
`74`	`74`	`if (tails.Count == 1)`
`75`	`75`	`{`
`@@ -80,7 +80,7 @@ private Expression OverrideVisitTable(TableExpression tableExpression)`
`80`	`80`	`newTableName = "(" + string.Join(" union all ", tails.Select(tail => $"select * from {sqlGenerationHelper.DelimitIdentifier($"{tableExpression.Name}{entityMetadatas[0].TableSeparator}{tail}", tableExpression.Schema)}")) + ")";`
`81`	`81`	`}`
`82`	`82`
`83`		`- var relationalCommandBuilder = typeof(QuerySqlGenerator).GetTypeFieldValue(this, "_relationalCommandBuilder") as IRelationalCommandBuilder;`
	`83`	`+ var relationalCommandBuilder = ObjectExtension.GetTypeFieldValue(typeof(QuerySqlGenerator),this, "_relationalCommandBuilder") as IRelationalCommandBuilder;`
`84`	`84`	`relationalCommandBuilder.Append(newTableName).Append(this.AliasSeparator).Append(sqlGenerationHelper.DelimitIdentifier(tableExpression.Alias));`
`85`	`85`	`return tableExpression;`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`90`	`90`	`app.UseDeveloperExceptionPage();`
`91`	`91`	`}`
`92`	`92`
`93`		`- app.ApplicationServices.UseAutoShardingCreate();`
`94`	`93`	`app.ApplicationServices.UseAutoTryCompensateTable();`
`95`	`94`	`app.UseRouting();`
`96`	`95`