Merge branch 'main' of github.com:dotnetcore/sharding-core

xuejmnet · xuejmnet · commit cef363552bf5 · 2022-10-31T23:33:52.000+08:00
diff --git a/src/ShardingCore/Core/TrackerManagers/TrackerManager.cs b/src/ShardingCore/Core/TrackerManagers/TrackerManager.cs
@@ -67,13 +67,16 @@ public bool IsDbContextModel(Type entityType)
 
         public Type TranslateEntityType(Type entityType)
         {
-            if (!_dbContextModels.ContainsKey(entityType))
+            if (_shardingConfigOptions.UseEntityFrameworkCoreProxies)
             {
-                if (_shardingConfigOptions.UseEntityFrameworkCoreProxies && entityType.BaseType != null)
+                if (!_dbContextModels.ContainsKey(entityType))
                 {
-                    if (_dbContextModels.ContainsKey(entityType.BaseType))
+                    if (entityType.BaseType != null)
                     {
-                        return entityType.BaseType;
+                        if (_dbContextModels.ContainsKey(entityType.BaseType))
+                        {
+                            return entityType.BaseType;
+                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,16 @@ public bool IsDbContextModel(Type entityType)`
`67`	`67`
`68`	`68`	`public Type TranslateEntityType(Type entityType)`
`69`	`69`	`{`
`70`		`- if (!_dbContextModels.ContainsKey(entityType))`
	`70`	`+ if (_shardingConfigOptions.UseEntityFrameworkCoreProxies)`
`71`	`71`	`{`
`72`		`- if (_shardingConfigOptions.UseEntityFrameworkCoreProxies && entityType.BaseType != null)`
	`72`	`+ if (!_dbContextModels.ContainsKey(entityType))`
`73`	`73`	`{`
`74`		`- if (_dbContextModels.ContainsKey(entityType.BaseType))`
	`74`	`+ if (entityType.BaseType != null)`
`75`	`75`	`{`
`76`		`- return entityType.BaseType;`
	`76`	`+ if (_dbContextModels.ContainsKey(entityType.BaseType))`
	`77`	`+ {`
	`78`	`+ return entityType.BaseType;`
	`79`	`+ }`
`77`	`80`	`}`
`78`	`81`	`}`
`79`	`82`	`}`