InitPerClass

Author: inforithmics

nuget/Sqlite_net.SourceGenerator/SQLiteFastColumnSetterGenerator.cs

@@ -360,32 +360,45 @@ static void Execute(
 		sb.AppendLine("#endif");
 		sb.AppendLine("        public static void Init()");
         sb.AppendLine("        {");
-        sb.AppendLine ("           if (initialized)");
-        sb.AppendLine ("               return;");
-        sb.AppendLine ("           initialized = true;");
+        sb.AppendLine("           if (initialized)");
+        sb.AppendLine("               return;");
+        sb.AppendLine("           initialized = true;");
+
+        foreach (var classInfo in classes) {
+			var fullTypeName = FullTypeName (classInfo);
+			var initName = "Init" + fullTypeName.Replace (".", "_");
+			sb.AppendLine($"           {initName}();");
+		}
 
-		foreach (var classInfo in classes)
-        {
-            foreach (var property in classInfo.Properties)
-            {
-                var fullTypeName = string.IsNullOrEmpty(classInfo.Namespace) 
-                    ? classInfo.ClassName 
-                    : $"{classInfo.Namespace}.{classInfo.ClassName}";
+        sb.AppendLine ("        }");
 
+		foreach (var classInfo in classes) {
+			var fullTypeName = FullTypeName (classInfo);
+			var initName = "Init" + fullTypeName.Replace (".", "_");
+			sb.AppendLine($"        public static void {initName}()");
+			sb.AppendLine("        {");
+			foreach (var property in classInfo.Properties) {
                 sb.AppendLine($"            SQLiteConnection.RegisterFastColumnSetter(");
                 sb.AppendLine($"                typeof({fullTypeName}),");
                 sb.AppendLine($"                \"{property.ColumnName}\",");
                 sb.Append($"                (obj, stmt, index) => ");
 	            GeneratePropertySetter ($"(({fullTypeName})obj)", sb, property);
 			}
-        }
+			sb.AppendLine ("        }");
+		}
 
-        sb.AppendLine("        }");
         sb.AppendLine("    }");
         sb.AppendLine("}");
 
         context.AddSource("SQLiteInitializer.g.cs", SourceText.From(sb.ToString(), Encoding.UTF8));
     }
+
+    static string FullTypeName (ClassInfo classInfo)
+    {
+	    return string.IsNullOrEmpty (classInfo.Namespace)
+		    ? classInfo.ClassName
+		    : $"{classInfo.Namespace}.{classInfo.ClassName}";
+}
 
     static string? GetRootNamespace(AnalyzerConfigOptionsProvider configOptionsProvider, Compilation compilation)
     {

tests/SQLite.Tests/SQLite.Tests.csproj

@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="AltCover" Version="8.7.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
   </ItemGroup>