Allow describing an index from a given Type.

README.md

@@ -7,6 +7,29 @@ A .NET document database interface for relational databases, because in SQL we (
 [![NuGet](https://img.shields.io/nuget/v/YesSql.svg)](https://www.nuget.org/packages/YesSql)
 [![MyGet](https://img.shields.io/myget/yessql/vpre/yessql.svg?label=MyGet)](https://www.myget.org/feed/yessql/package/nuget/yessql)
 
+Dynamic index type support
+-------------------
+
+```c#
+    public class PropertyDynamicIndexProvider : IndexProvider<Property>
+    {
+        public override void Describe(DescribeContext<Property> context)
+        {
+            var propertyType = typeof(PropertyIndex);
+            context
+                .For(propertyType) //Specify a type directly
+                .Map(property => new PropertyIndex
+                {
+                    Name = property.Name,
+                    ForRent = property.ForRent,
+                    IsOccupied = property.IsOccupied,
+                    Location = property.Location
+                });
+        }
+    }
+```
+
+
 How does it work ?
 -------------------
 

src/YesSql.Abstractions/Indexes/DescribeContext.cs

@@ -25,12 +25,19 @@ public IEnumerable<IndexDescriptor> Describe(params Type[] types)
                 });
         }
 
+        public IMapFor<T, IIndex> For(Type indexType)
+        {
+            return For<IIndex, object>(indexType);
+        }
         public IMapFor<T, TIndex> For<TIndex>() where TIndex : IIndex
         {
             return For<TIndex, object>();
         }
-
         public IMapFor<T, TIndex> For<TIndex, TKey>() where TIndex : IIndex
+        {
+            return For<TIndex, object>(null);
+        }
+        public IMapFor<T, TIndex> For<TIndex, TKey>(Type indexType) where TIndex : IIndex
         {
             List<IDescribeFor> descriptors;
 
@@ -40,6 +47,12 @@ public IMapFor<T, TIndex> For<TIndex, TKey>() where TIndex : IIndex
             }
 
             var describeFor = new IndexDescriptor<T, TIndex, TKey>();
+
+            if (indexType != null)
+            {
+                describeFor.IndexType = indexType;
+            }
+
             descriptors.Add(describeFor);
 
             return describeFor;

src/YesSql.Abstractions/Indexes/DescribeFor.cs

@@ -51,8 +51,7 @@ public class IndexDescriptor<T, TIndex, TKey> : IDescribeFor, IMapFor<T, TIndex>
         private Func<object, bool> _filter;
 
         public PropertyInfo GroupProperty { get; set; }
-        public Type IndexType { get { return typeof(TIndex); } }
-
+        public Type IndexType { get; set; } = typeof(TIndex);
         public Func<object, bool> Filter => _filter;
 
         public IGroupFor<TIndex> Map(Func<T, IEnumerable<TIndex>> map)

src/YesSql.Core/Commands/IndexCommand.cs

@@ -20,7 +20,7 @@ public abstract class IndexCommand : IIndexCommand
         protected readonly IStore _store;
 
         private static readonly ConcurrentDictionary<PropertyInfo, PropertyInfoAccessor> PropertyAccessors = new();
-        private static readonly ConcurrentDictionary<string, PropertyInfo[]> TypeProperties = new();
+        private static readonly ConcurrentDictionary<Type, PropertyInfo[]> TypeProperties = new();
         private static readonly ConcurrentDictionary<CompoundKey, string> InsertsList = new();
         private static readonly ConcurrentDictionary<CompoundKey, string> UpdatesList = new();
 
@@ -67,13 +67,19 @@ protected static void GetProperties(DbCommand command, object item, string suffi
 
         protected static PropertyInfo[] TypePropertiesCache(Type type)
         {
-            if (TypeProperties.TryGetValue(type.FullName, out var pis))
+            if (TypeProperties.TryGetValue(type, out var pis))
             {
                 return pis;
             }
+            //Avoid InvalidCastException
+            var exists = TypeProperties.Keys.FirstOrDefault(x => x.FullName == type.FullName);
+            if (exists != null)
+            {
+                TypeProperties.Remove(exists, out _);
+            }
 
             var properties = type.GetProperties().Where(IsWriteable).ToArray();
-            TypeProperties[type.FullName] = properties;
+            TypeProperties[type] = properties;
             return properties;
         }
 

test/YesSql.Tests/Indexes/PropertyIndex.cs

@@ -26,4 +26,20 @@ public override void Describe(DescribeContext<Property> context)
                 });
         }
     }
+    public class PropertyDynamicIndexProvider : IndexProvider<Property>
+    {
+        public override void Describe(DescribeContext<Property> context)
+        {
+            var propertyType = typeof(PropertyIndex);
+            context
+                .For(propertyType)
+                .Map(property => new PropertyIndex
+                {
+                    Name = property.Name,
+                    ForRent = property.ForRent,
+                    IsOccupied = property.IsOccupied,
+                    Location = property.Location
+                });
+        }
+    }
 }

test/YesSql.Tests/SqliteTests.cs

@@ -139,5 +139,50 @@ await builder
 
             await session.SaveAsync(property);
         }
+
+        [Fact]
+        public async Task ShouldDynamicIndexPropertyKeys()
+        {
+            await using (var connection = _store.Configuration.ConnectionFactory.CreateConnection())
+            {
+                await connection.OpenAsync();
+
+                await using var transaction = await connection.BeginTransactionAsync(_store.Configuration.IsolationLevel);
+                var builder = new SchemaBuilder(_store.Configuration, transaction);
+
+                await builder
+                    .DropMapIndexTableAsync<PropertyIndex>();
+
+                await builder
+                    .CreateMapIndexTableAsync<PropertyIndex>(column => column
+                        .Column<string>(nameof(PropertyIndex.Name), col => col.WithLength(4000))
+                        .Column<bool>(nameof(PropertyIndex.ForRent))
+                        .Column<bool>(nameof(PropertyIndex.IsOccupied))
+                        .Column<string>(nameof(PropertyIndex.Location), col => col.WithLength(4000))
+                    );
+
+                await builder
+                    .AlterTableAsync(nameof(PropertyIndex), table => table
+                        .CreateIndex("IDX_Property", "Name", "ForRent", "IsOccupied", "Location"));
+
+                await transaction.CommitAsync();
+            }
+
+            _store.RegisterIndexes<PropertyDynamicIndexProvider>();
+
+            await using var session = _store.CreateSession();
+            var property = new Property
+            {
+                Name = new string('*', 4000),
+                IsOccupied = true,
+                ForRent = true,
+                Location = new string('*', 4000)
+            };
+
+            await session.SaveAsync(property);
+            await session.SaveChangesAsync();
+            var idx = await session.Query<Property, PropertyIndex>(x => x.Id == 1).ListAsync();
+            Assert.NotEmpty(idx);
+        }
     }
 }