From 222a5198111e44a4285cc2cd20228cede6a4d281 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Tue, 11 Jan 2022 02:10:55 +0000
Subject: chore(DB): import pending files

Referenced commit(s): 2fd8b00d7bac1f9c9b565916453cf490fb069df0
---
 acore.json                                         |  2 +-
 data/sql/updates/db_world/2022_01_11_02.sql        | 32 ++++++++++++++++++++++
 .../pending_db_world/rev_1641837958335217980.sql   |  6 ----
 doc/changelog/master.md                            | 21 ++++++++++++++
 .../pendings/changes_1641842959398297300.md        | 16 -----------
 5 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 data/sql/updates/db_world/2022_01_11_02.sql
 delete mode 100644 data/sql/updates/pending_db_world/rev_1641837958335217980.sql
 delete mode 100644 doc/changelog/pendings/changes_1641842959398297300.md

diff --git a/acore.json b/acore.json
index 607e2d015e..0df58fa89b 100644
--- a/acore.json
+++ b/acore.json
@@ -1,5 +1,5 @@
 {
   "name": "azerothcore-wotlk",
-  "version": "5.0.0-dev",
+  "version": "5.0.0-dev.0",
   "license": "AGPL3"
 }
diff --git a/data/sql/updates/db_world/2022_01_11_02.sql b/data/sql/updates/db_world/2022_01_11_02.sql
new file mode 100644
index 0000000000..f7434d2800
--- /dev/null
+++ b/data/sql/updates/db_world/2022_01_11_02.sql
@@ -0,0 +1,32 @@
+-- DB update 2022_01_11_01 -> 2022_01_11_02
+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_11_01';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2022_01_11_01 2022_01_11_02 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1641837958335217980'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1641837958335217980');
+
+ALTER TABLE `creature`
+    CHANGE COLUMN `id` `creature_id1` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Creature Identifier' AFTER `guid`,
+    ADD COLUMN `creature_id2` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Creature Identifier' AFTER `creature_id1`,
+    ADD COLUMN `chance_id1` FLOAT UNSIGNED NOT NULL DEFAULT 100 COMMENT 'Chance id1 spawns' AFTER `creature_id2`;
+
+--
+-- END UPDATING QUERIES
+--
+UPDATE version_db_world SET date = '2022_01_11_02' WHERE sql_rev = '1641837958335217980';
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1641837958335217980.sql b/data/sql/updates/pending_db_world/rev_1641837958335217980.sql
deleted file mode 100644
index 732679a6b3..0000000000
--- a/data/sql/updates/pending_db_world/rev_1641837958335217980.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1641837958335217980');
-
-ALTER TABLE `creature`
-    CHANGE COLUMN `id` `creature_id1` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Creature Identifier' AFTER `guid`,
-    ADD COLUMN `creature_id2` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Creature Identifier' AFTER `creature_id1`,
-    ADD COLUMN `chance_id1` FLOAT UNSIGNED NOT NULL DEFAULT 100 COMMENT 'Chance id1 spawns' AFTER `creature_id2`;
diff --git a/doc/changelog/master.md b/doc/changelog/master.md
index bdb9bff07b..00b92b152a 100644
--- a/doc/changelog/master.md
+++ b/doc/changelog/master.md
@@ -1,3 +1,24 @@
+## 5.0.0-dev.0 | Commit: [2fd8b00d7bac1f9c9b565916453cf490fb069df0
+](https://github.com/azerothcore/azerothcore-wotlk/commit/2fd8b00d7bac1f9c9b565916453cf490fb069df0
+
+
+We suggest that you always use the latest version of our master branch.
+https://github.com/azerothcore/azerothcore-wotlk/tree/master
+
+### How to upgrade
+
+For server administrators: instructions about how to upgrade existing servers are available [here](http://www.azerothcore.org/wiki/Upgrade-from-pre-2.0.0-to-latest-master).
+
+## Release notes
+
+This PR removes the modelId column from creature table to allow us to move to a dual entry spawn system.
+
+If this causes an issue for in game or custom spawns the following line of SAI can update the modelId.
+
+(#entryorguid,0,0,0,11,0,100,0,0,0,0,0,0,3,0,#modelId,0,0,0,0,1,0,0,0,0,0,0,0,0,"Creature Name - On Spawn - Change Model to #modelId"),
+
+Special thanks to @Shin @Kitzunu @M'Dic for assistance.
+
 ## 4.0.0-dev.13 | Commit: [bc82f36f1ff46bb21d32e1cfdaec8271dde08af1
 ](https://github.com/azerothcore/azerothcore-wotlk/commit/bc82f36f1ff46bb21d32e1cfdaec8271dde08af1
 
diff --git a/doc/changelog/pendings/changes_1641842959398297300.md b/doc/changelog/pendings/changes_1641842959398297300.md
deleted file mode 100644
index 0dc83b58a3..0000000000
--- a/doc/changelog/pendings/changes_1641842959398297300.md
+++ /dev/null
@@ -1,16 +0,0 @@
-We suggest that you always use the latest version of our master branch.
-https://github.com/azerothcore/azerothcore-wotlk/tree/master
-
-### How to upgrade
-
-For server administrators: instructions about how to upgrade existing servers are available [here](http://www.azerothcore.org/wiki/Upgrade-from-pre-2.0.0-to-latest-master).
-
-## Release notes
-
-This PR removes the modelId column from creature table to allow us to move to a dual entry spawn system.
-
-If this causes an issue for in game or custom spawns the following line of SAI can update the modelId.
-
-(#entryorguid,0,0,0,11,0,100,0,0,0,0,0,0,3,0,#modelId,0,0,0,0,1,0,0,0,0,0,0,0,0,"Creature Name - On Spawn - Change Model to #modelId"),
-
-Special thanks to @Shin @Kitzunu @M'Dic for assistance.
-- 
cgit v1.2.3