From ee3c440313394683d6ed72c2c9ac03b92afefe34 Mon Sep 17 00:00:00 2001
From: lorenacr <lorena.p.rangel@gmail.com>
Date: Thu, 7 May 2026 06:38:52 -0300
Subject: [PATCH 1/4] Support conflicting partition key predicates in Cosmos
 queries - Detect conflicting partition key predicates during read-item
 extraction - Add coverage for conflicting partition key predicate scenarios -
 Update Cosmos provider resources/strings

Fixes #38238
---
 .../Properties/CosmosStrings.Designer.cs      |  8 +++-
 .../Properties/CosmosStrings.resx             |  5 +-
 ...CosmosReadItemAndPartitionKeysExtractor.cs | 48 +++++++++++++++++++
 .../ReadItemPartitionKeyQueryTestBase.cs      | 24 +++++++++-
 4 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs b/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
index 4b50fddc488..dcceed6af89 100644
--- a/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
+++ b/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 
 using System;
 using System.Reflection;
@@ -663,6 +663,12 @@ public static string WithPartitionKeyBadNode
         public static string WithPartitionKeyNotConstantOrParameter
             => GetString("WithPartitionKeyNotConstantOrParameter");
 
+        /// <summary>
+        ///     The partition key value specified via 'WithPartitionKey' conflicts with a partition key predicate in the query. Remove the predicate or ensure both specify the same value.
+        /// </summary>
+        public static string WithPartitionKeyConflictingPartitionKeyPredicate
+            => GetString("WithPartitionKeyConflictingPartitionKeyPredicate");
+
         private static string GetString(string name, params string[] formatterNames)
         {
             var value = _resourceManager.GetString(name)!;
diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.resx b/src/EFCore.Cosmos/Properties/CosmosStrings.resx
index 4e4ece63670..27fba0383df 100644
--- a/src/EFCore.Cosmos/Properties/CosmosStrings.resx
+++ b/src/EFCore.Cosmos/Properties/CosmosStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -424,4 +424,7 @@
   <data name="WithPartitionKeyNotConstantOrParameter" xml:space="preserve">
     <value>'WithPartitionKey' only accepts simple constant or parameter arguments. See https://aka.ms/efdocs-cosmos-partition-keys for more information.</value>
   </data>
+  <data name="WithPartitionKeyConflictingPartitionKeyPredicate" xml:space="preserve">
+    <value>The partition key value specified via 'WithPartitionKey' conflicts with a partition key predicate in the query. Remove the predicate or ensure both specify the same value.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
index c0221b87e81..19188eb17cd 100644
--- a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
+++ b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
@@ -88,6 +88,11 @@ public virtual Expression ExtractPartitionKeysAndId(
         var allIdPropertiesSpecified =
             _jsonIdPropertyValues.Values.All(p => p is not null) && _jsonIdPropertyValues.Count > 0;
 
+        if (queryCompilationContext.PartitionKeyPropertyValues.Count > 0)
+        {
+            ValidateNoWithPartitionKeyConflict(queryCompilationContext, partitionKeyProperties);
+        }
+
         // First, go over the partition key properties and lift them from the predicate to the query compilation context, as possible.
         // We do this only as long as all partition key values are provided; the moment there's a gap we stop (so if PK1 and PK3 are
         // provided but not PK2, only PK1 will be lifted out).
@@ -170,6 +175,49 @@ Expression Unwrap(Expression shaper)
         }
     }
 
+    private void ValidateNoWithPartitionKeyConflict(
+        CosmosQueryCompilationContext queryCompilationContext,
+        IReadOnlyList<IProperty> partitionKeyProperties)
+    {
+        // WithPartitionKey(...) already populated partition key values in the query compilation context.
+        // If the predicate also contains partition key comparisons, we must validate that they match; otherwise, a ReadItem
+        // optimization would execute with the WithPartitionKey partition key and ignore the conflicting predicate.
+        for (var i = 0; i < partitionKeyProperties.Count; i++)
+        {
+            var property = partitionKeyProperties[i];
+            var predicateValueExpression = _partitionKeyPropertyValues[property].ValueExpression;
+            if (predicateValueExpression is null)
+            {
+                continue;
+            }
+
+            if (queryCompilationContext.PartitionKeyPropertyValues.Count <= i)
+            {
+                // Shouldn't happen: WithPartitionKey doesn't specify enough PK components; let the existing missing-PK flow handle it.
+                break;
+            }
+
+            var withPartitionKeyValueExpression = queryCompilationContext.PartitionKeyPropertyValues[i];
+
+            if (!PartitionKeyValueExpressionsMatch(predicateValueExpression, withPartitionKeyValueExpression))
+            {
+                throw new InvalidOperationException(CosmosStrings.WithPartitionKeyConflictingPartitionKeyPredicate);
+            }
+        }
+
+        static bool PartitionKeyValueExpressionsMatch(Expression left, Expression right)
+            => (left, right) switch
+            {
+                (SqlConstantExpression { Value: var leftValue }, SqlConstantExpression { Value: var rightValue })
+                    => Equals(leftValue, rightValue),
+
+                (SqlParameterExpression { Name: var leftName }, SqlParameterExpression { Name: var rightName })
+                    => leftName == rightName,
+
+                _ => false
+            };
+    }
+
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
index 9d4a68bffd9..36235e5d11d 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace Microsoft.EntityFrameworkCore.Query;
@@ -285,6 +285,28 @@ public virtual Task ReadItem_with_WithPartitionKey()
             ss => ss.Set<SinglePartitionKeyEntity>().Where(e => e.PartitionKey == "PK1")
                 .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34")));
 
+    [ConditionalFact] // Issue #38238
+    public virtual async Task ReadItem_with_WithPartitionKey_and_conflicting_partition_key_predicate_throws()
+    {
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey("PK1")
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == "PK2")));
+
+        Assert.Equal(CosmosStrings.WithPartitionKeyConflictingPartitionKeyPredicate, exception.Message);
+    }
+
+    [ConditionalFact] // Issue #38238
+    public virtual async Task ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw()
+    {
+        var partitionKey = "PK1";
+
+        await AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey(partitionKey)
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == partitionKey));
+    }
+
     [ConditionalFact]
     public virtual Task ReadItem_with_WithPartitionKey_with_only_partition_key()
         => AssertQuery(

From 5ad8aa4b51cffbf0bbfd0e409fcfdb41b1770ebe Mon Sep 17 00:00:00 2001
From: lorenacr <lorena.p.rangel@gmail.com>
Date: Thu, 7 May 2026 22:04:26 -0300
Subject: [PATCH 2/4] Enhance partition key conflict validation in Cosmos
 queries

- Introduce a snapshot of predicate partition key values to validate conflicts when using ReadItem.
- Update the ValidateNoWithPartitionKeyConflict method to accept the new snapshot for improved accuracy in conflict detection.
- Ensure that partition key comparisons are validated before clearing the partition key property values.
---
 ...CosmosReadItemAndPartitionKeysExtractor.cs | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
index 19188eb17cd..ecf029a3777 100644
--- a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
+++ b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal;
@@ -88,9 +89,13 @@ public virtual Expression ExtractPartitionKeysAndId(
         var allIdPropertiesSpecified =
             _jsonIdPropertyValues.Values.All(p => p is not null) && _jsonIdPropertyValues.Count > 0;
 
-        if (queryCompilationContext.PartitionKeyPropertyValues.Count > 0)
+        // WithPartitionKey will clear _partitionKeyPropertyValues during the lift pass below; snapshot predicate partition key
+        // comparisons first so we can validate conflicts only if the query will use ReadItem (see ValidateNoWithPartitionKeyConflict).
+        var hadWithPartitionKey = queryCompilationContext.PartitionKeyPropertyValues.Count > 0;
+        Dictionary<IProperty, (Expression? ValueExpression, Expression? OriginalExpression)>? predicatePartitionKeySnapshot = null;
+        if (hadWithPartitionKey)
         {
-            ValidateNoWithPartitionKeyConflict(queryCompilationContext, partitionKeyProperties);
+            predicatePartitionKeySnapshot = new Dictionary<IProperty, (Expression?, Expression?)>(_partitionKeyPropertyValues);
         }
 
         // First, go over the partition key properties and lift them from the predicate to the query compilation context, as possible.
@@ -131,6 +136,14 @@ public virtual Expression ExtractPartitionKeysAndId(
             && Unwrap(shapedQuery.ShaperExpression) is StructuralTypeShaperExpression { StructuralType: var projectedStructuralType }
             && projectedStructuralType == _entityType)
         {
+            if (hadWithPartitionKey)
+            {
+                ValidateNoWithPartitionKeyConflict(
+                    queryCompilationContext,
+                    partitionKeyProperties,
+                    predicatePartitionKeySnapshot!);
+            }
+
             return shapedQuery.UpdateQueryExpression(select.WithReadItemInfo(new ReadItemInfo(_jsonIdPropertyValues!)));
         }
 
@@ -177,7 +190,9 @@ Expression Unwrap(Expression shaper)
 
     private void ValidateNoWithPartitionKeyConflict(
         CosmosQueryCompilationContext queryCompilationContext,
-        IReadOnlyList<IProperty> partitionKeyProperties)
+        IReadOnlyList<IProperty> partitionKeyProperties,
+        IReadOnlyDictionary<IProperty, (Expression? ValueExpression, Expression? OriginalExpression)>
+            predicatePartitionKeyPropertyValues)
     {
         // WithPartitionKey(...) already populated partition key values in the query compilation context.
         // If the predicate also contains partition key comparisons, we must validate that they match; otherwise, a ReadItem
@@ -185,7 +200,7 @@ private void ValidateNoWithPartitionKeyConflict(
         for (var i = 0; i < partitionKeyProperties.Count; i++)
         {
             var property = partitionKeyProperties[i];
-            var predicateValueExpression = _partitionKeyPropertyValues[property].ValueExpression;
+            var predicateValueExpression = predicatePartitionKeyPropertyValues[property].ValueExpression;
             if (predicateValueExpression is null)
             {
                 continue;

From dca176f016bf81ab2c4bcf5a09f214837e7a26e4 Mon Sep 17 00:00:00 2001
From: lorenacr <lorena.p.rangel@gmail.com>
Date: Fri, 8 May 2026 11:33:30 -0300
Subject: [PATCH 3/4] Add using directive for internal Cosmos functionality in
 ReadItemPartitionKeyQueryTestBase

- Include the Microsoft.EntityFrameworkCore.Cosmos.Internal namespace to enhance access to internal Cosmos features.
- This change prepares the test base for future enhancements related to partition key queries.
---
 .../Query/ReadItemPartitionKeyQueryTestBase.cs                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
index 36235e5d11d..adfd5613808 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+
 namespace Microsoft.EntityFrameworkCore.Query;
 
 public abstract class ReadItemPartitionKeyQueryTestBase<TFixture> : QueryTestBase<TFixture>

From 056d94d501605b5026fca4c79d347780591acdbf Mon Sep 17 00:00:00 2001
From: lorenacr <lorena.p.rangel@gmail.com>
Date: Tue, 12 May 2026 10:06:10 -0300
Subject: [PATCH 4/4] Enhance partition key conflict handling in Cosmos queries

- Update the partition key validation logic to ensure conflicts are detected even when the query does not use ReadItem.
- Introduce new tests to verify behavior when conflicting partition key predicates are present.
- Refactor partition key comparison methods for improved clarity and functionality.
---
 ...CosmosReadItemAndPartitionKeysExtractor.cs | 78 ++++++++++++++-----
 ...mPartitionKeyQueryDiscriminatorInIdTest.cs | 30 ++++++-
 ...artitionKeyQueryNoDiscriminatorInIdTest.cs | 23 +++++-
 ...titionKeyQueryRootDiscriminatorInIdTest.cs | 23 +++++-
 .../Query/ReadItemPartitionKeyQueryTest.cs    | 21 +++++
 5 files changed, 152 insertions(+), 23 deletions(-)

diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
index ecf029a3777..15a4be9ddaa 100644
--- a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
+++ b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
@@ -90,7 +90,7 @@ public virtual Expression ExtractPartitionKeysAndId(
             _jsonIdPropertyValues.Values.All(p => p is not null) && _jsonIdPropertyValues.Count > 0;
 
         // WithPartitionKey will clear _partitionKeyPropertyValues during the lift pass below; snapshot predicate partition key
-        // comparisons first so we can validate conflicts only if the query will use ReadItem (see ValidateNoWithPartitionKeyConflict).
+        // comparisons first so we can validate conflicts against WithPartitionKey even when the query does not use ReadItem.
         var hadWithPartitionKey = queryCompilationContext.PartitionKeyPropertyValues.Count > 0;
         Dictionary<IProperty, (Expression? ValueExpression, Expression? OriginalExpression)>? predicatePartitionKeySnapshot = null;
         if (hadWithPartitionKey)
@@ -121,6 +121,14 @@ public virtual Expression ExtractPartitionKeysAndId(
             }
         }
 
+        if (hadWithPartitionKey && predicatePartitionKeySnapshot is not null)
+        {
+            ValidateNoWithPartitionKeyConflict(
+                queryCompilationContext,
+                partitionKeyProperties,
+                predicatePartitionKeySnapshot);
+        }
+
         // Now, attempt to also transform the query to ReadItem form; this is only possible if all JSON ID properties were compared in the
         // predicate, and *all* partition key values are specified(in the predicate or via WithPartitionKey)
         if (_isPredicateCompatibleWithReadItem
@@ -136,14 +144,6 @@ public virtual Expression ExtractPartitionKeysAndId(
             && Unwrap(shapedQuery.ShaperExpression) is StructuralTypeShaperExpression { StructuralType: var projectedStructuralType }
             && projectedStructuralType == _entityType)
         {
-            if (hadWithPartitionKey)
-            {
-                ValidateNoWithPartitionKeyConflict(
-                    queryCompilationContext,
-                    partitionKeyProperties,
-                    predicatePartitionKeySnapshot!);
-            }
-
             return shapedQuery.UpdateQueryExpression(select.WithReadItemInfo(new ReadItemInfo(_jsonIdPropertyValues!)));
         }
 
@@ -214,23 +214,60 @@ private void ValidateNoWithPartitionKeyConflict(
 
             var withPartitionKeyValueExpression = queryCompilationContext.PartitionKeyPropertyValues[i];
 
-            if (!PartitionKeyValueExpressionsMatch(predicateValueExpression, withPartitionKeyValueExpression))
+            if (!PartitionKeySqlValuesMatch(
+                    predicateValueExpression,
+                    withPartitionKeyValueExpression,
+                    property))
             {
                 throw new InvalidOperationException(CosmosStrings.WithPartitionKeyConflictingPartitionKeyPredicate);
             }
         }
+    }
 
-        static bool PartitionKeyValueExpressionsMatch(Expression left, Expression right)
-            => (left, right) switch
-            {
-                (SqlConstantExpression { Value: var leftValue }, SqlConstantExpression { Value: var rightValue })
-                    => Equals(leftValue, rightValue),
+    private static bool PartitionKeySqlValuesMatch(Expression left, Expression right, IProperty partitionKeyProperty)
+    {
+        if (ReferenceEquals(left, right))
+        {
+            return true;
+        }
 
-                (SqlParameterExpression { Name: var leftName }, SqlParameterExpression { Name: var rightName })
-                    => leftName == rightName,
+        left = UnwrapPartitionKeySqlExpression(left);
+        right = UnwrapPartitionKeySqlExpression(right);
 
-                _ => false
-            };
+        if (ReferenceEquals(left, right))
+        {
+            return true;
+        }
+
+        if (left is SqlExpression sqlLeft && right is SqlExpression sqlRight && sqlLeft.Equals(sqlRight))
+        {
+            return true;
+        }
+
+        var comparer = partitionKeyProperty.GetValueComparer();
+
+        switch (left, right)
+        {
+            case (SqlConstantExpression { Value: var leftValue }, SqlConstantExpression { Value: var rightValue }):
+                return comparer.Equals(leftValue, rightValue);
+
+            case (SqlParameterExpression { Name: var leftName }, SqlParameterExpression { Name: var rightName }):
+                return leftName == rightName;
+
+            default:
+                return false;
+        }
+
+        static Expression UnwrapPartitionKeySqlExpression(Expression expression)
+        {
+            while (expression is SqlUnaryExpression { OperatorType: ExpressionType.Convert or ExpressionType.ConvertChecked } unary
+                && unary.Operand is SqlExpression operand)
+            {
+                expression = operand;
+            }
+
+            return expression;
+        }
     }
 
     /// <summary>
@@ -383,7 +420,8 @@ void ProcessPropertyComparison(string propertyName, SqlExpression propertyValue,
                 // call. Note that this is always considered a compatible comparison for ReadItem.
                 if (propertyName == property.GetJsonPropertyName()
                     && _partitionKeyPropertyValues.TryGetValue(property, out var previousValues)
-                    && (previousValues.ValueExpression is null || previousValues.Equals(propertyValue)))
+                    && (previousValues.ValueExpression is null
+                        || PartitionKeySqlValuesMatch(previousValues.ValueExpression, propertyValue, property)))
                 {
                     _partitionKeyPropertyValues[property] = (ValueExpression: propertyValue, OriginalExpression: originalExpression);
                     return;
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs
index 603f4717b6d..bbd3ee265e3 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs
@@ -1,6 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+
 namespace Microsoft.EntityFrameworkCore.Query;
 
 public class ReadItemPartitionKeyQueryDiscriminatorInIdTest
@@ -442,6 +444,32 @@ FROM root c
 """);
     }
 
+    public override async Task ReadItem_with_WithPartitionKey_and_conflicting_partition_key_predicate_throws()
+    {
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey("PK1")
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == "PK2")));
+
+        Assert.Equal(CosmosStrings.WithPartitionKeyConflictingPartitionKeyPredicate, exception.Message);
+
+        AssertSql();
+    }
+
+    public override async Task ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw()
+    {
+        await base.ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw();
+
+        AssertSql(
+            """
+@partitionKey='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("SinglePartitionKeyEntity", "DerivedSinglePartitionKeyEntity") AND ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @partitionKey)))
+""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs
index ed5cd16aa18..fb23ca2e0ac 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs
@@ -1,6 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+
 namespace Microsoft.EntityFrameworkCore.Query;
 
 public class ReadItemPartitionKeyQueryNoDiscriminatorInIdTest
@@ -359,6 +361,25 @@ public override async Task ReadItem_with_WithPartitionKey()
         AssertSql("""ReadItem(["PK1"], b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
     }
 
+    public override async Task ReadItem_with_WithPartitionKey_and_conflicting_partition_key_predicate_throws()
+    {
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey("PK1")
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == "PK2")));
+
+        Assert.Equal(CosmosStrings.WithPartitionKeyConflictingPartitionKeyPredicate, exception.Message);
+
+        AssertSql();
+    }
+
+    public override async Task ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw()
+    {
+        await base.ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw();
+
+        AssertSql("""ReadItem(["PK1"], b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
index dfa42a04ca5..cf3f28239ed 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
@@ -1,6 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+
 namespace Microsoft.EntityFrameworkCore.Query;
 
 public class ReadItemPartitionKeyQueryRootDiscriminatorInIdTest
@@ -352,6 +354,25 @@ public override async Task ReadItem_with_WithPartitionKey()
         AssertSql("""ReadItem(["PK1"], SinglePartitionKeyEntity|b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
     }
 
+    public override async Task ReadItem_with_WithPartitionKey_and_conflicting_partition_key_predicate_throws()
+    {
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey("PK1")
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == "PK2")));
+
+        Assert.Equal(CosmosStrings.WithPartitionKeyConflictingPartitionKeyPredicate, exception.Message);
+
+        AssertSql();
+    }
+
+    public override async Task ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw()
+    {
+        await base.ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw();
+
+        AssertSql("""ReadItem(["PK1"], SinglePartitionKeyEntity|b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs
index b58f0cca851..070dcda5d94 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore.Cosmos.Internal;
+
 namespace Microsoft.EntityFrameworkCore.Query;
 
 public class ReadItemPartitionKeyQueryTest : ReadItemPartitionKeyQueryTestBase<
@@ -351,6 +353,25 @@ public override async Task ReadItem_with_WithPartitionKey()
         AssertSql("""ReadItem(["PK1"], b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
     }
 
+    public override async Task ReadItem_with_WithPartitionKey_and_conflicting_partition_key_predicate_throws()
+    {
+        var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey("PK1")
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == "PK2")));
+
+        Assert.Equal(CosmosStrings.WithPartitionKeyConflictingPartitionKeyPredicate, exception.Message);
+
+        AssertSql();
+    }
+
+    public override async Task ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw()
+    {
+        await base.ReadItem_with_WithPartitionKey_and_partition_key_predicate_same_parameter_does_not_throw();
+
+        AssertSql("""ReadItem(["PK1"], b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();