From 668b64665e8ac4b8fb57cefa91d4a719aae20093 Mon Sep 17 00:00:00 2001
From: Tomachi <8929706+book000@users.noreply.github.com>
Date: Tue, 6 May 2025 23:40:29 +0900
Subject: [PATCH] fix(dbmerger): merge reserved table, Exception due null time
 in avatar_history (#1226)

* Fixes merge reserved table, Exception due null time in avatar_history

* Revert of auto fixes not expected

* Add  null check in oldAvatarTime
---
 DBMerger/Merger.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/DBMerger/Merger.cs b/DBMerger/Merger.cs
index a3ded0ca..cbcb909d 100644
--- a/DBMerger/Merger.cs
+++ b/DBMerger/Merger.cs
@@ -67,6 +67,12 @@ namespace DBMerger
                     continue;
                 }
                 unMergedTables.RemoveAt(i);
+                if (table.StartsWith("sqlite_"))
+                {
+                    // Skip sqlite reserved tables
+                    logger.Debug($"Skipping sqlite reserved table: {table}");
+                    continue;
+                }
                 i--;
 
                 // Then just tack them on
@@ -300,8 +306,8 @@ namespace DBMerger
                         return oldDateTime > newDateTime ? old : existing;
                     }
 
-                    var oldAvatarTime = old.Length >= 3 ? (int)old[2] : 0;
-                    var newAvatarTime = (int)existing[2];
+                    var oldAvatarTime = old.Length >= 3 && old[2] != null ? (int)old[2] : 0;
+                    var newAvatarTime = existing[2] != null ? (int)existing[2] : 0;
 
                     if (oldDateTime <= newDateTime)
                     {