Core/DataStores: Dropped unused DB2 file

6 files changed, 1 insertions, 13 deletions

diff --git a/sql/updates/hotfixes/2016_01_10_00_hotfixes.sql b/sql/updates/hotfixes/2016_01_10_00_hotfixes.sql
new file mode 100644
index 00000000000..478c9d9c093
--- /dev/null
+++ b/sql/updates/hotfixes/2016_01_10_00_hotfixes.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `area_group`;
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index 287b327033f..f9329bbd7fa 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -32,9 +32,6 @@ void HotfixDatabaseConnection::DoPrepareStatements()
         "Reward, MinimumCriteria, SharesCriteria, CriteriaTree FROM achievement ORDER BY ID DESC", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_ACHIEVEMENT, "SELECT ID, Title_lang, Description_lang, Reward_lang FROM achievement_locale WHERE locale = ?", CONNECTION_SYNCH);
 
-    // AreaGroup.db2
-    PrepareStatement(HOTFIX_SEL_AREA_GROUP, "SELECT ID FROM area_group ORDER BY ID DESC", CONNECTION_SYNCH);
-
     // AreaGroupMember.db2
     PrepareStatement(HOTFIX_SEL_AREA_GROUP_MEMBER, "SELECT ID, AreaGroupID, AreaID FROM area_group_member ORDER BY ID DESC", CONNECTION_SYNCH);
 
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.h b/src/server/database/Database/Implementation/HotfixDatabase.h
index adc6299483c..35f08d98c77 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.h
+++ b/src/server/database/Database/Implementation/HotfixDatabase.h
@@ -32,8 +32,6 @@ enum HotfixDatabaseStatements
     HOTFIX_SEL_ACHIEVEMENT,
     HOTFIX_SEL_ACHIEVEMENT_LOCALE,
 
-    HOTFIX_SEL_AREA_GROUP,
-
     HOTFIX_SEL_AREA_GROUP_MEMBER,
 
     HOTFIX_SEL_AUCTION_HOUSE,
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp
index 9b87cdf9e42..9ea939297ba 100644
--- a/src/server/game/DataStores/DB2Stores.cpp
+++ b/src/server/game/DataStores/DB2Stores.cpp
@@ -25,7 +25,6 @@
 #include "World.h"
 
 DB2Storage<AchievementEntry>                    sAchievementStore("Achievement.db2", AchievementFormat, HOTFIX_SEL_ACHIEVEMENT);
-DB2Storage<AreaGroupEntry>                      sAreaGroupStore("AreaGroup.db2", AreaGroupFormat, HOTFIX_SEL_AREA_GROUP);
 DB2Storage<AreaGroupMemberEntry>                sAreaGroupMemberStore("AreaGroupMember.db2", AreaGroupMemberFormat, HOTFIX_SEL_AREA_GROUP_MEMBER);
 DB2Storage<AuctionHouseEntry>                   sAuctionHouseStore("AuctionHouse.db2", AuctionHouseFormat, HOTFIX_SEL_AUCTION_HOUSE);
 DB2Storage<BarberShopStyleEntry>                sBarberShopStyleStore("BarberShopStyle.db2", BarberShopStyleFormat, HOTFIX_SEL_BARBER_SHOP_STYLE);
@@ -201,7 +200,6 @@ void DB2Manager::LoadStores(std::string const& dataPath, uint32 defaultLocale)
 
     LOAD_DB2(sAchievementStore);
     LOAD_DB2(sAreaGroupMemberStore);
-    LOAD_DB2(sAreaGroupStore);
     LOAD_DB2(sBattlePetBreedQualityStore);
     LOAD_DB2(sBattlePetBreedStateStore);
     LOAD_DB2(sAuctionHouseStore);
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 5b00a0ff2be..303c81a7966 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -43,11 +43,6 @@ struct AchievementEntry
     uint32 CriteriaTree;                                            // 14
 };
 
-struct AreaGroupEntry
-{
-    uint32 ID;                                                      // 0
-};
-
 struct AreaGroupMemberEntry
 {
     uint32 ID;                                                      // 0
diff --git a/src/server/game/DataStores/DB2fmt.h b/src/server/game/DataStores/DB2fmt.h
index 99b7641e214..def5759a450 100644
--- a/src/server/game/DataStores/DB2fmt.h
+++ b/src/server/game/DataStores/DB2fmt.h
@@ -19,7 +19,6 @@
 #define TRINITY_DB2SFRM_H
 
 char const AchievementFormat[] = "niiissiiiiisiii";
-char const AreaGroupFormat[] = "n";
 char const AreaGroupMemberFormat[] = "nii";
 char const AuctionHouseFormat[] = "niiis";
 char const BarberShopStyleFormat[] = "nissfiii";