Merge from master

tests/EntityFrameworkCore.Projectables.FunctionalTests/Generics/GenericEntityTests.HasMatchingStringKeyConversion_GetsTranslated.verified.txt

@@ -0,0 +1,5 @@
+DECLARE @__key_0 nvarchar(4000) = N'x';
+
+SELECT [c].[Id]
+FROM [ConcreteEntity] AS [c]
+WHERE CONVERT(varchar(11), [c].[Id]) = @__key_0

tests/EntityFrameworkCore.Projectables.FunctionalTests/Generics/GenericEntityTests.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Projectables.FunctionalTests.Helpers;
+using Microsoft.EntityFrameworkCore;
+using VerifyXunit;
+using Xunit;
+
+namespace EntityFrameworkCore.Projectables.FunctionalTests.Generics
+{
+    [UsesVerify]
+    public class GenericEntityTests
+    {
+        public abstract class BaseEntity<TSelf, TKey>
+            where TSelf : BaseEntity<TSelf, TKey>
+        {
+            public TKey Id { get; set; } = default!;
+
+            [Projectable(NullConditionalRewriteSupport = NullConditionalRewriteSupport.Ignore)]
+            public bool HasMatchingStringKeyConversion(string key)
+                => Id?.ToString() == key;
+        }
+
+        public class ConcreteEntity : BaseEntity<ConcreteEntity, int>
+        {
+
+        }
+
+        [Fact]
+        public Task HasMatchingStringKeyConversion_GetsTranslated()
+        {
+            using var context = new SampleDbContext<ConcreteEntity>();
+            var key = "x";
+            var query = context.Set<ConcreteEntity>()
+                .Where(x => x.HasMatchingStringKeyConversion(key))
+                .Select(x => x.Id);
+
+            return Verifier.Verify(query.ToQueryString());
+        }
+    }
+}

tests/EntityFrameworkCore.Projectables.FunctionalTests/PrivateProjectables.Issue63Repro.verified.txt

@@ -0,0 +1,2 @@
+SELECT [e].[Id]
+FROM [Entity] AS [e]

tests/EntityFrameworkCore.Projectables.FunctionalTests/PrivateProjectables.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Projectables.FunctionalTests.Helpers;
+using Microsoft.EntityFrameworkCore;
+using VerifyXunit;
+using Xunit;
+
+namespace EntityFrameworkCore.Projectables.FunctionalTests
+{
+    [UsesVerify]
+    public class PrivateProjectables
+    {
+        public record Entity
+        {
+            public int Id { get; set; }
+        }
+
+        bool IsAdmin => true;
+
+        [Fact]
+        public Task Issue63Repro()
+        {
+            using var dbContext = new SampleDbContext<Entity>();
+
+            var query = dbContext.Set<Entity>()
+                    .Where(product => IsAdmin || product.Id == 1);
+
+            return Verifier.Verify(query.ToQueryString());
+        }
+    }
+}