Query: Cosmos: Generate enum literal/parameter correctly (#23448)

Resolves #20404

Author: smitpatel

Diff for: src/EFCore.Cosmos/Query/Internal/QuerySqlGenerator.cs

@@ -341,6 +341,12 @@ protected override Expression VisitSqlConstant(SqlConstantExpression sqlConstant
 
         private JToken GenerateJToken(object value, CoreTypeMapping typeMapping)
         {
+            if (!(AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue20404", out var enabled)
+                && enabled))
+            {
+                value = ConvertUnderlyingEnumValueToEnum(value, typeMapping.ClrType);
+            }
+
             var converter = typeMapping.Converter;
             if (converter != null)
             {
@@ -355,6 +361,15 @@ private JToken GenerateJToken(object value, CoreTypeMapping typeMapping)
             return (value as JToken) ?? JToken.FromObject(value, CosmosClientWrapper.Serializer);
         }
 
+        // Enum when compared to constant will always have value of integral type
+        // when enum would contain convert node. We remove the convert node but we also
+        // need to convert the integral value to enum value.
+        // This allows us to use converter on enum value or print enum value directly if supported by provider
+        private object ConvertUnderlyingEnumValueToEnum(object value, Type clrType)
+            => value?.GetType().IsInteger() == true && clrType.UnwrapNullableType().IsEnum
+            ? Enum.ToObject(clrType.UnwrapNullableType(), value)
+            : value;
+
         /// <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 for: test/EFCore.Cosmos.FunctionalTests/BuiltInDataTypesCosmosTest.cs

@@ -30,30 +30,6 @@ public override Task Can_filter_projection_with_captured_enum_variable(bool asyn
             return base.Can_filter_projection_with_captured_enum_variable(async);
         }
 
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_data_type()
-        {
-            base.Can_query_using_any_data_type();
-        }
-
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_data_type_nullable_shadow()
-        {
-            base.Can_query_using_any_data_type_nullable_shadow();
-        }
-
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_data_type_shadow()
-        {
-            base.Can_query_using_any_data_type_shadow();
-        }
-
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_nullable_data_type()
-        {
-            base.Can_query_using_any_nullable_data_type();
-        }
-
         [ConditionalFact(Skip = "Issue #16919")]
         public override void Can_query_using_any_nullable_data_type_as_literal()
         {
@@ -66,7 +42,7 @@ public override void Can_query_with_null_parameters_using_any_nullable_data_type
             base.Can_query_with_null_parameters_using_any_nullable_data_type();
         }
 
-        [ConditionalFact(Skip = "Issue #16919")]
+        [ConditionalFact(Skip = "Issue #16920")]
         public override void Can_insert_and_read_back_with_string_key()
         {
             base.Can_insert_and_read_back_with_string_key();

Diff for: test/EFCore.Cosmos.FunctionalTests/CustomConvertersCosmosTest.cs

@@ -35,30 +35,6 @@ public override Task Can_filter_projection_with_captured_enum_variable(bool asyn
             return base.Can_filter_projection_with_captured_enum_variable(async);
         }
 
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_data_type()
-        {
-            base.Can_query_using_any_data_type();
-        }
-
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_data_type_nullable_shadow()
-        {
-            base.Can_query_using_any_data_type_nullable_shadow();
-        }
-
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_data_type_shadow()
-        {
-            base.Can_query_using_any_data_type_shadow();
-        }
-
-        [ConditionalFact(Skip = "Issue #16919")]
-        public override void Can_query_using_any_nullable_data_type()
-        {
-            base.Can_query_using_any_nullable_data_type();
-        }
-
         [ConditionalFact(Skip = "Issue #16919")]
         public override void Can_query_using_any_nullable_data_type_as_literal()
         {
@@ -71,7 +47,7 @@ public override void Can_query_with_null_parameters_using_any_nullable_data_type
             base.Can_query_with_null_parameters_using_any_nullable_data_type();
         }
 
-        [ConditionalFact(Skip = "Issue #16919")]
+        [ConditionalFact(Skip = "Issue #16920")]
         public override void Can_insert_and_read_back_with_string_key()
         {
             base.Can_insert_and_read_back_with_string_key();

Diff for: test/EFCore.Specification.Tests/BuiltInDataTypesTestBase.cs

@@ -2015,6 +2015,31 @@ public virtual void Can_read_back_bool_mapped_as_int_through_navigation()
             }
         }
 
+        [ConditionalFact]
+        public virtual void Can_compare_enum_to_constant()
+        {
+            using var context = CreateContext();
+            var query = context.Set<AnimalIdentification>()
+                .Where(a => a.Method == IdentificationMethod.EarTag)
+                .ToList();
+
+            var result = Assert.Single(query);
+            Assert.Equal(IdentificationMethod.EarTag, result.Method);
+        }
+
+        [ConditionalFact]
+        public virtual void Can_compare_enum_to_parameter()
+        {
+            var method = IdentificationMethod.EarTag;
+            using var context = CreateContext();
+            var query = context.Set<AnimalIdentification>()
+                .Where(a => a.Method == method)
+                .ToList();
+
+            var result = Assert.Single(query);
+            Assert.Equal(IdentificationMethod.EarTag, result.Method);
+        }
+
         public abstract class BuiltInDataTypesFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
         {
             protected override string StoreName { get; } = "BuiltInDataTypes";