Skip to content

Commit db1109b

Browse files
xuejmnetxuejmnet
committed
优化单元测试和all方法的错误还有修复group by下的average bug,并且发布x.3.1.51
1 parent f4b247e commit db1109b

File tree

99 files changed

+762
-7868
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+762
-7868
lines changed

‎ShardingCore.sln‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.SqlServerShardingTab
4343
EndProject
4444
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.SqlServerShardingAll", "samples\Sample.SqlServerShardingAll\Sample.SqlServerShardingAll.csproj", "{FD2C6D03-8D6D-4C1C-B534-4C785A4B1B06}"
4545
EndProject
46-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShardingCore.Test6x", "test\ShardingCore.Test6x\ShardingCore.Test6x.csproj", "{71D85D50-7F2B-4FEF-BC6F-A80DBDDAC7E8}"
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShardingCore.Test5x", "test\ShardingCore.Test5x\ShardingCore.Test5x.csproj", "{59BDEB59-1674-4A71-8F3F-0A690F48ADE6}"
4747
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShardingCore.Test5x", "test\ShardingCore.Test5x\ShardingCore.Test5x.csproj", "{59BDEB59-1674-4A71-8F3F-0A690F48ADE6}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShardingCore.Test3x", "test\ShardingCore.Test3x\ShardingCore.Test3x.csproj", "{E64E09EF-2DC0-4948-A948-256EF5F95C53}"
4949
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShardingCore.Test3x", "test\ShardingCore.Test3x\ShardingCore.Test3x.csproj", "{E64E09EF-2DC0-4948-A948-256EF5F95C53}"
50+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShardingCore.Test2x", "test\ShardingCore.Test2x\ShardingCore.Test2x.csproj", "{5ED4AF17-F16D-4857-B19C-018831109991}"
5151
EndProject
52-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShardingCore.Test2x", "test\ShardingCore.Test2x\ShardingCore.Test2x.csproj", "{5ED4AF17-F16D-4857-B19C-018831109991}"
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShardingCore.Test", "test\ShardingCore.Test\ShardingCore.Test.csproj", "{32EA64CC-0877-4B4D-BFBA-504EDB2237D6}"
5353
EndProject
5454
Global
5555
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -113,10 +113,6 @@ Global
113113
{FD2C6D03-8D6D-4C1C-B534-4C785A4B1B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
114114
{FD2C6D03-8D6D-4C1C-B534-4C785A4B1B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
115115
{FD2C6D03-8D6D-4C1C-B534-4C785A4B1B06}.Release|Any CPU.Build.0 = Release|Any CPU
116-
{71D85D50-7F2B-4FEF-BC6F-A80DBDDAC7E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117-
{71D85D50-7F2B-4FEF-BC6F-A80DBDDAC7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
118-
{71D85D50-7F2B-4FEF-BC6F-A80DBDDAC7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
119-
{71D85D50-7F2B-4FEF-BC6F-A80DBDDAC7E8}.Release|Any CPU.Build.0 = Release|Any CPU
120116
{59BDEB59-1674-4A71-8F3F-0A690F48ADE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121117
{59BDEB59-1674-4A71-8F3F-0A690F48ADE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
122118
{59BDEB59-1674-4A71-8F3F-0A690F48ADE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -129,6 +125,10 @@ Global
129125
{5ED4AF17-F16D-4857-B19C-018831109991}.Debug|Any CPU.Build.0 = Debug|Any CPU
130126
{5ED4AF17-F16D-4857-B19C-018831109991}.Release|Any CPU.ActiveCfg = Release|Any CPU
131127
{5ED4AF17-F16D-4857-B19C-018831109991}.Release|Any CPU.Build.0 = Release|Any CPU
128+
{32EA64CC-0877-4B4D-BFBA-504EDB2237D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129+
{32EA64CC-0877-4B4D-BFBA-504EDB2237D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
130+
{32EA64CC-0877-4B4D-BFBA-504EDB2237D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
131+
{32EA64CC-0877-4B4D-BFBA-504EDB2237D6}.Release|Any CPU.Build.0 = Release|Any CPU
132132
EndGlobalSection
133133
GlobalSection(SolutionProperties) = preSolution
134134
HideSolutionNode = FALSE
@@ -148,10 +148,10 @@ Global
148148
{648DCBBE-BE8F-4EAC-8367-FE7BC558DA8C} = {EDF8869A-C1E1-491B-BC9F-4A33F4DE1C73}
149149
{88FA5615-1BAA-4021-87EF-9D4A60257FE4} = {EDF8869A-C1E1-491B-BC9F-4A33F4DE1C73}
150150
{FD2C6D03-8D6D-4C1C-B534-4C785A4B1B06} = {EDF8869A-C1E1-491B-BC9F-4A33F4DE1C73}
151-
{71D85D50-7F2B-4FEF-BC6F-A80DBDDAC7E8} = {CC2C88C0-65F2-445D-BE78-973B840FE281}
152151
{59BDEB59-1674-4A71-8F3F-0A690F48ADE6} = {CC2C88C0-65F2-445D-BE78-973B840FE281}
153152
{E64E09EF-2DC0-4948-A948-256EF5F95C53} = {CC2C88C0-65F2-445D-BE78-973B840FE281}
154153
{5ED4AF17-F16D-4857-B19C-018831109991} = {CC2C88C0-65F2-445D-BE78-973B840FE281}
154+
{32EA64CC-0877-4B4D-BFBA-504EDB2237D6} = {CC2C88C0-65F2-445D-BE78-973B840FE281}
155155
EndGlobalSection
156156
GlobalSection(ExtensibilityGlobals) = postSolution
157157
SolutionGuid = {8C07A667-E8B4-43C7-8053-721584BAD291}

‎nuget-publish.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
:start
22
::定义版本
3-
set EFCORE2=2.3.1.50
4-
set EFCORE3=3.3.1.50
5-
set EFCORE5=5.3.1.50
6-
set EFCORE6=6.3.1.50
3+
set EFCORE2=2.3.1.51
4+
set EFCORE3=3.3.1.51
5+
set EFCORE5=5.3.1.51
6+
set EFCORE6=6.3.1.51
77

88
::删除所有bin与obj下的文件
99
@echo off

‎samples/Sample.SqlServer/Controllers/CreateTableController.cs‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using Microsoft.AspNetCore.Mvc;
6+
using Sample.SqlServer.DbContexts;
7+
using Sample.SqlServer.Domain.Entities;
8+
using ShardingCore.Core.EntityMetadatas;
9+
using ShardingCore.Core.PhysicTables;
10+
using ShardingCore.Core.VirtualDatabase.VirtualDataSources;
11+
using ShardingCore.Core.VirtualDatabase.VirtualTables;
12+
using ShardingCore.Core.VirtualTables;
13+
using ShardingCore.Extensions;
14+
using ShardingCore.TableCreator;
15+
16+
namespace Sample.SqlServer.Controllers
17+
{
18+
[ApiController]
19+
[Route("[controller]/[action]")]
20+
public class CreateTableController : ControllerBase
21+
{
22+
private readonly IShardingTableCreator<DefaultShardingDbContext> _tableCreator;
23+
private readonly IVirtualDataSource<DefaultShardingDbContext> _virtualDataSource;
24+
private readonly IVirtualTableManager<DefaultShardingDbContext> _virtualTableManager;
25+
private readonly IEntityMetadataManager<DefaultShardingDbContext> _entityMetadataManager;
26+
27+
public CreateTableController(IShardingTableCreator<DefaultShardingDbContext> tableCreator,
28+
IVirtualDataSource<DefaultShardingDbContext> virtualDataSource,
29+
IVirtualTableManager<DefaultShardingDbContext> virtualTableManager,
30+
IEntityMetadataManager<DefaultShardingDbContext> entityMetadataManager)
31+
{
32+
_tableCreator = tableCreator;
33+
_virtualDataSource = virtualDataSource;
34+
_virtualTableManager = virtualTableManager;
35+
_entityMetadataManager = entityMetadataManager;
36+
}
37+
[HttpGet]
38+
public IActionResult Get()
39+
{
40+
var isShardingTable = _entityMetadataManager.IsShardingTable<SysUserMod>();
41+
if (isShardingTable)
42+
{
43+
#region 完全可以用脚本实现这段代码
44+
var defaultDataSourceName = _virtualDataSource.DefaultDataSourceName;
45+
try
46+
{
47+
_tableCreator.CreateTable<SysUserMod>(defaultDataSourceName, "09");
48+
}
49+
catch (Exception e)
50+
{
51+
Console.WriteLine(e);
52+
}
53+
#endregion
54+
//告诉系统SysUserMod 有一张09的表
55+
var virtualTable = _virtualTableManager.GetVirtualTable<SysUserMod>();
56+
_virtualTableManager.AddPhysicTable(virtualTable,new DefaultPhysicTable(virtualTable, "09"));
57+
}
58+
59+
return BadRequest();
60+
}
61+
}
62+
}

‎src/ShardingCore/Extensions/IShardingQueryableExtension.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ internal static ExtraEntry GetExtraEntry<T>(this IQueryable<T> source)
2121
{
2222
var extraVisitor = new QueryableExtraDiscoverVisitor();
2323
extraVisitor.Visit(source.Expression);
24-
return new ExtraEntry(extraVisitor.GetSkip(), extraVisitor.GetTake(), extraVisitor.GetOrders(),extraVisitor.GetSelectContext(),extraVisitor.GetGroupByContext());
24+
var extraEntry = new ExtraEntry(extraVisitor.GetSkip(), extraVisitor.GetTake(), extraVisitor.GetOrders(),extraVisitor.GetSelectContext(),extraVisitor.GetGroupByContext());
25+
extraEntry.ProcessGroupBySelectProperties();
26+
return extraEntry;
2527
}
2628
/// <summary>
2729
/// 删除Skip表达式

0 commit comments

Comments
 (0)