From 48061638d85b74408fda01674d4ab834afe13cc2 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 24 Oct 2020 20:42:14 -0700 Subject: [PATCH] refactor --- SQL/paradise_schema.sql | 57 +++++++++++++++----------------- SQL/paradise_schema_prefixed.sql | 53 ++++++++++++++--------------- 2 files changed, 53 insertions(+), 57 deletions(-) diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index 5b7da548ab1..ea92018946a 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -75,10 +75,10 @@ CREATE TABLE `characters` ( `body_accessory` mediumtext NOT NULL, `gear` mediumtext NOT NULL, `autohiss` tinyint(1) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB AUTO_INCREMENT=18747 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -ALTER TABLE `characters` ADD INDEX(`ckey`); -- -- Table structure for table `customuseritems` @@ -143,9 +143,9 @@ CREATE TABLE `donators` ( `start_date` datetime, `end_date` datetime, `active` boolean, - PRIMARY KEY (`patreon_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `donators` ADD INDEX(`ckey`); + PRIMARY KEY (`patreon_name`), + KEY `ckey` (`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -162,9 +162,9 @@ CREATE TABLE `admin` ( `rank` varchar(32) NOT NULL DEFAULT 'Administrator', `level` int(2) NOT NULL DEFAULT '0', `flags` int(16) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8mb4; -ALTER TABLE `admin` ADD INDEX(`ckey`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -180,9 +180,9 @@ CREATE TABLE `admin_log` ( `adminckey` varchar(32) NOT NULL, `adminip` varchar(18) NOT NULL, `log` text NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `adminckey` (`adminckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `admin_log` ADD INDEX(`adminckey`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -216,12 +216,12 @@ CREATE TABLE `ban` ( `unbanned_ckey` varchar(32) DEFAULT NULL, `unbanned_computerid` varchar(32) DEFAULT NULL, `unbanned_ip` varchar(32) DEFAULT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`), + KEY `computerid` (`computerid`), + KEY `ip` (`ip`) ) ENGINE=InnoDB AUTO_INCREMENT=10685 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -ALTER TABLE `ban` ADD INDEX(`ckey`); -ALTER TABLE `ban` ADD INDEX(`computerid`); -ALTER TABLE `ban` ADD INDEX(`ip`); -- -- Table structure for table `feedback` @@ -282,11 +282,6 @@ CREATE TABLE `player` ( KEY `fupdate` (`fupdate`) ) ENGINE=InnoDB AUTO_INCREMENT=135298 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -ALTER TABLE `player` ADD INDEX(`lastseen`); -ALTER TABLE `player` ADD INDEX(`computerid`); -ALTER TABLE `player` ADD INDEX(`ip`); -ALTER TABLE `player` ADD INDEX(`fuid`); -ALTER TABLE `player` ADD INDEX(`fupdate`); -- -- Table structure for table `poll_option` @@ -438,10 +433,10 @@ CREATE TABLE `library` ( `category` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `flagged` int(11) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`), + KEY `flagged` (`flagged`) ) ENGINE=MyISAM AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -ALTER TABLE `library` ADD INDEX(`ckey`); -ALTER TABLE `library` ADD INDEX(`flagged`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -522,9 +517,9 @@ CREATE TABLE `notes` ( `edits` text, `server` varchar(50) NOT NULL, `crew_playtime` mediumint(8) UNSIGNED DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `notes` ADD INDEX(`ckey`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -580,9 +575,9 @@ DROP TABLE IF EXISTS `oauth_tokens`; CREATE TABLE `oauth_tokens` ( `ckey` varchar(32) NOT NULL, `token` varchar(32) NOT NULL, - PRIMARY KEY (`token`) + PRIMARY KEY (`token`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `oauth_tokens` ADD INDEX(`ckey`); /*!40101 SET character_set_client = @saved_cs_client */; @@ -611,11 +606,11 @@ CREATE TABLE `connection_log` ( `ckey` varchar(32) NOT NULL, `ip` varchar(32) NOT NULL, `computerid` varchar(32) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`), + KEY `ip` (`ip`), + KEY `computerid` (`computerid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `connection_log` ADD INDEX(`ckey`); -ALTER TABLE `connection_log` ADD INDEX(`ip`); -ALTER TABLE `connection_log` ADD INDEX(`computerid`); -- -- Table structure for table `changelog` @@ -639,7 +634,7 @@ CREATE TABLE `ip2group` ( `ip` varchar (18) NOT NULL, `date` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL, `groupstr` varchar (32) NOT NULL DEFAULT '', - PRIMARY KEY (`ip`) + PRIMARY KEY (`ip`), + KEY `groupstr` (`groupstr`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `ip2group` ADD INDEX(`groupstr`); diff --git a/SQL/paradise_schema_prefixed.sql b/SQL/paradise_schema_prefixed.sql index 43660158d6d..880ceb99a10 100644 --- a/SQL/paradise_schema_prefixed.sql +++ b/SQL/paradise_schema_prefixed.sql @@ -75,10 +75,10 @@ CREATE TABLE `SS13_characters` ( `body_accessory` mediumtext NOT NULL, `gear` mediumtext NOT NULL, `autohiss` tinyint(1) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB AUTO_INCREMENT=18747 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -ALTER TABLE `SS13_characters` ADD INDEX(`ckey`); -- -- Table structure for table `SS13_customuseritems` @@ -143,9 +143,9 @@ CREATE TABLE `SS13_donators` ( `start_date` datetime, `end_date` datetime, `active` boolean, - PRIMARY KEY (`patreon_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `SS13_donators` ADD INDEX(`ckey`); + PRIMARY KEY (`patreon_name`), + KEY `ckey` (`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -161,9 +161,9 @@ CREATE TABLE `SS13_admin` ( `rank` varchar(32) NOT NULL DEFAULT 'Administrator', `level` int(2) NOT NULL DEFAULT '0', `flags` int(16) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8mb4; -ALTER TABLE `SS13_admin` ADD INDEX(`ckey`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -179,9 +179,9 @@ CREATE TABLE `SS13_admin_log` ( `adminckey` varchar(32) NOT NULL, `adminip` varchar(18) NOT NULL, `log` text NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `adminckey` (`adminckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `SS13_admin_log` ADD INDEX(`adminckey`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -215,12 +215,12 @@ CREATE TABLE `SS13_ban` ( `unbanned_ckey` varchar(32) DEFAULT NULL, `unbanned_computerid` varchar(32) DEFAULT NULL, `unbanned_ip` varchar(32) DEFAULT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`), + KEY `computerid` (`computerid`), + KEY `ip` (`ip`) ) ENGINE=InnoDB AUTO_INCREMENT=10685 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -ALTER TABLE `SS13_ban` ADD INDEX(`ckey`); -ALTER TABLE `SS13_ban` ADD INDEX(`computerid`); -ALTER TABLE `SS13_ban` ADD INDEX(`ip`); -- -- Table structure for table `SS13_feedback` @@ -280,6 +280,7 @@ CREATE TABLE `SS13_player` ( KEY `fuid` (`fuid`), KEY `fupdate` (`fupdate`) ) ENGINE=InnoDB AUTO_INCREMENT=135298 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `SS13_poll_option` @@ -431,10 +432,10 @@ CREATE TABLE `SS13_library` ( `category` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `flagged` int(11) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`), + KEY `flagged` (`flagged`) ) ENGINE=MyISAM AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -ALTER TABLE `SS13_library` ADD INDEX(`ckey`); -ALTER TABLE `SS13_library` ADD INDEX(`flagged`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -515,9 +516,9 @@ CREATE TABLE `SS13_notes` ( `edits` text, `server` varchar(50) NOT NULL, `crew_playtime` mediumint(8) UNSIGNED DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `SS13_notes` ADD INDEX(`ckey`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -573,9 +574,9 @@ DROP TABLE IF EXISTS `SS13_oauth_tokens`; CREATE TABLE `SS13_oauth_tokens` ( `ckey` varchar(32) NOT NULL, `token` varchar(32) NOT NULL, - PRIMARY KEY (`token`) + PRIMARY KEY (`token`), + KEY `ckey` (`ckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `SS13_oauth_tokens` ADD INDEX(`ckey`); /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -602,11 +603,11 @@ CREATE TABLE `SS13_connection_log` ( `ckey` varchar(32) NOT NULL, `ip` varchar(32) NOT NULL, `computerid` varchar(32) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`), + KEY `ip` (`ip`), + KEY `computerid` (`computerid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `SS13_connection_log` ADD INDEX(`ckey`); -ALTER TABLE `SS13_connection_log` ADD INDEX(`ip`); -ALTER TABLE `SS13_connection_log` ADD INDEX(`computerid`); -- -- Table structure for table `SS13_changelog` @@ -630,7 +631,7 @@ CREATE TABLE `SS13_ip2group` ( `ip` varchar (18) NOT NULL, `date` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL, `groupstr` varchar (32) NOT NULL DEFAULT '', - PRIMARY KEY (`ip`) + PRIMARY KEY (`ip`), + KEY `groupstr` (`groupstr`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -ALTER TABLE `SS13_ip2group` ADD INDEX(`groupstr`);