Autotest
/
sharding
mirror of https://gitee.com/dotnetchina/sharding-core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[#217]

This commit is contained in:
xuejiaming 2022-11-16 21:41:40 +08:00
parent 3f9624f221
commit 833a234058
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
samples/Sample.MySql/Controllers/WeatherForecastController.cs
View File

@ -171,19 +171,20 @@ namespace Sample.MySql.Controllers
[HttpGet] [HttpGet]
public async Task<IActionResult> Get2() public async Task<IActionResult> Get2()
{ {
var sql= from a in _defaultTableDbContext.Set<DynamicTable>() // var sql= from a in _defaultTableDbContext.Set<DynamicTable>()
join b in _defaultTableDbContext.Set<SysTest>() // join b in _defaultTableDbContext.Set<SysTest>()
on a.Id equals b.Id into t1 // on a.Id equals b.Id into t1
from aa1 in t1.DefaultIfEmpty() // from aa1 in t1.DefaultIfEmpty()
// join bc in _defaultTableDbContext.Set<SysTest>() // // join bc in _defaultTableDbContext.Set<SysTest>()
// on a.Id equals bc.Id into t2 // // on a.Id equals bc.Id into t2
// from aa2 in t2.DefaultIfEmpty() // // from aa2 in t2.DefaultIfEmpty()
select new // select new
{ // {
ID = a.Id // ID = a.Id
}; // };
var listAsync =await sql.ToListAsync(); // var listAsync =await sql.ToListAsync();
// var sysUserMods = await _defaultTableDbContext.Set<SysUserMod>().FromSqlRaw("select * from SysUserMod where id='2'").ToListAsync(); var sysUserMods1 = await _defaultTableDbContext.Set<SysUserMod>().FromSqlRaw("select * from SysUserMod where id='2'").ToListAsync();
var sysUserMods2 = await _defaultTableDbContext.Set<SysTest>().FromSqlRaw("select * from SysTest where id='2'").ToListAsync();
return Ok(); return Ok();
} }
} }

2
src/ShardingCore/Sharding/ShardingExecutors/QueryCompilerExecutor.cs
View File

@ -15,10 +15,12 @@ namespace ShardingCore.Sharding.ShardingExecutors
{ {
private readonly IQueryCompiler _queryCompiler; private readonly IQueryCompiler _queryCompiler;
private readonly Expression _queryExpression; private readonly Expression _queryExpression;
private readonly Expression _originalQueryExpression;
public QueryCompilerExecutor(DbContext dbContext,Expression queryExpression) public QueryCompilerExecutor(DbContext dbContext,Expression queryExpression)
{ {
_queryCompiler = dbContext.GetService<IQueryCompiler>(); _queryCompiler = dbContext.GetService<IQueryCompiler>();
_originalQueryExpression = queryExpression;
_queryExpression = queryExpression.ReplaceDbContextExpression(dbContext); _queryExpression = queryExpression.ReplaceDbContextExpression(dbContext);
} }

19
src/ShardingCore/Sharding/Visitors/DbContextReplaceQueryableVisitor2_6.cs
View File

@ -6,6 +6,7 @@ using System.Reflection;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Internal; using Microsoft.EntityFrameworkCore.Internal;
using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.Query.Internal;
using ShardingCore.Core.Internal.Visitors; using ShardingCore.Core.Internal.Visitors;
using ShardingCore.Exceptions; using ShardingCore.Exceptions;
using ShardingCore.Extensions; using ShardingCore.Extensions;
@ -198,11 +199,21 @@ namespace ShardingCore.Core.Internal.Visitors
var newQueryable = targetIQ.Provider.CreateQuery(targetIQ.Expression); var newQueryable = targetIQ.Provider.CreateQuery(targetIQ.Expression);
if (Source == null) if (Source == null)
Source = newQueryable; Source = newQueryable;
//如何替换ef5的set
var replaceQueryRoot = new ReplaceSingleQueryRootExpressionVisitor();
replaceQueryRoot.Visit(newQueryable.Expression);
RootIsVisit = true; RootIsVisit = true;
return base.VisitExtension(replaceQueryRoot.QueryRootExpression); if (queryRootExpression is FromSqlQueryRootExpression fromSqlQueryRootExpression)
{
var sqlQueryRootExpression = new FromSqlQueryRootExpression(newQueryable.Provider as IAsyncQueryProvider,
queryRootExpression.EntityType, fromSqlQueryRootExpression.Sql,
fromSqlQueryRootExpression.Argument);
return base.VisitExtension(sqlQueryRootExpression);
}
else
{
var replaceQueryRoot = new ReplaceSingleQueryRootExpressionVisitor();
replaceQueryRoot.Visit(newQueryable.Expression);
return base.VisitExtension(replaceQueryRoot.QueryRootExpression);
}
} }
return base.VisitExtension(node); return base.VisitExtension(node);