Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,21 @@ public ExpressionSyntaxRewriter(INamedTypeSymbol targetTypeSymbol, NullCondition
.WithLeadingTrivia(node.GetLeadingTrivia())
.WithTrailingTrivia(node.GetTrailingTrivia());
}

public override SyntaxNode? VisitMemberAccessExpression(MemberAccessExpressionSyntax node)
{
var expressionSyntax = (ExpressionSyntax?)Visit(node.Expression) ?? throw new ArgumentNullException("expression");

var syntaxNode = Visit(node.Name);

// Prevents invalid cast when visiting a QualifiedNameSyntax
if (syntaxNode is QualifiedNameSyntax qst)
{
syntaxNode = qst.Right;
}

return node.Update(expressionSyntax, VisitToken(node.OperatorToken), (SimpleNameSyntax)syntaxNode);
}

public override SyntaxNode? VisitInvocationExpression(InvocationExpressionSyntax node)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SELECT 7
FROM [Entity] AS [e]
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using EntityFrameworkCore.Projectables.FunctionalTests.Helpers;
using Microsoft.EntityFrameworkCore;
using VerifyXunit;
using Xunit;

namespace EntityFrameworkCore.Projectables.FunctionalTests
{
public class Local
{
[Flags]
public enum SampleEnum
{
One = 0b001,
Two = 0b010,
Four = 0b100,
}
}

[UsesVerify]
public class NameSyntaxTests
{
public class Entity
{
public int Id { get; set; }

[Projectable]
public Local.SampleEnum? Test => Local.SampleEnum.One | Local.SampleEnum.Two | Local.SampleEnum.Four;
}

[Fact]
public Task QualifiedNameSyntaxTest()
{
using var dbContext = new SampleDbContext<Entity>();

var query = dbContext.Set<Entity>()
.Select(x => x.Test);

return Verifier.Verify(query.ToQueryString());
}
}
}