Added missing Dispose calls

Author: francis-page

Analyzer/SQLite/Handlers/AnimationClipHandler.cs

@@ -7,7 +7,7 @@
 
 namespace UnityDataTools.Analyzer.SQLite.Handlers;
 
-public class AnimationClipProcessor : ISQLiteHandler, IDisposable
+public class AnimationClipHandler : ISQLiteHandler
 {
     SQLiteCommand m_InsertCommand;
 

Analyzer/SQLite/Handlers/AssetBundleHandler.cs

@@ -7,7 +7,7 @@
 
 namespace UnityDataTools.Analyzer.SQLite.Handlers;
 
-public class AssetBundleHandler : ISQLiteHandler, IDisposable
+public class AssetBundleHandler : ISQLiteHandler
 {
     SQLiteCommand m_InsertCommand;
 

Analyzer/SQLite/Handlers/AudioClipHandler.cs

@@ -7,7 +7,7 @@
 
 namespace UnityDataTools.Analyzer.SQLite.Handlers;
 
-public class AudioClipHandler : ISQLiteHandler, IDisposable
+public class AudioClipHandler : ISQLiteHandler
 {
     SQLiteCommand m_InsertCommand;
 

Analyzer/SQLite/Handlers/ISQLiteHandler.cs

@@ -1,10 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Data.SQLite;
 using UnityDataTools.FileSystem.TypeTreeReaders;
 
 namespace UnityDataTools.Analyzer.SQLite.Handlers;
 
-public interface ISQLiteHandler
+public interface ISQLiteHandler : IDisposable
 {
     void Init(SQLiteConnection db);
     void Process(ObjectIdProvider idProvider, long objectId, Dictionary<int, int> localToDbFileId, RandomAccessReader reader, out string name, out long streamDataSize);

Analyzer/SQLite/Handlers/MeshHandler.cs

@@ -7,7 +7,7 @@
 
 namespace UnityDataTools.Analyzer.SQLite.Handlers;
 
-public class MeshHandler : ISQLiteHandler, IDisposable
+public class MeshHandler : ISQLiteHandler
 {
     SQLiteCommand m_InsertCommand;
 

Analyzer/SQLite/Handlers/ShaderHandler.cs

@@ -6,7 +6,7 @@
 
 namespace UnityDataTools.Analyzer.SQLite.Handlers;
 
-public class ShaderHandler : ISQLiteHandler, IDisposable
+public class ShaderHandler : ISQLiteHandler
 {
     SQLiteCommand m_InsertCommand;
     SQLiteCommand m_InsertSubProgramCommand;
@@ -158,6 +158,7 @@ void IDisposable.Dispose()
     {
         m_InsertCommand.Dispose();
         m_InsertSubProgramCommand.Dispose();
+        m_InsertKeywordCommand.Dispose();
         m_InsertSubProgramKeywordsCommand.Dispose();
     }
 }

Analyzer/SQLite/Handlers/Texture2DHandler.cs

@@ -7,7 +7,7 @@
 
 namespace UnityDataTools.Analyzer.SQLite.Handlers;
 
-public class Texture2DHandler : ISQLiteHandler, IDisposable
+public class Texture2DHandler : ISQLiteHandler
 {
     SQLiteCommand m_InsertCommand;
 

Analyzer/SQLite/SQLiteWriter.cs

@@ -22,13 +22,13 @@ public class SQLiteWriter : IWriter
     private IdProvider<string> m_SerializedFileIdProvider = new ();
     private ObjectIdProvider m_ObjectIdProvider = new ();
 
-    private Dictionary<string, ISQLiteHandler> m_Processors = new ()
+    private Dictionary<string, ISQLiteHandler> m_Handlers = new ()
     {
         { "Mesh", new MeshHandler() },
         { "Texture2D", new Texture2DHandler() },
         { "Shader", new ShaderHandler() },
         { "AudioClip", new AudioClipHandler() },
-        { "AnimationClip", new AnimationClipProcessor() },
+        { "AnimationClip", new AnimationClipHandler() },
         { "AssetBundle", new AssetBundleHandler() },
     };
 
@@ -61,7 +61,7 @@ public void Begin()
         command.CommandText = Properties.Resources.Init;
         command.ExecuteNonQuery();
 
-        foreach (var processor in m_Processors.Values)
+        foreach (var processor in m_Handlers.Values)
         {
             processor.Init(m_Database);
         }
@@ -76,7 +76,7 @@ public void End()
             throw new InvalidOperationException("SQLiteWriter.End called before SQLiteWriter.Begin");
         }
 
-        foreach (var processor in m_Processors.Values)
+        foreach (var processor in m_Handlers.Values)
         {
             processor.Finalize(m_Database);
         }
@@ -201,7 +201,7 @@ public void WriteSerializedFile(string filename, string fullPath)
             string name = null;
             long streamDataSize = 0;
 
-            if (m_Processors.TryGetValue(root.Type, out var processor))
+            if (m_Handlers.TryGetValue(root.Type, out var processor))
             {
                 processor.Process(m_ObjectIdProvider, currentObjectId, localToDbFileId, randomAccessReader, out name, out streamDataSize);
             }
@@ -248,11 +248,17 @@ public void AddReference(long objectId, long referencedObjectId, string property
 
     public void Dispose()
     {
+        foreach (var handler in m_Handlers.Values)
+        {
+            handler.Dispose();
+        }
+
         m_AddAssetBundleCommand.Dispose();
         m_AddSerializedFileCommand.Dispose();
         m_AddReferenceCommand.Dispose();
         m_AddObjectCommand.Dispose();
         m_AddTypeCommand.Dispose();
+
         m_Database.Dispose();
     }
 }