From 5b9bf1ea4413859d5a2f3d5f7d7d7915045ab7ea Mon Sep 17 00:00:00 2001
From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Date: Wed, 25 Aug 2021 23:50:47 -0400
Subject: [PATCH] Adds `discord_reported` column to the `ban` table (#7721)

---
 SQL/database_changelog.txt | 22 +++++++++++++---------
 SQL/tgstation_schema.sql   |  1 +
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt
index 4e22067444b..6f39925d5d5 100644
--- a/SQL/database_changelog.txt
+++ b/SQL/database_changelog.txt
@@ -1,18 +1,23 @@
 Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
 
-The latest database version is 5.16; The query to update the schema revision table is:
+The latest database version is 5.18 (5.16 for /tg/); The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 16);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 18);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 16);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 18);
 
 In any query remember to add a prefix to the table names if you use one.
 
 -----------------------------------------------------
-<<<<<<< HEAD
-Version 5.16, 2 June 2021, by Mothblocks
-=======
-Version 5.16, 31 July 2021, by Atlanta-Ned
+Version 5.18, 23 August 2021, by GoldenAlpharex
+Added `discord_report` column to the `ban table`
+
+```
+`discord_reported` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', /* SKYRAT EDIT - Labelling bans for ease of reporting them over Discord. */
+```
+
+-----------------------------------------------------
+Version 5.17, 31 July 2021, by Atlanta-Ned
 Added `library_action` table for tracking reported library books and actions taken on them.
 
 ```
@@ -31,8 +36,7 @@ CREATE TABLE `library_action` (
 
 
 -----------------------------------------------------
-Version 5.15, 2 June 2021, by Mothblocks
->>>>>>> ec2189370df (Adds the library_report table (#60599))
+Version 5.16, 2 June 2021, by Mothblocks
 Added verified admin connection log used for 2FA
 
 ```
diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql
index 05beadeff8e..7bb43bc5b71 100644
--- a/SQL/tgstation_schema.sql
+++ b/SQL/tgstation_schema.sql
@@ -93,6 +93,7 @@ CREATE TABLE `ban` (
   `unbanned_ip` INT(10) UNSIGNED NULL DEFAULT NULL,
   `unbanned_computerid` VARCHAR(32) NULL DEFAULT NULL,
   `unbanned_round_id` INT(11) UNSIGNED NULL DEFAULT NULL,
+  `discord_reported` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', /* SKYRAT EDIT - Labelling bans for ease of reporting them over Discord. */
   PRIMARY KEY (`id`),
   KEY `idx_ban_isbanned` (`ckey`,`role`,`unbanned_datetime`,`expiration_time`),
   KEY `idx_ban_isbanned_details` (`ckey`,`ip`,`computerid`,`role`,`unbanned_datetime`,`expiration_time`),