From daea46078969cbe627e2ec2c050b5f16bee4ae51 Mon Sep 17 00:00:00 2001 From: xuejiaming <326308290@qq.com> Date: Thu, 26 Aug 2021 19:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=88=86=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=AF=B9=E8=B1=A1=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nuget-publish.bat | 6 +++--- .../Sample.SqlServer/Controllers/ValuesController.cs | 12 ++++++++++++ samples/Sample.SqlServer/DIExtension.cs | 7 +++++++ samples/Sample.SqlServer/Startup.cs | 2 +- .../Core/VirtualRoutes/RouteTailFactory.cs | 2 +- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/nuget-publish.bat b/nuget-publish.bat index fe9e28db..a1d6d0fc 100644 --- a/nuget-publish.bat +++ b/nuget-publish.bat @@ -1,8 +1,8 @@ :start ::定义版本 -set EFCORE2=2.2.0.13 -set EFCORE3=3.2.0.13 -set EFCORE5=5.2.0.13 +set EFCORE2=2.2.0.14 +set EFCORE3=3.2.0.14 +set EFCORE5=5.2.0.14 ::删除所有bin与obj下的文件 @echo off diff --git a/samples/Sample.SqlServer/Controllers/ValuesController.cs b/samples/Sample.SqlServer/Controllers/ValuesController.cs index 7ee1122c..d6d37b41 100644 --- a/samples/Sample.SqlServer/Controllers/ValuesController.cs +++ b/samples/Sample.SqlServer/Controllers/ValuesController.cs @@ -34,6 +34,18 @@ namespace Sample.SqlServer.Controllers [HttpGet] public async Task Get() { + var sql = from ut in _defaultTableDbContext.Set() + join u in _defaultTableDbContext.Set() + on ut.UserId equals u.Id + select new + { + ut.Id, + userId=u.Id + }; + var listAsync =await sql.ToListAsync(); + var resultx112331tt = await _defaultTableDbContext.Set().CountAsync(); + var resultx112331 = await _defaultTableDbContext.Set().CountAsync(); + var resultx11233411 = _defaultTableDbContext.Set().Count(); var resultx11231 = await _defaultTableDbContext.Set().Where(o => o.Age == 198198).Select(o => o.Id).ContainsAsync("1981"); var resultx1121 = await _defaultTableDbContext.Set().Where(o => o.Id == "198").SumAsync(o => o.Age); var resultx111 = await _defaultTableDbContext.Set().FirstOrDefaultAsync(o => o.Id == "198"); diff --git a/samples/Sample.SqlServer/DIExtension.cs b/samples/Sample.SqlServer/DIExtension.cs index dd1de354..7f317646 100644 --- a/samples/Sample.SqlServer/DIExtension.cs +++ b/samples/Sample.SqlServer/DIExtension.cs @@ -32,6 +32,7 @@ namespace Sample.SqlServer { var ids = Enumerable.Range(1, 1000); var userMods = new List(); + var SysTests = new List(); foreach (var id in ids) { userMods.Add(new SysUserMod() @@ -40,9 +41,15 @@ namespace Sample.SqlServer Age = id, Name = $"name_{id}", }); + SysTests.Add(new SysTest() + { + Id = id.ToString(), + UserId = id.ToString() + }); } virtualDbContext.AddRange(userMods); + virtualDbContext.AddRange(SysTests); virtualDbContext.SaveChanges(); } } diff --git a/samples/Sample.SqlServer/Startup.cs b/samples/Sample.SqlServer/Startup.cs index 0ecc41dd..553bb8a2 100644 --- a/samples/Sample.SqlServer/Startup.cs +++ b/samples/Sample.SqlServer/Startup.cs @@ -25,7 +25,7 @@ namespace Sample.SqlServer services.AddShardingDbContext( - o => o.UseSqlServer("Data Source=localhost;Initial Catalog=ShardingCoreDBxx2;Integrated Security=True;") + o => o.UseSqlServer("Data Source=localhost;Initial Catalog=ShardingCoreDB;Integrated Security=True;") , op => { op.EnsureCreatedWithOutShardingTable = true; diff --git a/src/ShardingCore/Core/VirtualRoutes/RouteTailFactory.cs b/src/ShardingCore/Core/VirtualRoutes/RouteTailFactory.cs index a7c08265..11984a7f 100644 --- a/src/ShardingCore/Core/VirtualRoutes/RouteTailFactory.cs +++ b/src/ShardingCore/Core/VirtualRoutes/RouteTailFactory.cs @@ -22,7 +22,7 @@ namespace ShardingCore.Core.VirtualRoutes public IRouteTail Create(RouteResult routeResult) { if (routeResult == null || routeResult.ReplaceTables.IsEmpty()) - throw new ShardingCoreException("route result null or empty"); + return new SingleQueryRouteTail(string.Empty); if (routeResult.ReplaceTables.Count == 1) return new SingleQueryRouteTail(routeResult); return new MultiQueryRouteTail(routeResult);