From 2ff3c626712cb6be8703b51dae7130f9850809d2 Mon Sep 17 00:00:00 2001 From: Epicus Date: Mon, 17 Aug 2020 12:23:04 +0300 Subject: [PATCH] fix(db): some fixes for latest MySQL compatibility (#9668) --- SQL/migrate/V045__underwear_updates.sql | 4 ++-- code/modules/admin/admin_ranks.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SQL/migrate/V045__underwear_updates.sql b/SQL/migrate/V045__underwear_updates.sql index 6651b2da420..5b7f6074295 100644 --- a/SQL/migrate/V045__underwear_updates.sql +++ b/SQL/migrate/V045__underwear_updates.sql @@ -4,8 +4,8 @@ -- ALTER TABLE `ss13_characters` - ADD COLUMN `all_underwear` JSON NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `eyes_colour`, + ADD COLUMN `all_underwear` JSON NULL DEFAULT NULL AFTER `eyes_colour`, DROP COLUMN `underwear`, DROP COLUMN `undershirt`, DROP COLUMN `socks`, - ADD COLUMN `all_underwear_metadata` JSON NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `all_underwear`; + ADD COLUMN `all_underwear_metadata` JSON NULL DEFAULT NULL AFTER `all_underwear`; diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 97717d619ac..e452eda4daa 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -120,7 +120,7 @@ var/list/forum_groupids_to_ranks = list() load_admins() return - var/DBQuery/query = dbcon.NewQuery("SELECT ckey, rank, flags FROM ss13_admins;") + var/DBQuery/query = dbcon.NewQuery("SELECT ckey, `rank`, flags FROM ss13_admins;") query.Execute() while(query.NextRow()) var/ckey = query.item[1]