Core/DataStores: Fix field order for some DB2s (#23439)

4 files changed, 13 insertions, 8 deletions

diff --git a/sql/updates/hotfixes/master/2019_06_18_00_hotfixes.sql b/sql/updates/hotfixes/master/2019_06_18_00_hotfixes.sql
new file mode 100644
index 00000000000..d9cfa8cd02b
--- /dev/null
+++ b/sql/updates/hotfixes/master/2019_06_18_00_hotfixes.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `animation_data` MODIFY COLUMN `BehaviorID` smallint(5) unsigned NOT NULL DEFAULT 0 AFTER `ID`;
+ALTER TABLE `animation_data` MODIFY COLUMN `BehaviorTier` tinyint(3) unsigned NOT NULL DEFAULT 0 AFTER `BehaviorID`;
+ALTER TABLE `animation_data` MODIFY COLUMN `Fallback` int(11) NOT NULL DEFAULT 0 AFTER `BehaviorTier`;
+
+ALTER TABLE `spell_item_enchantment` MODIFY COLUMN `TransmogPlayerConditionID` int(10) unsigned NOT NULL DEFAULT 0 AFTER `EffectScalingPoints3`;
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index df045400b71..3e6e620d065 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -37,7 +37,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PREPARE_LOCALE_STMT(HOTFIX_SEL_ACHIEVEMENT, "SELECT ID, Description_lang, Title_lang, Reward_lang FROM achievement_locale WHERE locale = ?", CONNECTION_SYNCH);
 
     // AnimationData.db2
-    PrepareStatement(HOTFIX_SEL_ANIMATION_DATA, "SELECT ID, Fallback, BehaviorTier, BehaviorID, Flags1, Flags2 FROM animation_data ORDER BY ID DESC", CONNECTION_SYNCH);
+    PrepareStatement(HOTFIX_SEL_ANIMATION_DATA, "SELECT ID, BehaviorID, BehaviorTier, Fallback, Flags1, Flags2 FROM animation_data ORDER BY ID DESC", CONNECTION_SYNCH);
 
     // AnimKit.db2
     PrepareStatement(HOTFIX_SEL_ANIM_KIT, "SELECT ID, OneShotDuration, OneShotStopAnimKitID, LowDefAnimKitID FROM anim_kit ORDER BY ID DESC", CONNECTION_SYNCH);
@@ -893,7 +893,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
 
     // SpellItemEnchantment.db2
     PrepareStatement(HOTFIX_SEL_SPELL_ITEM_ENCHANTMENT, "SELECT ID, Name, HordeName, EffectArg1, EffectArg2, EffectArg3, EffectScalingPoints1, "
-        "EffectScalingPoints2, EffectScalingPoints3, TransmogCost, IconFileDataID, TransmogPlayerConditionID, EffectPointsMin1, EffectPointsMin2, "
+        "EffectScalingPoints2, EffectScalingPoints3, TransmogPlayerConditionID, TransmogCost, IconFileDataID, EffectPointsMin1, EffectPointsMin2, "
         "EffectPointsMin3, ItemVisual, Flags, RequiredSkillID, RequiredSkillRank, ItemLevel, Charges, Effect1, Effect2, Effect3, ScalingClass, "
         "ScalingClassRestricted, ConditionID, MinLevel, MaxLevel FROM spell_item_enchantment ORDER BY ID DESC", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_SPELL_ITEM_ENCHANTMENT, "SELECT ID, Name_lang, HordeName_lang FROM spell_item_enchantment_locale WHERE locale = ?", CONNECTION_SYNCH);
diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
index 02993db8522..0c4da4e2804 100644
--- a/src/server/game/DataStores/DB2LoadInfo.h
+++ b/src/server/game/DataStores/DB2LoadInfo.h
@@ -59,9 +59,9 @@ struct AnimationDataLoadInfo
         static DB2FieldMeta const fields[] =
         {
             { false, FT_INT, "ID" },
-            { false, FT_SHORT, "Fallback" },
+            { false, FT_SHORT, "BehaviorID" },
             { false, FT_BYTE, "BehaviorTier" },
-            { true, FT_INT, "BehaviorID" },
+            { true, FT_INT, "Fallback" },
             { true, FT_INT, "Flags1" },
             { true, FT_INT, "Flags2" },
         };
@@ -4487,9 +4487,9 @@ struct SpellItemEnchantmentLoadInfo
             { false, FT_FLOAT, "EffectScalingPoints1" },
             { false, FT_FLOAT, "EffectScalingPoints2" },
             { false, FT_FLOAT, "EffectScalingPoints3" },
+            { false, FT_INT, "TransmogPlayerConditionID" },
             { false, FT_INT, "TransmogCost" },
             { false, FT_INT, "IconFileDataID" },
-            { false, FT_INT, "TransmogPlayerConditionID" },
             { true, FT_SHORT, "EffectPointsMin1" },
             { true, FT_SHORT, "EffectPointsMin2" },
             { true, FT_SHORT, "EffectPointsMin3" },
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 314f7d98c89..9ad7b8ed1eb 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -49,9 +49,9 @@ struct AchievementEntry
 struct AnimationDataEntry
 {
     uint32 ID;
-    uint16 Fallback;
+    uint16 BehaviorID;
     uint8 BehaviorTier;
-    int32 BehaviorID;
+    int32 Fallback;
     int32 Flags[2];
 };
 
@@ -2648,9 +2648,9 @@ struct SpellItemEnchantmentEntry
     LocalizedString* HordeName;
     uint32 EffectArg[MAX_ITEM_ENCHANTMENT_EFFECTS];
     float EffectScalingPoints[MAX_ITEM_ENCHANTMENT_EFFECTS];
+    uint32 TransmogPlayerConditionID;
     uint32 TransmogCost;
     uint32 IconFileDataID;
-    uint32 TransmogPlayerConditionID;
     int16 EffectPointsMin[MAX_ITEM_ENCHANTMENT_EFFECTS];
     uint16 ItemVisual;
     uint16 Flags;