From 63412043ee3de63460763776fe2d454a660cd932 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun, 25 Jul 2021 15:51:47 +0100 Subject: [PATCH] Fixes an SQL error from maximum name length (#16305) * Reduces maximum name length * Revert "Reduces maximum name length" This reverts commit 7d0fe75c54b58089ef214984d52cff209a781ad2. * why were these in _compile_options.dm * SQL Stuff --- SQL/paradise_schema.sql | 2 +- SQL/paradise_schema_prefixed.sql | 2 +- SQL/updates/24-25.sql | 4 ++++ code/__DEFINES/misc.dm | 2 +- code/__DEFINES/text.dm | 6 ++++++ code/_compile_options.dm | 7 ------- config/example/config.toml | 2 +- paradise.dme | 1 + 8 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 SQL/updates/24-25.sql create mode 100644 code/__DEFINES/text.dm diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index f73134e6704..b6030beea09 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -24,7 +24,7 @@ CREATE TABLE `characters` ( `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `slot` int(2) NOT NULL, `OOC_Notes` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `real_name` varchar(45) COLLATE utf8mb4_unicode_ci NOT NULL, + `real_name` varchar(55) COLLATE utf8mb4_unicode_ci NOT NULL, `name_is_always_random` tinyint(1) NOT NULL, `gender` varchar(11) COLLATE utf8mb4_unicode_ci NOT NULL, `age` smallint(4) NOT NULL, diff --git a/SQL/paradise_schema_prefixed.sql b/SQL/paradise_schema_prefixed.sql index 16ea512fb08..345711e357e 100644 --- a/SQL/paradise_schema_prefixed.sql +++ b/SQL/paradise_schema_prefixed.sql @@ -24,7 +24,7 @@ CREATE TABLE `SS13_characters` ( `ckey` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL, `slot` int(2) NOT NULL, `OOC_Notes` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `real_name` varchar(45) COLLATE utf8mb4_unicode_ci NOT NULL, + `real_name` varchar(55) COLLATE utf8mb4_unicode_ci NOT NULL, `name_is_always_random` tinyint(1) NOT NULL, `gender` varchar(11) COLLATE utf8mb4_unicode_ci NOT NULL, `age` smallint(4) NOT NULL, diff --git a/SQL/updates/24-25.sql b/SQL/updates/24-25.sql new file mode 100644 index 00000000000..267dc013087 --- /dev/null +++ b/SQL/updates/24-25.sql @@ -0,0 +1,4 @@ +# Updates the DB from 24 to 25 -SabreML +# Increases the maximum length of `real_name` from 45 to 55 in the `characters` table. + +ALTER TABLE `characters` MODIFY COLUMN `real_name` varchar(55) COLLATE utf8mb4_unicode_ci NOT NULL diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 65777da80cb..884ac634f6d 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -363,7 +363,7 @@ #define INVESTIGATE_BOMB "bombs" // The SQL version required by this version of the code -#define SQL_VERSION 24 +#define SQL_VERSION 25 // Vending machine stuff #define CAT_NORMAL 1 diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm new file mode 100644 index 00000000000..483f09f47ca --- /dev/null +++ b/code/__DEFINES/text.dm @@ -0,0 +1,6 @@ +//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam +#define MAX_MESSAGE_LEN 1024 +#define MAX_PAPER_MESSAGE_LEN 3072 +#define MAX_PAPER_FIELDS 50 +#define MAX_BOOK_MESSAGE_LEN 9216 +#define MAX_NAME_LEN 50 //diona names can get loooooooong diff --git a/code/_compile_options.dm b/code/_compile_options.dm index f409af92aaa..0e73437dd93 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -21,13 +21,6 @@ #define IS_MODE_COMPILED(MODE) (ispath(text2path("/datum/game_mode/"+(MODE)))) -//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam -#define MAX_MESSAGE_LEN 1024 -#define MAX_PAPER_MESSAGE_LEN 3072 -#define MAX_PAPER_FIELDS 50 -#define MAX_BOOK_MESSAGE_LEN 9216 -#define MAX_NAME_LEN 50 //diona names can get loooooooong - //Update this whenever you need to take advantage of more recent byond features #define MIN_COMPILER_VERSION 513 #define MIN_COMPILER_BUILD 1514 diff --git a/config/example/config.toml b/config/example/config.toml index 80e768d1d37..59a752a2b45 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -140,7 +140,7 @@ ipc_screens = [ # Enable/disable the database on a whole sql_enabled = false # SQL version. If this is a mismatch, round start will be delayed -sql_version = 24 +sql_version = 25 # SQL server address. Can be an IP or DNS name sql_address = "127.0.0.1" # SQL server port diff --git a/paradise.dme b/paradise.dme index 02f5c19c020..aae3f21d5a3 100644 --- a/paradise.dme +++ b/paradise.dme @@ -82,6 +82,7 @@ #include "code\__DEFINES\station_goals.dm" #include "code\__DEFINES\status_effects.dm" #include "code\__DEFINES\subsystems.dm" +#include "code\__DEFINES\text.dm" #include "code\__DEFINES\tgs.dm" #include "code\__DEFINES\tgui.dm" #include "code\__DEFINES\tools.dm"