修复

efcore7的fromsqlraw的bug
dotnetcore · Nov 18, 2022 · ce1faf8 · ce1faf8
1 parent 7bab73c
commit ce1faf8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/nuget-publish.bat b/nuget-publish.bat
@@ -1,6 +1,6 @@
 :start
 ::定义版本
-set SHARDINGCORE7=7.0.0.4
+set SHARDINGCORE7=7.0.0.5
 set SHARDINGCORE2_6=6.8.0.9
 
 ::删除所有bin与obj下的文件

diff --git a/samples/Sample.SqlServer/Controllers/ValuesController.cs b/samples/Sample.SqlServer/Controllers/ValuesController.cs
@@ -405,6 +405,16 @@ public async Task<IActionResult> Get8()
                     s => s.SetProperty(b => b.Age, b => b.Age + 1));
 
 
+            return Ok();
+        }
+        [HttpGet]
+        public async Task<IActionResult> Get9()
+
+        {
+
+            var resultx112331tt2 = await _defaultTableDbContext.Set<SysTest>().FromSqlRaw("select *from systest where id='3'").FirstOrDefaultAsync();
+
+
             return Ok();
         }
 

diff --git a/src/ShardingCore/Sharding/Visitors/DbContextReplaceQueryableVisitor7.cs b/src/ShardingCore/Sharding/Visitors/DbContextReplaceQueryableVisitor7.cs
@@ -6,6 +6,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 using ShardingCore.Core.Internal.Visitors;
 using ShardingCore.Exceptions;
 using ShardingCore.Extensions;
@@ -156,11 +157,23 @@ protected override Expression VisitExtension(Expression node)
                 var newQueryable = targetIQ.Provider.CreateQuery(targetIQ.Expression);
                 if (Source == null)
                     Source = newQueryable;
-                //如何替换ef5的set
-                var replaceQueryRoot = new ReplaceSingleQueryRootExpressionVisitor();
-                replaceQueryRoot.Visit(newQueryable.Expression);
                 RootIsVisit = true;
-                return base.VisitExtension(replaceQueryRoot.QueryRootExpression);
+
+                if (queryRootExpression is FromSqlQueryRootExpression fromSqlQueryRootExpression)
+                {
+                    var sqlQueryRootExpression = new FromSqlQueryRootExpression(newQueryable.Provider as IAsyncQueryProvider,
+                        fromSqlQueryRootExpression.EntityType, fromSqlQueryRootExpression.Sql,
+                        fromSqlQueryRootExpression.Argument);
+
+                    return base.VisitExtension(sqlQueryRootExpression);
+                }
+                else
+                {
+                    //如何替换ef5的set
+                    var replaceQueryRoot = new ReplaceSingleQueryRootExpressionVisitor();
+                    replaceQueryRoot.Visit(newQueryable.Expression);
+                    return base.VisitExtension(replaceQueryRoot.QueryRootExpression);
+                }
             }
 
             return base.VisitExtension(node);

diff --git a/src/ShardingCore/ShardingCore.csproj b/src/ShardingCore/ShardingCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net6;net7;</TargetFrameworks>
-        <Version>7.0.0.4</Version>
+        <Version>7.0.0.5</Version>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <DefineConstants>TRACE;DEBUG;SHARDINGCORE7;</DefineConstants>
         <LangVersion>latest</LangVersion>