From 19ad30227ca4727d416b0dda097323cb6fc87f2b Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 24 Oct 2020 21:15:34 -0700 Subject: [PATCH] sync tables ban, admin_log --- SQL/paradise_schema.sql | 44 ++++++++++++++++---------------- SQL/paradise_schema_prefixed.sql | 44 ++++++++++++++++---------------- SQL/updates/13-14.sql | 25 ++++++++++++++++-- 3 files changed, 67 insertions(+), 46 deletions(-) diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index 1da10183654..8c055d29125 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -177,9 +177,9 @@ DROP TABLE IF EXISTS `admin_log`; CREATE TABLE `admin_log` ( `id` int(11) NOT NULL AUTO_INCREMENT, `datetime` datetime NOT NULL, - `adminckey` varchar(32) NOT NULL, - `adminip` varchar(18) NOT NULL, - `log` text NOT NULL, + `adminckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `adminip` varchar(18) COLLATE utf8mb4_unicode_ci NOT NULL, + `log` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`id`), KEY `adminckey` (`adminckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -195,32 +195,32 @@ DROP TABLE IF EXISTS `ban`; CREATE TABLE `ban` ( `id` int(11) NOT NULL AUTO_INCREMENT, `bantime` datetime NOT NULL, - `serverip` varchar(32) NOT NULL, - `bantype` varchar(32) NOT NULL, - `reason` text NOT NULL, - `job` varchar(32) DEFAULT NULL, + `serverip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `bantype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `reason` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, + `job` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `duration` int(11) NOT NULL, `rounds` int(11) DEFAULT NULL, `expiration_time` datetime NOT NULL, - `ckey` varchar(32) NOT NULL, - `computerid` varchar(32) NOT NULL, - `ip` varchar(32) NOT NULL, - `a_ckey` varchar(32) NOT NULL, - `a_computerid` varchar(32) NOT NULL, - `a_ip` varchar(32) NOT NULL, - `who` text NOT NULL, - `adminwho` text NOT NULL, - `edits` text, + `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `computerid` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `ip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `a_ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `a_computerid` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `a_ip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `who` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, + `adminwho` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, + `edits` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned` tinyint(1) DEFAULT NULL, `unbanned_datetime` datetime DEFAULT NULL, - `unbanned_ckey` varchar(32) DEFAULT NULL, - `unbanned_computerid` varchar(32) DEFAULT NULL, - `unbanned_ip` varchar(32) DEFAULT NULL, + `unbanned_ckey` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `unbanned_computerid` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `unbanned_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), KEY `ckey` (`ckey`), KEY `computerid` (`computerid`), KEY `ip` (`ip`) -) ENGINE=InnoDB AUTO_INCREMENT=10685 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=58903 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -631,9 +631,9 @@ CREATE TABLE `changelog` ( -- DROP TABLE IF EXISTS `ip2group`; CREATE TABLE `ip2group` ( - `ip` varchar (18) NOT NULL, + `ip` varchar (18) COLLATE utf8mb4_unicode_ci NOT NULL, `date` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL, - `groupstr` varchar (32) NOT NULL DEFAULT '', + `groupstr` varchar (32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', PRIMARY KEY (`ip`), KEY `groupstr` (`groupstr`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/SQL/paradise_schema_prefixed.sql b/SQL/paradise_schema_prefixed.sql index 880ceb99a10..19f21fd7d6b 100644 --- a/SQL/paradise_schema_prefixed.sql +++ b/SQL/paradise_schema_prefixed.sql @@ -176,9 +176,9 @@ DROP TABLE IF EXISTS `SS13_admin_log`; CREATE TABLE `SS13_admin_log` ( `id` int(11) NOT NULL AUTO_INCREMENT, `datetime` datetime NOT NULL, - `adminckey` varchar(32) NOT NULL, - `adminip` varchar(18) NOT NULL, - `log` text NOT NULL, + `adminckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `adminip` varchar(18) COLLATE utf8mb4_unicode_ci NOT NULL, + `log` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, PRIMARY KEY (`id`), KEY `adminckey` (`adminckey`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -194,32 +194,32 @@ DROP TABLE IF EXISTS `SS13_ban`; CREATE TABLE `SS13_ban` ( `id` int(11) NOT NULL AUTO_INCREMENT, `bantime` datetime NOT NULL, - `serverip` varchar(32) NOT NULL, - `bantype` varchar(32) NOT NULL, - `reason` text NOT NULL, - `job` varchar(32) DEFAULT NULL, + `serverip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `bantype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `reason` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, + `job` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `duration` int(11) NOT NULL, `rounds` int(11) DEFAULT NULL, `expiration_time` datetime NOT NULL, - `ckey` varchar(32) NOT NULL, - `computerid` varchar(32) NOT NULL, - `ip` varchar(32) NOT NULL, - `a_ckey` varchar(32) NOT NULL, - `a_computerid` varchar(32) NOT NULL, - `a_ip` varchar(32) NOT NULL, - `who` text NOT NULL, - `adminwho` text NOT NULL, - `edits` text, + `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `computerid` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `ip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `a_ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `a_computerid` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `a_ip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, + `who` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, + `adminwho` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL, + `edits` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `unbanned` tinyint(1) DEFAULT NULL, `unbanned_datetime` datetime DEFAULT NULL, - `unbanned_ckey` varchar(32) DEFAULT NULL, - `unbanned_computerid` varchar(32) DEFAULT NULL, - `unbanned_ip` varchar(32) DEFAULT NULL, + `unbanned_ckey` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `unbanned_computerid` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `unbanned_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), KEY `ckey` (`ckey`), KEY `computerid` (`computerid`), KEY `ip` (`ip`) -) ENGINE=InnoDB AUTO_INCREMENT=10685 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=58903 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -628,9 +628,9 @@ CREATE TABLE `SS13_changelog` ( -- DROP TABLE IF EXISTS `SS13_ip2group`; CREATE TABLE `SS13_ip2group` ( - `ip` varchar (18) NOT NULL, + `ip` varchar (18) COLLATE utf8mb4_unicode_ci NOT NULL, `date` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL, - `groupstr` varchar (32) NOT NULL DEFAULT '', + `groupstr` varchar (32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', PRIMARY KEY (`ip`), KEY `groupstr` (`groupstr`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/SQL/updates/13-14.sql b/SQL/updates/13-14.sql index c3025196d62..3fdaf7b7cd6 100644 --- a/SQL/updates/13-14.sql +++ b/SQL/updates/13-14.sql @@ -4,9 +4,9 @@ # Add new tables used by backend tooling CREATE TABLE `ip2group` ( - `ip` varchar (18) NOT NULL, + `ip` varchar (18) COLLATE utf8mb4_unicode_ci NOT NULL, `date` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL, - `groupstr` varchar (32) NOT NULL DEFAULT '', + `groupstr` varchar (32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', PRIMARY KEY (`ip`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ALTER TABLE `ip2group` ADD INDEX(`groupstr`); @@ -45,8 +45,29 @@ ALTER TABLE `player` ADD COLUMN `byond_date` DATE; # We (Paradise) do NOT need to run any of these. # They are included here only for the convenience of github contributors, and downstream servers. + +ALTER TABLE `admin_log` CHANGE COLUMN `adminckey` `adminckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `admin_log` CHANGE COLUMN `adminip` `adminip` varchar(18) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `admin_log` CHANGE COLUMN `log` `log` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL; + ALTER TABLE `characters` ADD INDEX(`ckey`); +ALTER TABLE `ban` CHANGE COLUMN `serverip` `serverip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `bantype` `bantype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `reason` `reason` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `job` `job` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL; +ALTER TABLE `ban` CHANGE COLUMN `ckey` `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `computerid` `computerid` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `ip` `ip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `a_ckey` `a_ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `a_computerid` `a_computerid` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `a_ip` `a_ip` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `who` `who` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `adminwho` `adminwho` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL; +ALTER TABLE `ban` CHANGE COLUMN `edits` `edits` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL; +ALTER TABLE `ban` CHANGE COLUMN `unbanned_ckey` `unbanned_ckey` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL; +ALTER TABLE `ban` CHANGE COLUMN `unbanned_computerid` `unbanned_computerid` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL; +ALTER TABLE `ban` CHANGE COLUMN `unbanned_ip` `unbanned_ip` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL; ALTER TABLE `ban` ADD INDEX(`ckey`); ALTER TABLE `ban` ADD INDEX(`computerid`); ALTER TABLE `ban` ADD INDEX(`ip`);