From cf4c7f5a5f9155c1d7681e5f9a42a46c708d6269 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Mon, 3 Jan 2022 18:50:26 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): 9df725e2655ca9ab7db7608dfb0c6a57a42c887e
---
 data/sql/updates/db_world/2022_01_03_15.sql   | 29 +++++++++++++++++++
 data/sql/updates/db_world/2022_01_03_16.sql   | 29 +++++++++++++++++++
 .../rev_1640238214916352424.sql               |  3 --
 .../rev_1640581442120591362.sql               |  3 --
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 data/sql/updates/db_world/2022_01_03_15.sql
 create mode 100644 data/sql/updates/db_world/2022_01_03_16.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1640238214916352424.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1640581442120591362.sql

diff --git a/data/sql/updates/db_world/2022_01_03_15.sql b/data/sql/updates/db_world/2022_01_03_15.sql
new file mode 100644
index 000000000..d13851a9e
--- /dev/null
+++ b/data/sql/updates/db_world/2022_01_03_15.sql
@@ -0,0 +1,29 @@
+-- DB update 2022_01_03_14 -> 2022_01_03_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 = '2022_01_03_14';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2022_01_03_14 2022_01_03_15 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1640238214916352424'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1640238214916352424');
+
+DELETE FROM `creature_loot_template` WHERE `Item` = 4305;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2022_01_03_15' WHERE sql_rev = '1640238214916352424';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2022_01_03_16.sql b/data/sql/updates/db_world/2022_01_03_16.sql
new file mode 100644
index 000000000..ad8525dcd
--- /dev/null
+++ b/data/sql/updates/db_world/2022_01_03_16.sql
@@ -0,0 +1,29 @@
+-- DB update 2022_01_03_15 -> 2022_01_03_16
+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 = '2022_01_03_15';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2022_01_03_15 2022_01_03_16 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1640581442120591362'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1640581442120591362');
+
+UPDATE `command` SET `name`='lookup item set' WHERE `name`='lookup itemset';
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2022_01_03_16' WHERE sql_rev = '1640581442120591362';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1640238214916352424.sql b/data/sql/updates/pending_db_world/rev_1640238214916352424.sql
deleted file mode 100644
index d3b78ba8b..000000000
--- a/data/sql/updates/pending_db_world/rev_1640238214916352424.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1640238214916352424');
-
-DELETE FROM `creature_loot_template` WHERE `Item` = 4305;
diff --git a/data/sql/updates/pending_db_world/rev_1640581442120591362.sql b/data/sql/updates/pending_db_world/rev_1640581442120591362.sql
deleted file mode 100644
index 49a1e241d..000000000
--- a/data/sql/updates/pending_db_world/rev_1640581442120591362.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1640581442120591362');
-
-UPDATE `command` SET `name`='lookup item set' WHERE `name`='lookup itemset';