FromSql() and owned type with table splitting

[grietine]

Entity, ValueObject and OnModelCreating() looks like this:

public class User : IEntity
{
   public Guid Id { get; set; }
   public string FirstName { get; set; }
   public string LastName { get; set; }
   public Address Address { get; set; }
}

public class Address: IValueObject
{
   public string Street { get; set; }
   public string City { get; set; }
}

protected override void OnModelCreating(ModelBuilder modelBuilder)
{
    base.OnModelCreating(modelBuilder);

    modelBuilder.Entity<User>().ToTable("Users");
    modelBuilder.Entity<User>().OwnsOne(e => e.Address);
}

I am saving Address ValueObject on the same Users table with .OwnsOne().

Issue:

A query on Users table using .FromSql() causes unnecessary LEFT JOIN.

Using .FromSql() on a different entity (e.g. Transactions) which doesn't have a ValueObject in it works OK and doesn't include LEFT JOIN in the query.

Query example:

var customQuery = "SELECT * FROM Users WHERE CONTAINS(*, '\"John\"')";
var users = context.Users.FromSql(customQuery);

Expected query:

SELECT * FROM Users WHERE CONTAINS(*, '\"John\"');

Actual query:

SELECT [p].[Id],
       [p].[FirstName],
       [p].[LastName],
       [p.Address].[Id],
       [p.Address].[Street],
       [p.Address].[City]
FROM (SELECT * FROM Users WHERE CONTAINS(*, '\"John\"')) AS [p]
       LEFT JOIN [Users] AS [p.Address]
         ON [p].[Id] = [p.Address].[Id]

A bug or am I doing something incorrectly?

Further technical details

EF Core version: 2.2
Database provider: e.g. Microsoft.EntityFrameworkCore.SqlServer 2.2.6
Target framework: NET Core 2.2
Operating system: Windows 10 Enterprise
IDE: Visual Studio 2017

[smitpatel]

Related #14525

[AndriySvyryd]

Depends on #21627