feat: enumeration support

Author: yv989c

src/QueryableValues.SqlServer/EntityPropertyMapping.cs

@@ -43,18 +43,27 @@ private EntityPropertyMapping(PropertyInfo source, PropertyInfo target, Type nor
             Source = source;
             Target = target;
             NormalizedType = normalizedType;
+            TypeName = GetTypeName(normalizedType);
 
-            if (SimpleTypes.TryGetValue(normalizedType, out EntityPropertyTypeName typeName))
+            if (TypeName == EntityPropertyTypeName.Unknown)
             {
-                TypeName = typeName;
+                throw new NotSupportedException($"{source.PropertyType.FullName} is not supported.");
+            }
+        }
+
+        public static EntityPropertyTypeName GetTypeName(Type type)
+        {
+            if (SimpleTypes.TryGetValue(type, out EntityPropertyTypeName typeName))
+            {
+                return typeName;
             }
             else
             {
-                throw new NotSupportedException($"{source.PropertyType.FullName} is not supported.");
+                return EntityPropertyTypeName.Unknown;
             }
         }
 
-        private static Type GetNormalizedType(Type type) => Nullable.GetUnderlyingType(type) ?? type;
+        public static Type GetNormalizedType(Type type) => Nullable.GetUnderlyingType(type) ?? type;
 
         public static bool IsSimpleType(Type type)
         {

src/QueryableValues.SqlServer/EntityPropertyTypeName.cs

@@ -2,6 +2,7 @@
 {
     internal enum EntityPropertyTypeName
     {
+        Unknown,
         Boolean,
         Byte,
         Int16,

src/QueryableValues.SqlServer/IQueryableFactory.cs

@@ -1,5 +1,4 @@
-#if EFCORE
-using BlazarTech.QueryableValues.Builders;
+using BlazarTech.QueryableValues.Builders;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -21,8 +20,9 @@ internal interface IQueryableFactory
         IQueryable<char> Create(DbContext dbContext, IEnumerable<char> values, bool isUnicode);
         IQueryable<string> Create(DbContext dbContext, IEnumerable<string> values, bool isUnicode);
         IQueryable<Guid> Create(DbContext dbContext, IEnumerable<Guid> values);
+        public IQueryable<TEnum> Create<TEnum>(DbContext dbContext, IEnumerable<TEnum> values)
+            where TEnum : struct, Enum;
         IQueryable<TSource> Create<TSource>(DbContext dbContext, IEnumerable<TSource> values, Action<EntityOptionsBuilder<TSource>>? configure)
             where TSource : notnull;
     }
 }
-#endif

src/QueryableValues.SqlServer/QueryableValuesDbContextExtensions.cs

@@ -1,5 +1,4 @@
-#if EFCORE
-using BlazarTech.QueryableValues.Builders;
+using BlazarTech.QueryableValues.Builders;
 using BlazarTech.QueryableValues.SqlServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -227,6 +226,27 @@ public static IQueryable<Guid> AsQueryableValues(this DbContext dbContext, IEnum
             return GetQueryableFactory(dbContext).Create(dbContext, values);
         }
 
+        /// <summary>
+        /// Allows an <see cref="IEnumerable{Enum}">IEnumerable&lt;Enum&gt;</see> to be composed in an Entity Framework query.
+        /// </summary>
+        /// <remarks>
+        /// The supported underlying types are: <see cref="byte"/>, <see cref="short"/>, <see cref="int"/>, and <see cref="long"/>.
+        /// <para>
+        /// More info: <see href="https://learn.microsoft.com/en-us/dotnet/api/system.enum#remarks"/>.
+        /// </para>
+        /// </remarks>
+        /// <param name="dbContext">The <see cref="DbContext"/> owning the query.</param>
+        /// <param name="values">The sequence of values to compose.</param>
+        /// <returns>An <see cref="IQueryable{Enum}">IQueryable&lt;Enum&gt;</see> that can be composed with other entities in the query.</returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="InvalidOperationException"></exception>
+        public static IQueryable<TEnum> AsQueryableValues<TEnum>(this DbContext dbContext, IEnumerable<TEnum> values)
+            where TEnum : struct, Enum
+        {
+            ValidateParameters(dbContext, values);
+            return GetQueryableFactory(dbContext).Create(dbContext, values);
+        }
+
         /// <summary>
         /// Allows an <see cref="IEnumerable{T}"/> to be composed in an Entity Framework query.
         /// </summary>
@@ -244,4 +264,3 @@ public static IQueryable<TSource> AsQueryableValues<TSource>(this DbContext dbCo
         }
     }
 }
-#endif

src/QueryableValues.SqlServer/QueryableValuesEnabledDbContextExtensions.cs

@@ -1,5 +1,4 @@
-#if EFCORE
-using BlazarTech.QueryableValues.Builders;
+using BlazarTech.QueryableValues.Builders;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -200,6 +199,21 @@ public static IQueryable<Guid> AsQueryableValues(this IQueryableValuesEnabledDbC
             return GetDbContext(dbContext).AsQueryableValues(values);
         }
 
+        /// <summary>
+        /// <inheritdoc cref="QueryableValuesDbContextExtensions.AsQueryableValues{TEnum}(DbContext, IEnumerable{TEnum})"/>
+        /// </summary>
+        /// <param name="dbContext"><inheritdoc cref="QueryableValuesDbContextExtensions.AsQueryableValues{TEnum}(DbContext, IEnumerable{TEnum})" path="/param[@name='dbContext']"/></param>
+        /// <param name="values"><inheritdoc cref="QueryableValuesDbContextExtensions.AsQueryableValues{TEnum}(DbContext, IEnumerable{TEnum})" path="/param[@name='values']"/></param>
+        /// <returns><inheritdoc cref="QueryableValuesDbContextExtensions.AsQueryableValues{TEnum}(DbContext, IEnumerable{TEnum})"/></returns>
+        /// <remarks><inheritdoc cref="QueryableValuesDbContextExtensions.AsQueryableValues{TEnum}(DbContext, IEnumerable{TEnum})"/></remarks>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="InvalidOperationException"></exception>
+        public static IQueryable<TEnum> AsQueryableValues<TEnum>(this IQueryableValuesEnabledDbContext dbContext, IEnumerable<TEnum> values)
+            where TEnum : struct, Enum
+        {
+            return GetDbContext(dbContext).AsQueryableValues(values);
+        }
+
         /// <summary>
         /// <inheritdoc cref="QueryableValuesDbContextExtensions.AsQueryableValues{TSource}(DbContext, IEnumerable{TSource}, Action{EntityOptionsBuilder{TSource}}?)"/>
         /// </summary>
@@ -217,4 +231,3 @@ public static IQueryable<TSource> AsQueryableValues<TSource>(this IQueryableValu
         }
     }
 }
-#endif

src/QueryableValues.SqlServer/SqlServer/QueryableFactory.cs

@@ -1,5 +1,4 @@
-#if EFCORE
-using BlazarTech.QueryableValues.Builders;
+using BlazarTech.QueryableValues.Builders;
 using BlazarTech.QueryableValues.Serializers;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
@@ -387,6 +386,22 @@ public IQueryable<Guid> Create(DbContext dbContext, IEnumerable<Guid> values)
             return CreateForSimpleType(dbContext, values);
         }
 
+        public IQueryable<TEnum> Create<TEnum>(DbContext dbContext, IEnumerable<TEnum> values)
+            where TEnum : struct, Enum
+        {
+            var enumType = typeof(TEnum);
+            var normalizedType = EntityPropertyMapping.GetNormalizedType(Enum.GetUnderlyingType(enumType));
+
+            return EntityPropertyMapping.GetTypeName(normalizedType) switch
+            {
+                EntityPropertyTypeName.Int32 => CreateForSimpleType(dbContext, values.Select(i => (int)(object)i)).Select(i => (TEnum)(object)i),
+                EntityPropertyTypeName.Byte => CreateForSimpleType(dbContext, values.Select(i => (byte)(object)i)).Select(i => (TEnum)(object)i),
+                EntityPropertyTypeName.Int16 => CreateForSimpleType(dbContext, values.Select(i => (short)(object)i)).Select(i => (TEnum)(object)i),
+                EntityPropertyTypeName.Int64 => CreateForSimpleType(dbContext, values.Select(i => (long)(object)i)).Select(i => (TEnum)(object)i),
+                _ => throw new NotSupportedException($"The underlying type of {enumType.FullName} ({normalizedType.FullName}) is not supported.")
+            };
+        }
+
         public IQueryable<TSource> Create<TSource>(DbContext dbContext, IEnumerable<TSource> values, Action<EntityOptionsBuilder<TSource>>? configure)
             where TSource : notnull
         {
@@ -470,4 +485,3 @@ public IQueryable<TSource> Create<TSource>(DbContext dbContext, IEnumerable<TSou
         }
     }
 }
-#endif