From e81982569c04d53286be7ce8a795b8199554ef5f Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Wed, 13 Jul 2011 02:13:53 -0600 Subject: [PATCH] We want PRIMARY keys, not UNIQUE keys, because UNIQUE without PRIMARY means absolute BULLSHIT. --- TShockAPI/DB/BanManager.cs | 2 +- TShockAPI/DB/GroupManager.cs | 4 ++-- TShockAPI/DB/ItemManager.cs | 4 ++-- TShockAPI/DB/RegionManager.cs | 2 +- TShockAPI/DB/UserManager.cs | 4 ++-- TShockAPI/DB/WarpsManager.cs | 4 ++-- TShockAPI/TShock.cs | 2 ++ 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/TShockAPI/DB/BanManager.cs b/TShockAPI/DB/BanManager.cs index 1f62256c..88de7af6 100644 --- a/TShockAPI/DB/BanManager.cs +++ b/TShockAPI/DB/BanManager.cs @@ -38,7 +38,7 @@ namespace TShockAPI.DB { if (TShock.Config.StorageType.ToLower() == "sqlite") com.CommandText = - "CREATE TABLE IF NOT EXISTS 'Bans' ('IP' TEXT UNIQUE , 'Name' TEXT, 'Reason' TEXT);"; + "CREATE TABLE IF NOT EXISTS 'Bans' ('IP' TEXT PRIMARY , 'Name' TEXT, 'Reason' TEXT);"; else if (TShock.Config.StorageType.ToLower() == "mysql") com.CommandText = "CREATE TABLE IF NOT EXISTS Bans (IP VARCHAR(255), Name VARCHAR(255), Reason VARCHAR(255));"; diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index 11ee3e7a..231b7cd0 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -21,10 +21,10 @@ namespace TShockAPI.DB { if (TShock.Config.StorageType.ToLower() == "sqlite") com.CommandText = - "CREATE TABLE IF NOT EXISTS 'GroupList' ('GroupName' TEXT UNIQUE, 'Commands' TEXT, 'OrderBy' TEXT);"; + "CREATE TABLE IF NOT EXISTS 'GroupList' ('GroupName' TEXT PRIMARY, 'Commands' TEXT, 'OrderBy' TEXT);"; else if (TShock.Config.StorageType.ToLower() == "mysql") com.CommandText = - "CREATE TABLE IF NOT EXISTS GroupList (GroupName VARCHAR(255) UNIQUE, Commands VARCHAR(255), OrderBy VARCHAR(255));"; + "CREATE TABLE IF NOT EXISTS GroupList (GroupName VARCHAR(255) PRIMARY, Commands VARCHAR(255), OrderBy VARCHAR(255));"; com.ExecuteNonQuery(); diff --git a/TShockAPI/DB/ItemManager.cs b/TShockAPI/DB/ItemManager.cs index 63196aa2..37f3087e 100644 --- a/TShockAPI/DB/ItemManager.cs +++ b/TShockAPI/DB/ItemManager.cs @@ -21,10 +21,10 @@ namespace TShockAPI.DB { if (TShock.Config.StorageType.ToLower() == "sqlite") com.CommandText = - "CREATE TABLE IF NOT EXISTS 'ItemBans' ('ItemName' TEXT UNIQUE);"; + "CREATE TABLE IF NOT EXISTS 'ItemBans' ('ItemName' TEXT PRIMARY);"; else if (TShock.Config.StorageType.ToLower() == "mysql") com.CommandText = - "CREATE TABLE IF NOT EXISTS ItemBans (ItemName VARCHAR(255) UNIQUE);"; + "CREATE TABLE IF NOT EXISTS ItemBans (ItemName VARCHAR(255) PRIMARY);"; com.ExecuteNonQuery(); com.CommandText = "SELECT *FROM ItemBans"; diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs index 5f4b39cf..0cd157a6 100644 --- a/TShockAPI/DB/RegionManager.cs +++ b/TShockAPI/DB/RegionManager.cs @@ -48,7 +48,7 @@ namespace TShockAPI.DB "CREATE TABLE IF NOT EXISTS 'Regions' ('X1' NUMERIC, 'Y1' NUMERIC, 'X2' NUMERIC, 'Y2' NUMERIC, 'RegionName' TEXT, 'WorldID' TEXT, 'UserIds' TEXT, 'Protected' NUMERIC);"; else if (TShock.Config.StorageType.ToLower() == "mysql") com.CommandText = - "CREATE TABLE IF NOT EXISTS Regions (X1 INT(11), Y1 INT(11), X2 INT(11), Y2 INT(11), RegionName VARCHAR(255) UNIQUE, WorldID VARCHAR(255), UserIds VARCHAR(255), Protected INT(1));"; + "CREATE TABLE IF NOT EXISTS Regions (X1 INT(11), Y1 INT(11), X2 INT(11), Y2 INT(11), RegionName VARCHAR(255) PRIMARY, WorldID VARCHAR(255), UserIds VARCHAR(255), Protected INT(1));"; com.ExecuteNonQuery(); } diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index 3c8e110f..32cf2010 100644 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -38,10 +38,10 @@ namespace TShockAPI.DB { if (TShock.Config.StorageType.ToLower() == "sqlite") com.CommandText = - "CREATE TABLE IF NOT EXISTS 'Users' ('Username' TEXT UNIQUE, 'Password' TEXT, 'UserGroup' TEXT, 'IP' TEXT);"; + "CREATE TABLE IF NOT EXISTS 'Users' ('Username' TEXT PRIMARY, 'Password' TEXT, 'UserGroup' TEXT, 'IP' TEXT);"; else if (TShock.Config.StorageType.ToLower() == "mysql") com.CommandText = - "CREATE TABLE IF NOT EXISTS Users (Username VARCHAR(255) UNIQUE, Password VARCHAR(255), UserGroup VARCHAR(255), IP VARCHAR(255));"; + "CREATE TABLE IF NOT EXISTS Users (Username VARCHAR(255) PRIMARY, Password VARCHAR(255), UserGroup VARCHAR(255), IP VARCHAR(255));"; com.ExecuteNonQuery(); } diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs index a8aa34dd..76a9bd29 100644 --- a/TShockAPI/DB/WarpsManager.cs +++ b/TShockAPI/DB/WarpsManager.cs @@ -42,10 +42,10 @@ namespace TShockAPI.DB { if (TShock.Config.StorageType.ToLower() == "sqlite") com.CommandText = - "CREATE TABLE IF NOT EXISTS 'Warps' ('X' NUMERIC, 'Y' NUMERIC, 'WarpName' TEXT UNIQUE, 'WorldID' TEXT);"; + "CREATE TABLE IF NOT EXISTS 'Warps' ('X' NUMERIC, 'Y' NUMERIC, 'WarpName' TEXT PRIMARY, 'WorldID' TEXT);"; else if (TShock.Config.StorageType.ToLower() == "mysql") com.CommandText = - "CREATE TABLE IF NOT EXISTS Warps (X INT(11), Y INT(11), WarpName VARCHAR(255) UNIQUE, WorldID VARCHAR(255));"; + "CREATE TABLE IF NOT EXISTS Warps (X INT(11), Y INT(11), WarpName VARCHAR(255) PRIMARY, WorldID VARCHAR(255));"; com.ExecuteNonQuery(); } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index d0339912..37373698 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -20,6 +20,8 @@ along with this program. If not, see . * Microsoft Visual Studio 2010 * HostPenda * And you, for your continued support and devotion to the evolution of TShock + * Kerplunc Gaming + * TerrariaGSP */ using System; using System.Collections.Generic;