From c30bd9aab34ac1e37f2107a8cf0f1d952618bcc2 Mon Sep 17 00:00:00 2001
From: JacobTech <jacob@jacobtech.com>
Date: Mon, 1 Apr 2024 00:00:42 -0400
Subject: [PATCH] New Column Filters

---
 ServerDatabase.SourceGenerator/JsonTableRowGenerator.cs         | 1 +
 .../ServerDatabase.SourceGenerator.csproj                       | 2 +-
 ServerDatabase.SourceGenerator/TableRowGenerator.cs             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ServerDatabase.SourceGenerator/JsonTableRowGenerator.cs b/ServerDatabase.SourceGenerator/JsonTableRowGenerator.cs
index 91bba2c..11e4ce4 100644
--- a/ServerDatabase.SourceGenerator/JsonTableRowGenerator.cs
+++ b/ServerDatabase.SourceGenerator/JsonTableRowGenerator.cs
@@ -84,6 +84,7 @@ namespace ServerDatabase.SourceGenerator.Generated
         string bad = prop.Type.ToString();
         Console.WriteLine(prop);
         bad = bad.Replace("ServerDatabase.TableColumn<", "");
+        bad = bad.Remove(0, bad.LastIndexOf(',')) + 1;
         bad = bad.Remove(bad.LastIndexOf('>'));
         if (bad.ToLower() == "byte[]") bad = "string";
         EqualsValueClauseSyntax? equalsSyntax = prop.DeclaringSyntaxReferences[0].GetSyntax() switch
diff --git a/ServerDatabase.SourceGenerator/ServerDatabase.SourceGenerator.csproj b/ServerDatabase.SourceGenerator/ServerDatabase.SourceGenerator.csproj
index 77193ab..a59df57 100644
--- a/ServerDatabase.SourceGenerator/ServerDatabase.SourceGenerator.csproj
+++ b/ServerDatabase.SourceGenerator/ServerDatabase.SourceGenerator.csproj
@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <TargetFramework>netstandard2.0</TargetFramework>
         <IncludeBuildOutput>true</IncludeBuildOutput>
-        <Version>1.0.2-alpha10</Version>
+        <Version>1.0.2-alpha12</Version>
         <Title>Server Database Source Generator</Title>
         <Authors>JacobTech</Authors>
     </PropertyGroup>
diff --git a/ServerDatabase.SourceGenerator/TableRowGenerator.cs b/ServerDatabase.SourceGenerator/TableRowGenerator.cs
index 493c6bf..2abcfd5 100644
--- a/ServerDatabase.SourceGenerator/TableRowGenerator.cs
+++ b/ServerDatabase.SourceGenerator/TableRowGenerator.cs
@@ -81,6 +81,7 @@ namespace ServerDatabase.SourceGenerator.Generated
     {
         string bad = prop.Type.ToString();
         bad = bad.Replace("ServerDatabase.TableColumn<", "");
+        bad = bad.Remove(0, bad.LastIndexOf(',') + 1);
         bad = bad.Remove(bad.LastIndexOf('>'));
         builder.AppendLine($"       public {bad} {prop.Name} {{ get; set; }}");
     }