Merge branch 'dynamicIndexType' of https://github.com/hyzx86/yessql i…

…nto dynamicIndexType

src/YesSql.Abstractions/IStore.cs

@@ -44,6 +44,5 @@ public interface IStore : IDisposable
         /// Returns the <see cref="ITypeService" /> instance used to create this store.
         /// </summary>
         ITypeService TypeNames { get; }
-
     }
 }

src/YesSql.Abstractions/Indexes/DescribeContext.cs

@@ -32,10 +32,7 @@ public IMapFor<T, TIndex> For<TIndex>() where TIndex : IIndex
             return For<TIndex, object>(typeof(TIndex));
         }
 
-        public IMapFor<T, TIndex> For<TIndex, TKey>() where TIndex : IIndex
-        {
-            return For<TIndex, object>(typeof(TIndex));
-        }
+        public IMapFor<T, TIndex> For<TIndex, TKey>() where TIndex : IIndex => For<TIndex, object>(typeof(TIndex));
 
         public IMapFor<T, TIndex> For<TIndex, TKey>(Type indexType) where TIndex : IIndex
         {

src/YesSql.Abstractions/Indexes/IndexTypeCacheProvider.cs

@@ -12,10 +12,7 @@ public class IndexTypeCacheProvider
         private static readonly ConcurrentDictionary<PropertyInfo, PropertyInfoAccessor> PropertyAccessors = new();
         private static readonly ConcurrentDictionary<Type, PropertyInfo[]> TypeProperties = new();
 
-        public virtual PropertyInfoAccessor GetPropertyAccessor(PropertyInfo property)
-        {
-            return PropertyAccessors.GetOrAdd(property, p => new PropertyInfoAccessor(p));
-        }
+        public virtual PropertyInfoAccessor GetPropertyAccessor(PropertyInfo property) => PropertyAccessors.GetOrAdd(property, p => new PropertyInfoAccessor(p));
 
         public virtual PropertyInfo[] GetTypeProperties(Type type)
         {
@@ -26,6 +23,7 @@ public virtual PropertyInfo[] GetTypeProperties(Type type)
 
             var properties = type.GetProperties().Where(IsWriteable).ToArray();
             TypeProperties[type] = properties;
+
             return properties;
         }
 

src/YesSql.Core/Commands/IndexCommand.cs

@@ -17,8 +17,9 @@ public abstract class IndexCommand : IIndexCommand
     {
         private const string _separator = ", ";
         protected const string ParameterSuffix = "_$$$";
-        protected static PropertyInfo[] KeysProperties = [typeof(IIndex).GetProperty("Id")];
+
         private static IndexTypeCacheProvider IndexTypeCacheProvider;
+        protected static PropertyInfo[] KeysProperties = [typeof(IIndex).GetProperty("Id")];
 
         private static readonly ConcurrentDictionary<CompoundKey, string> InsertsList = new();
         private static readonly ConcurrentDictionary<CompoundKey, string> UpdatesList = new();

test/YesSql.Tests/CoreTests.cs

@@ -6357,6 +6357,7 @@ await builder
 
             await session.SaveAsync(property);
             await session.SaveChangesAsync();
+
             var testProperties = await session.Query<Property, PropertyIndex>(x => x.Id == 1).ListAsync();
             Assert.NotEmpty(testProperties);
             session.Dispose();