From 6cac3f881f9e97b66a83239011f2a389a1680d4c Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Tue, 22 Oct 2019 06:23:18 +0000
Subject: [PATCH] Import pending SQL update file...

Referenced commit(s): d4cf4c1fd9ff1d000aaec93fe494845690013d47
---
 data/sql/updates/db_world/2019_10_22_00.sql   | 31 +++++++++++++++++++
 .../rev_1570916858306186295.sql               |  6 ----
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 data/sql/updates/db_world/2019_10_22_00.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1570916858306186295.sql

diff --git a/data/sql/updates/db_world/2019_10_22_00.sql b/data/sql/updates/db_world/2019_10_22_00.sql
new file mode 100644
index 000000000..07eecd521
--- /dev/null
+++ b/data/sql/updates/db_world/2019_10_22_00.sql
@@ -0,0 +1,31 @@
+-- DB update 2019_10_21_00 -> 2019_10_22_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 = '2019_10_21_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2019_10_21_00 2019_10_22_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1570916858306186295'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1570916858306186295');
+
+DELETE FROM `trinity_string` WHERE `entry` = 30080;
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
+VALUES
+(30080,'The file ''opcode.txt'' is missing in the server working directory.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Файл ''opcode.txt'' не найден в рабочей директории сервера');
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1570916858306186295.sql b/data/sql/updates/pending_db_world/rev_1570916858306186295.sql
deleted file mode 100644
index 290d2b312..000000000
--- a/data/sql/updates/pending_db_world/rev_1570916858306186295.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1570916858306186295');
-
-DELETE FROM `trinity_string` WHERE `entry` = 30080;
-INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
-VALUES
-(30080,'The file ''opcode.txt'' is missing in the server working directory.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Файл ''opcode.txt'' не найден в рабочей директории сервера');