Change try catch blocks to include openning of connection.

Framework/Database/MySqlBase.cs

@@ -65,18 +65,18 @@ namespace Framework.Database
             _connectionInfo = new MySqlConnectionInfo(connectionObject);
             _updater = new DatabaseUpdater<T>(this);
 
-            using (var connection = _connectionInfo.GetConnection())
-            {
             try
+            {
+                using (var connection = _connectionInfo.GetConnection())
                 {
                     connection.Open();
                     Log.outInfo(LogFilter.SqlDriver, "Connected to MySQL(ver: {0}) Database: {1}", connection.ServerVersion, _connectionInfo.Database);
                     return MySqlErrorCode.None;
                 }
+            }
             catch (MySqlException ex)
             {                
-                    return (MySqlErrorCode)((MySqlException)ex.InnerException).Number;
+                return HandleMySQLException(ex);
-                }
             }
         }
 
@@ -85,13 +85,13 @@ namespace Framework.Database
             Execute(new PreparedStatement(string.Format(sql, args)));
         }
         public void Execute(PreparedStatement stmt)
+        {
+            try
             {
                 using (var Connection = _connectionInfo.GetConnection())
                 {
                     Connection.Open();
                     using (MySqlCommand cmd = Connection.CreateCommand())
-                {
-                    try
                     {
                         cmd.CommandText = stmt.CommandText;
                         foreach (var parameter in stmt.Parameters)
@@ -99,13 +99,13 @@ namespace Framework.Database
 
                         cmd.ExecuteNonQuery();
                     }
+                }
+            }
             catch (MySqlException ex)
             {
                 HandleMySQLException(ex, stmt.CommandText);
             }
         }
-            }
-        }
 
         public void ExecuteOrAppend(SQLTransaction trans, PreparedStatement stmt)
         {
@@ -123,13 +123,14 @@ namespace Framework.Database
         public SQLResult Query(PreparedStatement stmt)
         {
             List<object[]> rows = new List<object[]>();
+            try
+            {
                 using (var Connection = _connectionInfo.GetConnection())
                 {
                     Connection.Open();
                     using (MySqlCommand cmd = Connection.CreateCommand())
                     {
-                    try
+
-                    {
                         cmd.CommandText = stmt.CommandText;
                         foreach (var parameter in stmt.Parameters)
                             cmd.Parameters.AddWithValue("@" + parameter.Key, parameter.Value);
@@ -149,12 +150,13 @@ namespace Framework.Database
                             }
                         }
                     }
+
+                }
+            }
             catch (MySqlException ex)
             {
                 HandleMySQLException(ex, stmt.CommandText);
             }
-                }
-            }
 
             return new SQLResult(rows);
         }
@@ -177,7 +179,7 @@ namespace Framework.Database
             {
                 using (var Connection = _connectionInfo.GetConnection())
                 {
-                    Connection.Open();
+                    await Connection.OpenAsync();
                     using (MySqlCommand cmd = Connection.CreateCommand())
                     {
                         cmd.CommandText = stmt.CommandText;
@@ -186,7 +188,7 @@ namespace Framework.Database
 
                         using (var reader = await cmd.ExecuteReaderAsync())
                         {
-                            if (reader.Read() && reader.HasRows)
+                            if (await reader.ReadAsync() && reader.HasRows)
                             {
                                 do
                                 {
@@ -195,7 +197,7 @@ namespace Framework.Database
                                     reader.GetValues(row);
                                     rows.Add(row);
                                 }
-                                while (reader.Read());
+                                while (await reader.ReadAsync());
                             }
                         }
                     }
@@ -210,8 +212,6 @@ namespace Framework.Database
         }
 
         public async Task<SQLQueryHolder<R>> DelayQueryHolder<R>(SQLQueryHolder<R> holder)
-        {
-            return await Task.Run(async () =>
         {
             string query = "";
 
@@ -219,7 +219,7 @@ namespace Framework.Database
             {
                 using (var Connection = _connectionInfo.GetConnection())
                 {
-                        Connection.Open();
+                    await Connection.OpenAsync();
 
                     foreach (var pair in holder.m_queries)
                     {
@@ -233,7 +233,7 @@ namespace Framework.Database
                             query = cmd.CommandText;
                             using (var reader = await cmd.ExecuteReaderAsync())
                             {
-                                    if (reader.Read() && reader.HasRows)
+                                if (await reader.ReadAsync() && reader.HasRows)
                                 {
                                     do
                                     {
@@ -242,7 +242,7 @@ namespace Framework.Database
                                         reader.GetValues(row);
                                         rows.Add(row);
                                     }
-                                        while (reader.Read());
+                                    while (await reader.ReadAsync());
                                 }
                             }
                         }
@@ -258,7 +258,6 @@ namespace Framework.Database
                 HandleMySQLException(ex, query);
                 return holder;
             }
-            });
         }
 
         public void LoadPreparedStatements()
@@ -287,37 +286,41 @@ namespace Framework.Database
         }
 
         public bool Apply(string sql)
+        {
+            try
             {
                 using (var Connection = _connectionInfo.GetConnectionNoDatabase())
                 {
                     using (MySqlCommand cmd = Connection.CreateCommand())
                     {
-                    try
+
-                    {
                         Connection.Open();
                         cmd.CommandText = sql;
                         return cmd.ExecuteNonQuery() > 0;
                     }
+                }
+            }
             catch (MySqlException ex)
             {
                 HandleMySQLException(ex, sql);
                 return false;
             }
         }
-            }
-        }
 
         public bool ApplyFile(string path)
+        {
+            try
             {
                 using (var connection = _connectionInfo.GetConnection())
                 {
                     using (MySqlCommand cmd = connection.CreateCommand())
-                {
-                    try
                     {
                         connection.Open();
                         cmd.CommandText = File.ReadAllText(path);
                         return cmd.ExecuteNonQuery() > 0;
+
+                    }
+                }
             }
             catch (MySqlException ex)
             {
@@ -325,8 +328,6 @@ namespace Framework.Database
                 return false;
             }
         }
-            }
-        }
 
         public void EscapeString(ref string str)
         {
@@ -338,6 +339,7 @@ namespace Framework.Database
             using (var Connection = _connectionInfo.GetConnection())
             {
                 string query = "";
+
                 Connection.Open();
                 using (MySqlTransaction trans = Connection.BeginTransaction())
                 {
@@ -366,13 +368,13 @@ namespace Framework.Database
             }
         }
 
-        void HandleMySQLException(MySqlException ex, string query)
+        MySqlErrorCode HandleMySQLException(MySqlException ex, string query = "")
         {
-            int code = ex.Number;
+            MySqlErrorCode code = (MySqlErrorCode)ex.Number;
             if (ex.InnerException != null)
-                code = ((MySqlException)ex.InnerException).Number;
+                code = (MySqlErrorCode)((MySqlException)ex.InnerException).Number;
 
-            switch ((MySqlErrorCode)code)
+            switch (code)
             {
                 case MySqlErrorCode.BadFieldError:
                 case MySqlErrorCode.NoSuchTable:
@@ -384,6 +386,7 @@ namespace Framework.Database
             }
 
             Log.outError(LogFilter.Sql, "SqlException: {0} SqlQuery: {1}", ex.Message, query);
+            return code;
         }
 
         public DatabaseUpdater<T> GetUpdater()