From dd52f3a487583c0ce7ec717c3cda1cc1f10e3aab Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Tue, 12 Oct 2021 20:29:19 +0100
Subject: [PATCH] Deconflict

---
 SQL/updates/26-27.sql      | 11 +++++++++++
 code/__DEFINES/misc.dm     |  2 +-
 config/example/config.toml |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 SQL/updates/26-27.sql

diff --git a/SQL/updates/26-27.sql b/SQL/updates/26-27.sql
new file mode 100644
index 00000000000..8b1291a99ba
--- /dev/null
+++ b/SQL/updates/26-27.sql
@@ -0,0 +1,11 @@
+# Updates DB from 26 to 27 -AffectedArc07
+# Adds a new table for instance data caching, and server_id fields on other tables
+
+CREATE TABLE `instance_data_cache` (
+	`server_id` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`key_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`key_value` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`last_updated` TIMESTAMP NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+	PRIMARY KEY (`server_id`, `key_name`) USING HASH
+) COLLATE='utf8mb4_general_ci' ENGINE=MEMORY;
+
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index e16635d1c07..c6b7e9ac430 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -365,7 +365,7 @@
 #define INVESTIGATE_BOMB "bombs"
 
 // The SQL version required by this version of the code
-#define SQL_VERSION 26
+#define SQL_VERSION 27
 
 // Vending machine stuff
 #define CAT_NORMAL 1
diff --git a/config/example/config.toml b/config/example/config.toml
index 1c269333da9..a929c964de5 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -142,7 +142,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 = 26
+sql_version = 27
 # SQL server address. Can be an IP or DNS name
 sql_address = "127.0.0.1"
 # SQL server port