From b556041ed4f08a3ddcdf4c47cc69a5c43922c467 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Mon, 18 May 2020 19:14:33 +0000
Subject: [PATCH] Import pending SQL update file...

Referenced commit(s): 7f3945e13ed872204ca71b44a7dce02c8648a557
---
 data/sql/updates/db_world/2020_05_18_01.sql   | 33 +++++++++++++++++++
 .../rev_1587062218041221300.sql               |  8 -----
 2 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 data/sql/updates/db_world/2020_05_18_01.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1587062218041221300.sql

diff --git a/data/sql/updates/db_world/2020_05_18_01.sql b/data/sql/updates/db_world/2020_05_18_01.sql
new file mode 100644
index 000000000..1a1a5fefa
--- /dev/null
+++ b/data/sql/updates/db_world/2020_05_18_01.sql
@@ -0,0 +1,33 @@
+-- DB update 2020_05_18_00 -> 2020_05_18_01
+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 = '2020_05_18_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2020_05_18_00 2020_05_18_01 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1587062218041221300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1587062218041221300');
+
+DELETE FROM `acore_string` WHERE `entry` IN (30081,30082);
+INSERT INTO `acore_string` (`entry`, `content_default`) VALUES
+(30081, "%s does not have itemID = %i, thus cannot be removed."),
+(30082, "%s does not have that many of itemID = %i, thus none were removed.");
+
+UPDATE `command` SET `help` = "Syntax: .additem #itemID/[#itemName]/#itemLink #itemCount\r\nAdds the specified item to you or the selected character.\nIf #itemCount is negative, you will remove #itemID." WHERE `name` = "additem";
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1587062218041221300.sql b/data/sql/updates/pending_db_world/rev_1587062218041221300.sql
deleted file mode 100644
index 2331c68be..000000000
--- a/data/sql/updates/pending_db_world/rev_1587062218041221300.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1587062218041221300');
-
-DELETE FROM `acore_string` WHERE `entry` IN (30081,30082);
-INSERT INTO `acore_string` (`entry`, `content_default`) VALUES
-(30081, "%s does not have itemID = %i, thus cannot be removed."),
-(30082, "%s does not have that many of itemID = %i, thus none were removed.");
-
-UPDATE `command` SET `help` = "Syntax: .additem #itemID/[#itemName]/#itemLink #itemCount\r\nAdds the specified item to you or the selected character.\nIf #itemCount is negative, you will remove #itemID." WHERE `name` = "additem";