From 2cb5e437fd65200eefe9a39f418d94da6a14c167 Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 18 Dec 2018 16:02:25 +0000 Subject: [PATCH] Switch default MySQL/MariaDB charset from utf8 to utf8mb4 https://medium.com/@adamhooper/in-mysql-never-use-utf8-use-utf8mb4-11761243e434 Relates to #1337 --- .../resources/me/lucko/luckperms/schema/mariadb.sql | 12 ++++++------ .../resources/me/lucko/luckperms/schema/mysql.sql | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/src/main/resources/me/lucko/luckperms/schema/mariadb.sql b/common/src/main/resources/me/lucko/luckperms/schema/mariadb.sql index 61206287..a4a65c43 100644 --- a/common/src/main/resources/me/lucko/luckperms/schema/mariadb.sql +++ b/common/src/main/resources/me/lucko/luckperms/schema/mariadb.sql @@ -10,7 +10,7 @@ CREATE TABLE `{prefix}user_permissions` ( `expiry` INT(11) NOT NULL, `contexts` VARCHAR(200) NOT NULL, PRIMARY KEY (`id`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE INDEX `{prefix}user_permissions_uuid` ON `{prefix}user_permissions` (`uuid`); CREATE INDEX `{prefix}user_permissions_permission` ON `{prefix}user_permissions` (`permission`); @@ -24,7 +24,7 @@ CREATE TABLE `{prefix}group_permissions` ( `expiry` INT(11) NOT NULL, `contexts` VARCHAR(200) NOT NULL, PRIMARY KEY (`id`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE INDEX `{prefix}group_permissions_name` ON `{prefix}group_permissions` (`name`); CREATE INDEX `{prefix}group_permissions_permission` ON `{prefix}group_permissions` (`permission`); @@ -33,13 +33,13 @@ CREATE TABLE `{prefix}players` ( `username` VARCHAR(16) NOT NULL, `primary_group` VARCHAR(36) NOT NULL, PRIMARY KEY (`uuid`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE INDEX `{prefix}players_username` ON `{prefix}players` (`username`); CREATE TABLE `{prefix}groups` ( `name` VARCHAR(36) NOT NULL, PRIMARY KEY (`name`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE TABLE `{prefix}actions` ( `id` INT AUTO_INCREMENT NOT NULL, @@ -51,10 +51,10 @@ CREATE TABLE `{prefix}actions` ( `acted_name` VARCHAR(36) NOT NULL, `action` VARCHAR(300) NOT NULL, PRIMARY KEY (`id`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE TABLE `{prefix}tracks` ( `name` VARCHAR(36) NOT NULL, `groups` TEXT NOT NULL, PRIMARY KEY (`name`) -) DEFAULT CHARSET = utf8; \ No newline at end of file +) DEFAULT CHARSET = utf8mb4; \ No newline at end of file diff --git a/common/src/main/resources/me/lucko/luckperms/schema/mysql.sql b/common/src/main/resources/me/lucko/luckperms/schema/mysql.sql index 5bc22b05..27a438ca 100644 --- a/common/src/main/resources/me/lucko/luckperms/schema/mysql.sql +++ b/common/src/main/resources/me/lucko/luckperms/schema/mysql.sql @@ -10,7 +10,7 @@ CREATE TABLE `{prefix}user_permissions` ( `expiry` INT(11) NOT NULL, `contexts` VARCHAR(200) NOT NULL, PRIMARY KEY (`id`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE INDEX `{prefix}user_permissions_uuid` ON `{prefix}user_permissions` (`uuid`); CREATE INDEX `{prefix}user_permissions_permission` ON `{prefix}user_permissions` (`permission`); @@ -24,7 +24,7 @@ CREATE TABLE `{prefix}group_permissions` ( `expiry` INT(11) NOT NULL, `contexts` VARCHAR(200) NOT NULL, PRIMARY KEY (`id`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE INDEX `{prefix}group_permissions_name` ON `{prefix}group_permissions` (`name`); CREATE INDEX `{prefix}group_permissions_permission` ON `{prefix}group_permissions` (`permission`); @@ -33,13 +33,13 @@ CREATE TABLE `{prefix}players` ( `username` VARCHAR(16) NOT NULL, `primary_group` VARCHAR(36) NOT NULL, PRIMARY KEY (`uuid`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE INDEX `{prefix}players_username` ON `{prefix}players` (`username`); CREATE TABLE `{prefix}groups` ( `name` VARCHAR(36) NOT NULL, PRIMARY KEY (`name`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE TABLE `{prefix}actions` ( `id` INT AUTO_INCREMENT NOT NULL, @@ -51,10 +51,10 @@ CREATE TABLE `{prefix}actions` ( `acted_name` VARCHAR(36) NOT NULL, `action` VARCHAR(300) NOT NULL, PRIMARY KEY (`id`) -) DEFAULT CHARSET = utf8; +) DEFAULT CHARSET = utf8mb4; CREATE TABLE `{prefix}tracks` ( `name` VARCHAR(36) NOT NULL, `groups` TEXT NOT NULL, PRIMARY KEY (`name`) -) DEFAULT CHARSET = utf8; \ No newline at end of file +) DEFAULT CHARSET = utf8mb4; \ No newline at end of file