From ad59115977740b3a2e3a8796382d9b4af9ef7c62 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 6 Jul 2016 16:02:35 +1000 Subject: [PATCH] Fix issue with database file handles being left open. --- Database/Database.cs | 2 +- Database/MySQL/MySQLParameterisedQuery.cs | 3 ++- Database/SQLite/SQLiteParameterisedQuery.cs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Database/Database.cs b/Database/Database.cs index 2b7aa35ee..2b56e7594 100644 --- a/Database/Database.cs +++ b/Database/Database.cs @@ -106,7 +106,7 @@ namespace MCGalaxy.SQL { public static class SQLite { - static string connStringFormat = "Data Source =" + Server.apppath + "/MCGalaxy.db; Version =3; Pooling ={0}; Max Pool Size =1000;"; + static string connStringFormat = "Data Source =" + Server.apppath + "/MCGalaxy.db; Version =3; Pooling ={0}; Max Pool Size =300;"; public static string connString { get { return String.Format(connStringFormat, Server.DatabasePooling); } } internal static ParameterisedQuery query = new SQLiteParameterisedQuery(); diff --git a/Database/MySQL/MySQLParameterisedQuery.cs b/Database/MySQL/MySQLParameterisedQuery.cs index 43bad8555..12c713c12 100644 --- a/Database/MySQL/MySQLParameterisedQuery.cs +++ b/Database/MySQL/MySQLParameterisedQuery.cs @@ -32,8 +32,8 @@ namespace MCGalaxy.SQL { foreach (var param in parameters) cmd.Parameters.AddWithValue(param.Key, param.Value); cmd.ExecuteNonQuery(); - conn.Close(); } + conn.Close(); } } @@ -45,6 +45,7 @@ namespace MCGalaxy.SQL { foreach (var param in parameters) da.SelectCommand.Parameters.AddWithValue(param.Key, param.Value); da.Fill(toReturn); + da.SelectCommand.Dispose(); } conn.Close(); } diff --git a/Database/SQLite/SQLiteParameterisedQuery.cs b/Database/SQLite/SQLiteParameterisedQuery.cs index 331e0118a..fd2f832bd 100644 --- a/Database/SQLite/SQLiteParameterisedQuery.cs +++ b/Database/SQLite/SQLiteParameterisedQuery.cs @@ -30,8 +30,8 @@ namespace MCGalaxy.SQL { foreach (var param in parameters) cmd.Parameters.AddWithValue(param.Key, param.Value); cmd.ExecuteNonQuery(); - conn.Close(); } + conn.Close(); } } @@ -42,6 +42,7 @@ namespace MCGalaxy.SQL { foreach (var param in parameters) da.SelectCommand.Parameters.AddWithValue(param.Key, param.Value); da.Fill(results); + da.SelectCommand.Dispose(); } conn.Close(); }