From 9f334c8c0af1cfda84b3a96cfe331a50c62f4c5b Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Sat, 6 Nov 2021 12:02:51 -0300
Subject: [PATCH] chore(DB): Fix SQL imports/database revision (#8999)

---
 data/sql/updates/db_world/2021_11_06_00.sql   | 29 -------------------
 .../rev_1635951187866923861.sql               |  0
 .../rev_1636206187676193400.sql               |  4 +++
 .../rev_1636206943540376100.sql               |  3 ++
 4 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 data/sql/updates/db_world/2021_11_06_00.sql
 rename data/sql/updates/{db_world => pending_db_world}/rev_1635951187866923861.sql (100%)
 create mode 100644 data/sql/updates/pending_db_world/rev_1636206187676193400.sql
 create mode 100644 data/sql/updates/pending_db_world/rev_1636206943540376100.sql

diff --git a/data/sql/updates/db_world/2021_11_06_00.sql b/data/sql/updates/db_world/2021_11_06_00.sql
deleted file mode 100644
index 873fcaf55..000000000
--- a/data/sql/updates/db_world/2021_11_06_00.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- DB update rev_1635951187866923861.sql_rev_1635951187866923861 -> 2021_11_06_00
-DROP PROCEDURE IF EXISTS `updateDb`;
-DELIMITER //
-CREATE PROCEDURE updateDb ()
-proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
-SELECT COUNT(*) INTO @COLEXISTS
-FROM information_schema.COLUMNS
-WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = 'rev_1635951187866923861.sql_rev_1635951187866923861';
-IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
-START TRANSACTION;
-ALTER TABLE version_db_world CHANGE COLUMN rev_1635951187866923861.sql_rev_1635951187866923861 2021_11_06_00 bit;
-SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1635587662323293700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
---
--- START UPDATING QUERIES
---
-
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1635587662323293700');
-
-ALTER TABLE `updates` CHANGE `state` `state` ENUM('RELEASED','CUSTOM','MODULE','ARCHIVED') CHARSET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'RELEASED' NOT NULL COMMENT 'defines if an update is released or archived.';
-
---
--- END UPDATING QUERIES
---
-UPDATE version_db_world SET date = '2021_11_06_00' WHERE sql_rev = '1635587662323293700';
-COMMIT;
-END //
-DELIMITER ;
-CALL updateDb();
-DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/rev_1635951187866923861.sql b/data/sql/updates/pending_db_world/rev_1635951187866923861.sql
similarity index 100%
rename from data/sql/updates/db_world/rev_1635951187866923861.sql
rename to data/sql/updates/pending_db_world/rev_1635951187866923861.sql
diff --git a/data/sql/updates/pending_db_world/rev_1636206187676193400.sql b/data/sql/updates/pending_db_world/rev_1636206187676193400.sql
new file mode 100644
index 000000000..69a6c52cb
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1636206187676193400.sql
@@ -0,0 +1,4 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1636206187676193400');
+
+-- Fix equipment for Southsea Swashbuckler
+UPDATE `creature_equip_template` SET `ItemID1`=1897, `ItemID2`=0 WHERE `CreatureID`=7858;
diff --git a/data/sql/updates/pending_db_world/rev_1636206943540376100.sql b/data/sql/updates/pending_db_world/rev_1636206943540376100.sql
new file mode 100644
index 000000000..6a126269d
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1636206943540376100.sql
@@ -0,0 +1,3 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1636206943540376100');
+
+ALTER TABLE `updates` CHANGE `state` `state` ENUM('RELEASED','CUSTOM','MODULE','ARCHIVED') CHARSET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'RELEASED' NOT NULL COMMENT 'defines if an update is released or archived.';