Use right hand type mapping for more binary expressions when left is an object

src/EFCore.Relational/Query/SqlExpressionFactory.cs

@@ -259,7 +259,7 @@ private SqlExpression ApplyTypeMappingOnSqlBinary(
             case ExpressionType.ExclusiveOr:
             {
                 inferredTypeMapping = typeMapping ?? ExpressionExtensions.InferTypeMapping(left, right);
-                resultType = inferredTypeMapping?.ClrType ?? left.Type;
+                resultType = inferredTypeMapping?.ClrType ?? (left.Type != typeof(object) ? left.Type : right.Type);
                 resultTypeMapping = inferredTypeMapping;
                 break;
             }

test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs

@@ -5289,6 +5289,34 @@ public virtual async Task ToPageAsync_in_subquery_throws()
 
     #endregion ToPageAsync
 
+    public override async Task Ternary_Not_Null_Contains(bool async)
+    {
+        await AssertTranslationFailed(() => base.Ternary_Not_Null_Contains(async));
+
+        AssertSql();
+    }
+
+    public override async Task Ternary_Not_Null_endsWith_Non_Numeric_First_Part(bool async)
+    {
+        await AssertTranslationFailed(() => base.Ternary_Not_Null_endsWith_Non_Numeric_First_Part(async));
+
+        AssertSql();
+    }
+
+    public override async Task Ternary_Null_Equals_Non_Numeric_First_Part(bool async)
+    {
+        await AssertTranslationFailed(() => base.Ternary_Null_Equals_Non_Numeric_First_Part(async));
+
+        AssertSql();
+    }
+
+    public override async Task Ternary_Null_StartsWith(bool async)
+    {
+        await AssertTranslationFailed(() => base.Ternary_Null_StartsWith(async));
+
+        AssertSql();
+    }
+
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 

test/EFCore.Specification.Tests/Query/NorthwindMiscellaneousQueryTestBase.cs

@@ -5858,4 +5858,36 @@ public virtual Task Where_nanosecond_and_microsecond_component(bool async)
             // TODO: this is basically just about translation, we don't have data with nanoseconds and microseconds
             ss => ss.Set<Order>().Where(o => o.OrderDate.Value.Nanosecond != 0 && o.OrderDate.Value.Microsecond != 0),
             assertEmpty: true);
+
+    [ConditionalTheory]
+    [MemberData(nameof(IsAsyncData))]
+    public virtual Task Ternary_Not_Null_Contains(bool async)
+        => AssertFirstOrDefault(
+            async,
+            ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x != null ? x.OrderID + "" : null),
+            x => x.Contains("1"));
+
+    [ConditionalTheory]
+    [MemberData(nameof(IsAsyncData))]
+    public virtual Task Ternary_Not_Null_endsWith_Non_Numeric_First_Part(bool async)
+        => AssertFirstOrDefault(
+            async,
+            ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x != null ? "" + x.OrderID + "" : null),
+            x => x.EndsWith("1"));
+
+    [ConditionalTheory]
+    [MemberData(nameof(IsAsyncData))]
+    public virtual Task Ternary_Null_Equals_Non_Numeric_First_Part(bool async)
+    => AssertFirstOrDefault(
+        async,
+        ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x == null ? null : "" + x.OrderID + ""),
+        x => x == "1");
+
+    [ConditionalTheory]
+    [MemberData(nameof(IsAsyncData))]
+    public virtual Task Ternary_Null_StartsWith(bool async)
+        => AssertFirstOrDefault(
+            async,
+            ss => ss.Set<Order>().OrderBy(x => x.OrderID).Select(x => x == null ? null : x.OrderID + ""),
+            x => x.StartsWith("1"));
 }

test/EFCore.SqlServer.FunctionalTests/Query/NorthwindMiscellaneousQuerySqlServerTest.cs

@@ -7464,6 +7464,58 @@ FROM [Orders] AS [o]
 """);
     }
 
+    public override async Task Ternary_Not_Null_Contains(bool async)
+    {
+        await base.Ternary_Not_Null_Contains(async);
+
+        AssertSql(
+            """
+SELECT TOP(1) CAST([o].[OrderID] AS nvarchar(max)) + N''
+FROM [Orders] AS [o]
+WHERE CAST([o].[OrderID] AS nvarchar(max)) + N'' LIKE N'%1%'
+ORDER BY [o].[OrderID]
+""");
+    }
+
+    public override async Task Ternary_Not_Null_endsWith_Non_Numeric_First_Part(bool async)
+    {
+        await base.Ternary_Not_Null_endsWith_Non_Numeric_First_Part(async);
+
+        AssertSql(
+            """
+SELECT TOP(1) N'' + CAST([o].[OrderID] AS nvarchar(max)) + N''
+FROM [Orders] AS [o]
+WHERE N'' + CAST([o].[OrderID] AS nvarchar(max)) + N'' LIKE N'%1'
+ORDER BY [o].[OrderID]
+""");
+    }
+
+    public override async Task Ternary_Null_Equals_Non_Numeric_First_Part(bool async)
+    {
+        await base.Ternary_Null_Equals_Non_Numeric_First_Part(async);
+
+        AssertSql(
+            """
+SELECT TOP(1) N'' + CAST([o].[OrderID] AS nvarchar(max)) + N''
+FROM [Orders] AS [o]
+WHERE N'' + CAST([o].[OrderID] AS nvarchar(max)) + N'' = N'1'
+ORDER BY [o].[OrderID]
+""");
+    }
+
+    public override async Task Ternary_Null_StartsWith(bool async)
+    {
+        await base.Ternary_Null_StartsWith(async);
+
+        AssertSql(
+            """
+SELECT TOP(1) CAST([o].[OrderID] AS nvarchar(max)) + N''
+FROM [Orders] AS [o]
+WHERE CAST([o].[OrderID] AS nvarchar(max)) + N'' LIKE N'1%'
+ORDER BY [o].[OrderID]
+""");
+    }
+
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);