Merge remote-tracking branch 'upstream/master'

OctusGit · Oct 2, 2023 · 6b97b36 · 6b97b36
2 parents 987be14 + 9d0c74b
commit 6b97b36
Show file tree

Hide file tree

Showing 213 changed files with 5,901 additions and 2,999 deletions.
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
@@ -474,7 +474,17 @@ CREATE TABLE `playtime_history` (
   `ckey` varchar(32) NOT NULL,
   `date` DATE NOT NULL,
   `time_living` SMALLINT NOT NULL,
+  `time_crew` SMALLINT NOT NULL,
+  `time_special` SMALLINT NOT NULL,
   `time_ghost` SMALLINT NOT NULL,
+  `time_command` SMALLINT NOT NULL,
+  `time_engineering` SMALLINT NOT NULL,
+  `time_medical` SMALLINT NOT NULL,
+  `time_science` SMALLINT NOT NULL,
+  `time_supply` SMALLINT NOT NULL,
+  `time_security` SMALLINT NOT NULL,
+  `time_silicon` SMALLINT NOT NULL,
+  `time_service` SMALLINT NOT NULL,
   PRIMARY KEY (`ckey`, `date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 

diff --git a/SQL/updates/51-52.sql b/SQL/updates/51-52.sql
@@ -0,0 +1,13 @@
+# Updating SQL from 51 to 52 -AffectedArc07
+# Adding all department columns to playtime_history
+ALTER TABLE `playtime_history`
+	ADD COLUMN `time_crew` SMALLINT NOT NULL AFTER `time_living`,
+	ADD COLUMN `time_special` SMALLINT NOT NULL AFTER `time_crew`,
+	ADD COLUMN `time_command` SMALLINT NOT NULL AFTER `time_ghost`,
+	ADD COLUMN `time_engineering` SMALLINT NOT NULL AFTER `time_command`,
+	ADD COLUMN `time_medical` SMALLINT NOT NULL AFTER `time_engineering`,
+	ADD COLUMN `time_science` SMALLINT NOT NULL AFTER `time_medical`,
+	ADD COLUMN `time_supply` SMALLINT NOT NULL AFTER `time_science`,
+	ADD COLUMN `time_security` SMALLINT NOT NULL AFTER `time_supply`,
+	ADD COLUMN `time_silicon` SMALLINT NOT NULL AFTER `time_security`,
+	ADD COLUMN `time_service` SMALLINT NOT NULL AFTER `time_silicon`;