From 512fe7df0ab89ce553a00a6cfacee632f0b76926 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sun, 25 Apr 2021 20:19:35 +0000
Subject: [PATCH] chore(DB): import pending SQL update file

Referenced commit(s): f4c226423dc0811efccf8135b46bc7ff46aab940
---
 .../2021_04_25_00.sql}                        | 25 +++++++++++++++++
 data/sql/updates/db_world/2021_04_25_15.sql   | 28 +++++++++++++++++++
 .../rev_1618042584624619500.sql               |  3 --
 3 files changed, 53 insertions(+), 3 deletions(-)
 rename data/sql/updates/{pending_db_characters/rev_1617907126348389400.sql => db_characters/2021_04_25_00.sql} (63%)
 create mode 100644 data/sql/updates/db_world/2021_04_25_15.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1618042584624619500.sql

diff --git a/data/sql/updates/pending_db_characters/rev_1617907126348389400.sql b/data/sql/updates/db_characters/2021_04_25_00.sql
similarity index 63%
rename from data/sql/updates/pending_db_characters/rev_1617907126348389400.sql
rename to data/sql/updates/db_characters/2021_04_25_00.sql
index f6a6e040d..43972d2d6 100644
--- a/data/sql/updates/pending_db_characters/rev_1617907126348389400.sql
+++ b/data/sql/updates/db_characters/2021_04_25_00.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_03_28_00 -> 2021_04_25_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_characters' AND COLUMN_NAME = '2021_03_28_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_characters CHANGE COLUMN 2021_03_28_00 2021_04_25_00 bit;
+SELECT sql_rev INTO OK FROM version_db_characters WHERE sql_rev = '1617907126348389400'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_characters` (`sql_rev`) VALUES ('1617907126348389400');
 
 -- Keep only the highest guid PvE or PvP (not bones) corpse per player guid
@@ -27,3 +43,12 @@ ALTER TABLE `groups` CHANGE `icon5` `icon5` BIGINT UNSIGNED NOT NULL;
 ALTER TABLE `groups` CHANGE `icon6` `icon6` BIGINT UNSIGNED NOT NULL;
 ALTER TABLE `groups` CHANGE `icon7` `icon7` BIGINT UNSIGNED NOT NULL;
 ALTER TABLE `groups` CHANGE `icon8` `icon8` BIGINT UNSIGNED NOT NULL;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_04_25_15.sql b/data/sql/updates/db_world/2021_04_25_15.sql
new file mode 100644
index 000000000..e88349c5c
--- /dev/null
+++ b/data/sql/updates/db_world/2021_04_25_15.sql
@@ -0,0 +1,28 @@
+-- DB update 2021_04_25_14 -> 2021_04_25_15
+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 = '2021_04_25_14';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_04_25_14 2021_04_25_15 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1618042584624619500'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1618042584624619500');
+
+UPDATE `acore_string` SET `content_default` = 'Object GUID is: %s' WHERE `entry`=201;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1618042584624619500.sql b/data/sql/updates/pending_db_world/rev_1618042584624619500.sql
deleted file mode 100644
index d78b082b5..000000000
--- a/data/sql/updates/pending_db_world/rev_1618042584624619500.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1618042584624619500');
-
-UPDATE `acore_string` SET `content_default` = 'Object GUID is: %s' WHERE `entry`=201;