修复内嵌dbcontext的替换bug

dotnetcore · Jun 8, 2022 · 154feb7 · 154feb7
1 parent 807dd4f
commit 154feb7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/nuget-publish.bat b/nuget-publish.bat
@@ -1,9 +1,9 @@
 :start
 ::定义版本
-set EFCORE2=2.5.0.3
-set EFCORE3=3.5.0.3
-set EFCORE5=5.5.0.3
-set EFCORE6=6.5.0.3
+set EFCORE2=2.5.0.4
+set EFCORE3=3.5.0.4
+set EFCORE5=5.5.0.4
+set EFCORE6=6.5.0.4
 
 ::删除所有bin与obj下的文件
 @echo off

diff --git a/samples/Sample.SqlServer/Controllers/ValuesController.cs b/samples/Sample.SqlServer/Controllers/ValuesController.cs
@@ -393,6 +393,7 @@ public async Task<IActionResult> Get6()
         public async Task<IActionResult> Get7()
         {
 
+
             var resultx112331tt2 = await _defaultTableDbContext.Set<SysTest>().Where(o => o.Id == "2")
                 .Select(o => new
                 {

diff --git a/src/ShardingCore/Extensions/CommonExtension.cs b/src/ShardingCore/Extensions/CommonExtension.cs
@@ -165,7 +165,7 @@ public static bool IsMemberQueryable(this MemberExpression memberExpression)
         {
             if (memberExpression == null)
                 throw new ArgumentNullException(nameof(memberExpression));
-            return memberExpression.Type.FullName?.StartsWith("System.Linq.IQueryable`1") ?? false;
+            return (memberExpression.Type.FullName?.StartsWith("System.Linq.IQueryable`1") ?? false) || typeof(DbContext).IsAssignableFrom(memberExpression.Type);
         }
 
         public static Type GetSequenceType(this Type type)

diff --git a/src/ShardingCore/Sharding/Visitors/DbContextReplaceQueryableVisitor.cs b/src/ShardingCore/Sharding/Visitors/DbContextReplaceQueryableVisitor.cs
@@ -48,6 +48,11 @@ protected override Expression VisitMember
                         {
                             return ReplaceMemberExpression(queryable);
                         }
+
+                        if (value is DbContext dbContext)
+                        {
+                            return ReplaceMemberExpression(dbContext);
+                        }
                         //return Expression.Constant(value);
                     }
 
@@ -58,6 +63,10 @@ protected override Expression VisitMember
                         {
                             return ReplaceMemberExpression(queryable);
                         }
+                        if (value is DbContext dbContext)
+                        {
+                            return ReplaceMemberExpression(dbContext);
+                        }
                     }
                 }
             }
@@ -76,6 +85,14 @@ private MemberExpression ReplaceMemberExpression(IQueryable queryable)
                 Expression.Property(ConstantExpression.Constant(tempVariable), nameof(TempVariable<object>.Queryable));
             return queryableMemberReplaceExpression;
         }
+        private MemberExpression ReplaceMemberExpression(DbContext dbContext)
+        {
+            var tempVariableGenericType = typeof(TempDbVariable<>).GetGenericType0(dbContext.GetType());
+            var tempVariable = Activator.CreateInstance(tempVariableGenericType, _dbContext);
+            MemberExpression queryableMemberReplaceExpression =
+                Expression.Property(ConstantExpression.Constant(tempVariable), nameof(TempDbVariable<object>.DbContext));
+            return queryableMemberReplaceExpression;
+        }
 
         internal sealed class TempVariable<T1>
         {
@@ -86,6 +103,15 @@ public TempVariable(IQueryable<T1> queryable)
                 Queryable = queryable;
             }
         }
+        internal sealed class TempDbVariable<T1>
+        {
+            public T1 DbContext { get; }
+
+            public TempDbVariable(T1 dbContext)
+            {
+                DbContext = dbContext;
+            }
+        }
 
     }