From 7ff977cce5cb8cbc881b7639a65407767423d56e Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Wed, 30 Jun 2021 18:09:33 +0000
Subject: [PATCH] chore(DB): import pending files

Referenced commit(s): c6173e88bdb8dcf6f2ab5f27f05308cf6264219f
---
 .../updates/db_characters/2021_06_30_00.sql   | 45 +++++++++++++++++++
 .../rev_1624468542752528700.sql               | 19 --------
 2 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 data/sql/updates/db_characters/2021_06_30_00.sql
 delete mode 100644 data/sql/updates/pending_db_characters/rev_1624468542752528700.sql

diff --git a/data/sql/updates/db_characters/2021_06_30_00.sql b/data/sql/updates/db_characters/2021_06_30_00.sql
new file mode 100644
index 000000000..ccfebcd3e
--- /dev/null
+++ b/data/sql/updates/db_characters/2021_06_30_00.sql
@@ -0,0 +1,45 @@
+-- DB update 2021_06_23_00 -> 2021_06_30_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_06_23_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_characters CHANGE COLUMN 2021_06_23_00 2021_06_30_00 bit;
+SELECT sql_rev INTO OK FROM version_db_characters WHERE sql_rev = '1624468542752528700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_characters` (`sql_rev`) VALUES ('1624468542752528700');
+
+SET @dbname = DATABASE();
+SET @tablename = "characters";
+SET @columnname = "order";
+SET @preparedStatement = (SELECT IF(
+    (
+        SELECT COUNT(*) FROM information_schema.COLUMNS
+        WHERE
+            (TABLE_NAME = @tablename)
+            AND (TABLE_SCHEMA = @dbname)
+            AND (COLUMN_NAME = @columnname)
+    ) > 0,
+    "SELECT 1 WHERE false",
+    CONCAT("ALTER TABLE `", @tablename, "` ADD `", @columnname, "` TINYINT NULL DEFAULT NULL AFTER `grantableLevels`;")
+));
+PREPARE alterIfNotExists FROM @preparedStatement;
+EXECUTE alterIfNotExists;
+DEALLOCATE PREPARE alterIfNotExists;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_characters SET date = '2021_06_30_00' WHERE sql_rev = '1624468542752528700';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_characters/rev_1624468542752528700.sql b/data/sql/updates/pending_db_characters/rev_1624468542752528700.sql
deleted file mode 100644
index b5232d304..000000000
--- a/data/sql/updates/pending_db_characters/rev_1624468542752528700.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-INSERT INTO `version_db_characters` (`sql_rev`) VALUES ('1624468542752528700');
-
-SET @dbname = DATABASE();
-SET @tablename = "characters";
-SET @columnname = "order";
-SET @preparedStatement = (SELECT IF(
-    (
-        SELECT COUNT(*) FROM information_schema.COLUMNS
-        WHERE
-            (TABLE_NAME = @tablename)
-            AND (TABLE_SCHEMA = @dbname)
-            AND (COLUMN_NAME = @columnname)
-    ) > 0,
-    "SELECT 1 WHERE false",
-    CONCAT("ALTER TABLE `", @tablename, "` ADD `", @columnname, "` TINYINT NULL DEFAULT NULL AFTER `grantableLevels`;")
-));
-PREPARE alterIfNotExists FROM @preparedStatement;
-EXECUTE alterIfNotExists;
-DEALLOCATE PREPARE alterIfNotExists;