update to support generics

TheEightBot · Jan 20, 2022 · b7e86e0 · b7e86e0
1 parent 80ffbe6
commit b7e86e0
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/Tycho.UnitTests/TychoDbTests.cs b/Tycho.UnitTests/TychoDbTests.cs
@@ -1039,13 +1039,30 @@ public async Task TychoDb_CreateDataIndex_ShouldBeSuccessful (IJsonSerializer js
 
             using var db =
                 BuildDatabaseConnection(jsonSerializer)
+                    .AddTypeRegistration<TestClassD>()
                     .Connect ();
 
             var successful = await db.CreateIndexAsync<TestClassD> (x => x.DoubleProperty, "double_index");
 
             successful.Should ().Be (expected);
         }
 
+        [DataTestMethod]
+        [DynamicData(nameof(JsonSerializers))]
+        public async Task TychoDb_CreateDataIndexWithGeneric_ShouldBeSuccessful(IJsonSerializer jsonSerializer)
+        {
+            var expected = true;
+
+            using var db =
+                BuildDatabaseConnection(jsonSerializer)
+                    .AddTypeRegistration<TestClassG<object>>()
+                    .Connect();
+
+            var successful = await db.CreateIndexAsync<TestClassG<object>>(x => x.Id, "id_index");
+
+            successful.Should().Be(expected);
+        }
+
         [DataTestMethod]
         [DynamicData(nameof(JsonSerializers))]
         public async Task TychoDb_CreateDataIndexWithMultipleProperties_ShouldBeSuccessful(IJsonSerializer jsonSerializer)
@@ -1054,6 +1071,7 @@ public async Task TychoDb_CreateDataIndexWithMultipleProperties_ShouldBeSuccessf
 
             using var db =
                 BuildDatabaseConnection(jsonSerializer)
+                    .AddTypeRegistration<TestClassB>()
                     .Connect();
 
             var successful = await db.CreateIndexAsync<TestClassB>(new Expression<Func<TestClassB, object>>[] { x => x.StringProperty, x => x.DoubleProperty, } , "string_double_index");
@@ -1389,6 +1407,13 @@ public class TestClassF
         public TestClassD Value { get; set; }
     }
 
+    public class TestClassG<T>
+    {
+        public T InnerClass { get; set; }
+
+        public Guid Id { get; set; }
+    }
+
     public class Patient : ModelBase
     {
         public long PatientId { get; set; }

diff --git a/Tycho/RegisteredTypeInformation.cs b/Tycho/RegisteredTypeInformation.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -23,6 +24,8 @@ public class RegisteredTypeInformation
 
         public string TypeName { get; private set; }
 
+        public string SafeTypeName { get; private set; }
+
         public string TypeNamespace { get; private set; }
 
         public Type ObjectType { get; private set; }
@@ -103,6 +106,7 @@ public static RegisteredTypeInformation Create<T>()
                     RequiresIdMapping = true,
                     TypeFullName = type.FullName,
                     TypeName = type.Name,
+                    SafeTypeName = GetSafeTypeName(type),
                     TypeNamespace = type.Namespace,
                     ObjectType = type
                 };
@@ -128,5 +132,15 @@ private static string GetExpressionMemberName(Expression method)
 
             throw new TychoDbException("The provided expression is not valid member expression");
         }
+
+        private static string GetSafeTypeName(Type type)
+        {
+            return
+                !type.IsGenericType || type.IsGenericTypeDefinition
+                    ? !type.IsGenericTypeDefinition
+                        ? type.Name
+                        : type.Name.Replace('`', '_')
+                    : $"{GetSafeTypeName(type.GetGenericTypeDefinition())}__{string.Join(',', type.GetGenericArguments().Select(x => GetSafeTypeName(x)))}__";
+        }
     }
 }
diff --git a/Tycho/TychoDb.cs b/Tycho/TychoDb.cs
@@ -53,7 +53,7 @@ private StringBuilder ReusableStringBuilder
             }
         }
 
-        public TychoDb(string dbPath, IJsonSerializer jsonSerializer, string dbName = "tycho_cache.db", string password = null, bool persistConnection = true, bool rebuildCache = false, bool requireTypeRegistration = false, uint? cacheSizeBytes = null)
+        public TychoDb(string dbPath, IJsonSerializer jsonSerializer, string dbName = "tycho_cache.db", string password = null, bool persistConnection = true, bool rebuildCache = false, bool requireTypeRegistration = true)
         {
             SQLitePCL.Batteries_V2.Init ();
 
@@ -1018,7 +1018,7 @@ public ValueTask<bool> CreateIndexAsync<TObj>(Expression<Func<TObj, object>> pro
                 CheckHasRegisteredType<TObj>();
             }
 
-            return CreateIndexAsync(QueryPropertyPath.BuildPath(propertyPath), QueryPropertyPath.IsNumeric(propertyPath), typeof(TObj).Name, indexName, cancellationToken);
+            return CreateIndexAsync(QueryPropertyPath.BuildPath(propertyPath), QueryPropertyPath.IsNumeric(propertyPath), _registeredTypeInformation[typeof(TObj)].SafeTypeName, indexName, cancellationToken);
         }
 
         public ValueTask<bool> CreateIndexAsync(string propertyPathString, bool isNumeric, string objectTypeName, string indexName, CancellationToken cancellationToken = default)
@@ -1073,7 +1073,7 @@ public TychoDb CreateIndex<TObj>(Expression<Func<TObj, object>>[] propertyPaths,
             {
                 var transaction = _connection.BeginTransaction(IsolationLevel.Serializable);
 
-                var fullIndexName = $"idx_{indexName}_{typeof(TObj).Name}";
+                var fullIndexName = $"idx_{indexName}_{_registeredTypeInformation[typeof(TObj)].SafeTypeName}";
                 try
                 {
                     if (!_persistConnection)