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

添加一些代码优化

This commit is contained in:
xuejiaming 2022-04-19 21:41:27 +08:00
parent fa9316a718
commit 3b256534c4
4 changed files with 7 additions and 47 deletions

4
src/ShardingCore/Extensions/ShardingExtension.cs
View File

@ -62,6 +62,10 @@ namespace ShardingCore.Extensions
public static string ShardingPrint(this Expression expression) public static string ShardingPrint(this Expression expression)
{ {
if (expression == null)
{
return null;
}
#if !EFCORE2 #if !EFCORE2
return expression.Print(); return expression.Print();
#endif #endif

5
src/ShardingCore/Sharding/Visitors/ShardingExpressionVisitor.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using ShardingCore.Exceptions; using ShardingCore.Exceptions;
using ShardingCore.Extensions;
namespace ShardingCore.Core.Internal.Visitors namespace ShardingCore.Core.Internal.Visitors
{ {
@ -48,14 +49,14 @@ namespace ShardingCore.Core.Internal.Visitors
return field.GetValue( return field.GetValue(
GetExpressionValue( GetExpressionValue(
e.Expression e.Expression
) ) ?? throw new InvalidOperationException($"cant get expression value,{e.Expression.ShardingPrint()} may be null reference")
); );
case MemberExpression e when e.Member is PropertyInfo property: case MemberExpression e when e.Member is PropertyInfo property:
return property.GetValue( return property.GetValue(
GetExpressionValue( GetExpressionValue(
e.Expression e.Expression
) )??throw new InvalidOperationException($"cant get expression value,{e.Expression.ShardingPrint()} may be null reference")
); );
case ListInitExpression e when e.NewExpression.Arguments.Count() == 0: case ListInitExpression e when e.NewExpression.Arguments.Count() == 0:

27
src/ShardingCore/ShardingCore - Backup (1).csproj
View File

@ -1,27 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>$(EFCORE6)</Version>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<DefineConstants>TRACE;DEBUG;EFCORE6;</DefineConstants>
<LangVersion>9.0</LangVersion>
<RepositoryUrl>https://github.com/xuejmnet/sharding-core</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<DocumentationFile>bin\Release\ShardingCore.xml</DocumentationFile>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="Core\ExtensionExpressionComparer\" />
</ItemGroup>
</Project>

18
src/ShardingCore/ShardingCore - Backup.csproj
View File

@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>$(EFCORE5)</Version>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<DefineConstants>TRACE;DEBUG;EFCORE5;</DefineConstants>
<LangVersion>8.0</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<DocumentationFile>bin\Release\ShardingCore.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.13" />
</ItemGroup>
</Project>