Merge branch '1.x' of https://github.com/azerothcore/azerothcore-wotlk into 1.xv1.0.3

6 files changed, 75 insertions, 15 deletions

diff --git a/data/sql/updates/db_auth/2016_11_19_00.sql b/data/sql/updates/db_auth/2016_11_19_00.sql
new file mode 100644
index 0000000000..e8ab148a72
--- /dev/null
+++ b/data/sql/updates/db_auth/2016_11_19_00.sql
@@ -0,0 +1,27 @@
+-- DB update 2016_09_04_00 -> 2016_11_19_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+START TRANSACTION;
+ALTER TABLE version_db_auth CHANGE COLUMN 2016_09_04_00 2016_11_19_00 bit;
+SELECT sql_rev INTO OK FROM version_db_auth WHERE sql_rev = '1478975214169487000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_auth (`sql_rev`) VALUES ('1478975214169487000');
+
+ALTER TABLE `account`
+    ADD `token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `s`,
+    ADD `reg_mail` VARCHAR(255) NOT NULL DEFAULT '' AFTER `email`,
+    ADD `last_attempt_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1' AFTER `last_ip`,
+    ADD `lock_country` VARCHAR(2) NOT NULL DEFAULT '00' AFTER `locked`;
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_characters/2016_11_19_00.sql b/data/sql/updates/db_characters/2016_11_19_00.sql
new file mode 100644
index 0000000000..8f27bb2909
--- /dev/null
+++ b/data/sql/updates/db_characters/2016_11_19_00.sql
@@ -0,0 +1,25 @@
+-- DB update 2016_08_25_00 -> 2016_11_19_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+START TRANSACTION;
+ALTER TABLE version_db_characters CHANGE COLUMN 2016_08_25_00 2016_11_19_00 bit;
+SELECT sql_rev INTO OK FROM version_db_characters WHERE sql_rev = '1478978518254125000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_characters (`sql_rev`) VALUES ('1478978518254125000');
+
+ALTER TABLE `arena_team_member`
+	CHANGE COLUMN `personalRating` `personalRating` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `seasonWins`,
+	DROP COLUMN `personal_rating`;
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2016_11_19_00.sql b/data/sql/updates/db_world/2016_11_19_00.sql
new file mode 100644
index 0000000000..a03703556d
--- /dev/null
+++ b/data/sql/updates/db_world/2016_11_19_00.sql
@@ -0,0 +1,23 @@
+-- DB update 2016_11_06_02 -> 2016_11_19_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2016_11_06_02 2016_11_19_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1477236823674130000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1477236823674130000');
+
+UPDATE `quest_template` SET `SpecialFlags` = "0", `RequiredItemId1` = "31811", `RequiredItemCount1` ="1", `Flags` = "0" WHERE `ID` = "10923";
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_auth/rev_1478975214169487000.sql b/data/sql/updates/pending_db_auth/rev_1478975214169487000.sql
deleted file mode 100644
index 3f5af211ef..0000000000
--- a/data/sql/updates/pending_db_auth/rev_1478975214169487000.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO version_db_auth (`sql_rev`) VALUES ('1478975214169487000');
-
-ALTER TABLE `account`
-    ADD `token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `s`,
-    ADD `reg_mail` VARCHAR(255) NOT NULL DEFAULT '' AFTER `mail`,
-    ADD `last_attempt_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1' AFTER `last_ip`,
-    ADD `lock_country` VARCHAR(2) NOT NULL DEFAULT '00' AFTER `locked`;
diff --git a/data/sql/updates/pending_db_characters/rev_1478978518254125000.sql b/data/sql/updates/pending_db_characters/rev_1478978518254125000.sql
deleted file mode 100644
index 7bf7549827..0000000000
--- a/data/sql/updates/pending_db_characters/rev_1478978518254125000.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO version_db_characters (`sql_rev`) VALUES ('1478978518254125000');
-
-ALTER TABLE `arena_team_member`
-	CHANGE COLUMN `personalRating` `personalRating` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `seasonWins`,
-	DROP COLUMN `personal_rating`;
diff --git a/data/sql/updates/pending_db_world/rev_1477236823674130000.sql b/data/sql/updates/pending_db_world/rev_1477236823674130000.sql
deleted file mode 100644
index 30e05cf6ca..0000000000
--- a/data/sql/updates/pending_db_world/rev_1477236823674130000.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO version_db_world(`sql_rev`) VALUES ('1477236823674130000');
-
-UPDATE `quest_template` SET `SpecialFlags` = "0", `RequiredItemId1` = "31811", `RequiredItemCount1` ="1", `Flags` = "0" WHERE `ID` = "10923"