From b74455433e04876808485aafb94a3f9860489575 Mon Sep 17 00:00:00 2001 From: Twitchy Date: Tue, 12 Jul 2011 19:36:17 +1200 Subject: [PATCH] Changed Exception catch types. Removed trying to insert to ID field --- TShockAPI/DB/BanManager.cs | 10 +++++----- TShockAPI/DB/GroupManager.cs | 4 ++-- TShockAPI/DB/ItemManager.cs | 6 +++--- TShockAPI/DB/RegionManager.cs | 12 ++++++------ TShockAPI/DB/UserManager.cs | 15 +++++++-------- TShockAPI/DB/WarpsManager.cs | 8 ++++---- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/TShockAPI/DB/BanManager.cs b/TShockAPI/DB/BanManager.cs index b5f6bc77..6a062ebb 100644 --- a/TShockAPI/DB/BanManager.cs +++ b/TShockAPI/DB/BanManager.cs @@ -62,7 +62,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -87,7 +87,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -108,7 +108,7 @@ namespace TShockAPI.DB } return true; } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -127,7 +127,7 @@ namespace TShockAPI.DB return true; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -144,7 +144,7 @@ namespace TShockAPI.DB return true; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index 6ed91d55..57bb2d2d 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -88,7 +88,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -141,7 +141,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } diff --git a/TShockAPI/DB/ItemManager.cs b/TShockAPI/DB/ItemManager.cs index e4ec52ee..b2837670 100644 --- a/TShockAPI/DB/ItemManager.cs +++ b/TShockAPI/DB/ItemManager.cs @@ -39,7 +39,7 @@ namespace TShockAPI.DB com.ExecuteNonQuery(); } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -56,7 +56,7 @@ namespace TShockAPI.DB com.ExecuteNonQuery(); } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -78,7 +78,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs index 793624ab..19c5b3ec 100644 --- a/TShockAPI/DB/RegionManager.cs +++ b/TShockAPI/DB/RegionManager.cs @@ -74,7 +74,7 @@ namespace TShockAPI.DB return true; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -94,7 +94,7 @@ namespace TShockAPI.DB return true; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -120,7 +120,7 @@ namespace TShockAPI.DB return false; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); return false; @@ -162,7 +162,7 @@ namespace TShockAPI.DB } return false; } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); return false; @@ -223,7 +223,7 @@ namespace TShockAPI.DB return false; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); return false; @@ -245,7 +245,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index 7c19ad42..03e3dea4 100644 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -46,11 +46,10 @@ namespace TShockAPI.DB com.ExecuteNonQuery(); if (TShock.Config.StorageType.ToLower() == "sqlite") - com.CommandText = "INSERT OR IGNORE INTO Users (ID, UserGroup, IP) VALUES (@id, @group, @ip);"; + com.CommandText = "INSERT OR IGNORE INTO Users (UserGroup, IP) VALUES (@group, @ip);"; else if (TShock.Config.StorageType.ToLower() == "mysql") - com.CommandText = "INSERT IGNORE INTO Users (ID, UserGroup, IP) VALUES (@id, @group, @ip);"; + com.CommandText = "INSERT IGNORE INTO Users (UserGroup, IP) VALUES (@group, @ip);"; - com.AddParameter("@id", 1); com.AddParameter("@ip", "127.0.0.1"); com.AddParameter("@group", "superadmin"); com.ExecuteNonQuery(); @@ -86,7 +85,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { //Return code 0 (Add failed) Log.Error(ex.ToString()); @@ -121,7 +120,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { //Return code 0 (Remove failed) Log.Error(ex.ToString()); @@ -154,7 +153,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -183,7 +182,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -219,7 +218,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs index 881f9a50..68a8999a 100644 --- a/TShockAPI/DB/WarpsManager.cs +++ b/TShockAPI/DB/WarpsManager.cs @@ -66,7 +66,7 @@ namespace TShockAPI.DB return true; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -86,7 +86,7 @@ namespace TShockAPI.DB return true; } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -109,7 +109,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); } @@ -131,7 +131,7 @@ namespace TShockAPI.DB } } } - catch (SqliteExecutionException ex) + catch (Exception ex) { Log.Error(ex.ToString()); }