pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 19:51:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename expeditions table

Browse Source
This commit is contained in:
hg 2020-10-17 22:26:53 -04:00
parent 0f051b68ae
commit 579c300cbc
5 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/database_instances.cpp
View File

@ -496,7 +496,7 @@ void Database::DeleteInstance(uint16 instance_id)
query = fmt::format("DELETE FROM dynamic_zones WHERE instance_id={}", instance_id);
QueryDatabase(query);
query = fmt::format("UPDATE expedition_details SET instance_id = NULL WHERE instance_id={}", instance_id);
query = fmt::format("UPDATE expeditions SET instance_id = NULL WHERE instance_id={}", instance_id);
QueryDatabase(query);
BuryCorpsesInInstance(instance_id);
@ -589,7 +589,7 @@ void Database::PurgeExpiredInstances()
QueryDatabase(fmt::format("DELETE FROM spawn_condition_values WHERE instance_id IN ({})", imploded_instance_ids));
QueryDatabase(fmt::format("UPDATE character_corpses SET is_buried = 1, instance_id = 0 WHERE instance_id IN ({})", imploded_instance_ids));
QueryDatabase(fmt::format("DELETE FROM dynamic_zones WHERE instance_id IN ({})", imploded_instance_ids));
QueryDatabase(fmt::format("UPDATE expedition_details SET instance_id = NULL WHERE instance_id IN ({})", imploded_instance_ids));
QueryDatabase(fmt::format("UPDATE expeditions SET instance_id = NULL WHERE instance_id IN ({})", imploded_instance_ids));
}
void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)

2
common/database_schema.h
View File

@ -309,9 +309,9 @@ namespace DatabaseSchema {
"bugs",
"dynamic_zones",
"eventlog",
"expedition_details",
"expedition_lockouts",
"expedition_members",
"expeditions",
"gm_ips",
"group_id",
"group_leaders",

2
utils/sql/git/required/wip_expeditions.sql
View File

@ -1,4 +1,4 @@
CREATE TABLE `expedition_details` (
CREATE TABLE `expeditions` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`uuid` VARCHAR(36) NOT NULL,
`instance_id` INT(10) NULL DEFAULT 0,

34
world/expedition_database.cpp
View File

@ -26,16 +26,16 @@ void ExpeditionDatabase::PurgeExpiredExpeditions()
{
std::string query = SQL(
SELECT
expedition_details.id
FROM expedition_details
LEFT JOIN instance_list ON expedition_details.instance_id = instance_list.id
expeditions.id
FROM expeditions
LEFT JOIN instance_list ON expeditions.instance_id = instance_list.id
LEFT JOIN
(
SELECT expedition_id, COUNT(*) member_count
FROM expedition_members
GROUP BY expedition_id
) expedition_members
ON expedition_members.expedition_id = expedition_details.id
ON expedition_members.expedition_id = expeditions.id
WHERE
instance_list.id IS NULL
OR expedition_members.member_count IS NULL
@ -70,16 +70,16 @@ std::vector<Expedition> ExpeditionDatabase::LoadExpeditions()
std::string query = SQL(
SELECT
expedition_details.id,
expedition_details.instance_id,
expeditions.id,
expeditions.instance_id,
instance_list.zone,
instance_list.start_time,
instance_list.duration,
expedition_members.character_id
FROM expedition_details
INNER JOIN instance_list ON expedition_details.instance_id = instance_list.id
INNER JOIN expedition_members ON expedition_members.expedition_id = expedition_details.id
ORDER BY expedition_details.id;
FROM expeditions
INNER JOIN instance_list ON expeditions.instance_id = instance_list.id
INNER JOIN expedition_members ON expedition_members.expedition_id = expeditions.id
ORDER BY expeditions.id;
);
auto results = database.QueryDatabase(query);
@ -120,16 +120,16 @@ Expedition ExpeditionDatabase::LoadExpedition(uint32_t expedition_id)
std::string query = fmt::format(SQL(
SELECT
expedition_details.id,
expedition_details.instance_id,
expeditions.id,
expeditions.instance_id,
instance_list.zone,
instance_list.start_time,
instance_list.duration,
expedition_members.character_id
FROM expedition_details
INNER JOIN instance_list ON expedition_details.instance_id = instance_list.id
INNER JOIN expedition_members ON expedition_members.expedition_id = expedition_details.id
WHERE expedition_details.id = {};
FROM expeditions
INNER JOIN instance_list ON expeditions.instance_id = instance_list.id
INNER JOIN expedition_members ON expedition_members.expedition_id = expeditions.id
WHERE expeditions.id = {};
), expedition_id);
auto results = database.QueryDatabase(query);
@ -173,7 +173,7 @@ void ExpeditionDatabase::DeleteExpeditions(const std::vector<uint32_t>& expediti
expedition_ids_query.pop_back(); // trailing comma
std::string query = fmt::format(
"DELETE FROM expedition_details WHERE id IN ({});", expedition_ids_query
"DELETE FROM expeditions WHERE id IN ({});", expedition_ids_query
);
database.QueryDatabase(query);

40
zone/expedition_database.cpp
View File

@ -35,7 +35,7 @@ uint32_t ExpeditionDatabase::InsertExpedition(
);
std::string query = fmt::format(SQL(
INSERT INTO expedition_details
INSERT INTO expeditions
(uuid, instance_id, expedition_name, leader_id, min_players, max_players)
VALUES
('{}', {}, '{}', {}, {}, {});
@ -55,21 +55,21 @@ std::string ExpeditionDatabase::LoadExpeditionsSelectQuery()
{
return std::string(SQL(
SELECT
expedition_details.id,
expedition_details.uuid,
expedition_details.instance_id,
expedition_details.expedition_name,
expedition_details.leader_id,
expedition_details.min_players,
expedition_details.max_players,
expedition_details.add_replay_on_join,
expedition_details.is_locked,
expeditions.id,
expeditions.uuid,
expeditions.instance_id,
expeditions.expedition_name,
expeditions.leader_id,
expeditions.min_players,
expeditions.max_players,
expeditions.add_replay_on_join,
expeditions.is_locked,
character_data.name leader_name,
expedition_members.character_id,
member_data.name
FROM expedition_details
INNER JOIN character_data ON expedition_details.leader_id = character_data.id
INNER JOIN expedition_members ON expedition_details.id = expedition_members.expedition_id
FROM expeditions
INNER JOIN character_data ON expeditions.leader_id = character_data.id
INNER JOIN expedition_members ON expeditions.id = expedition_members.expedition_id
INNER JOIN character_data member_data ON expedition_members.character_id = member_data.id
));
}
@ -79,7 +79,7 @@ MySQLRequestResult ExpeditionDatabase::LoadExpedition(uint32_t expedition_id)
LogExpeditionsDetail("Loading expedition [{}]", expedition_id);
std::string query = fmt::format(SQL(
{} WHERE expedition_details.id = {};
{} WHERE expeditions.id = {};
), LoadExpeditionsSelectQuery(), expedition_id);
return database.QueryDatabase(query);
@ -90,7 +90,7 @@ MySQLRequestResult ExpeditionDatabase::LoadAllExpeditions()
LogExpeditionsDetail("Loading all expeditions from database");
std::string query = fmt::format(SQL(
{} ORDER BY expedition_details.id;
{} ORDER BY expeditions.id;
), LoadExpeditionsSelectQuery());
return database.QueryDatabase(query);
@ -193,12 +193,12 @@ ExpeditionDatabase::LoadMultipleExpeditionLockouts(
SELECT
expedition_lockouts.expedition_id,
expedition_lockouts.from_expedition_uuid,
expedition_details.expedition_name,
expeditions.expedition_name,
expedition_lockouts.event_name,
UNIX_TIMESTAMP(expedition_lockouts.expire_time),
expedition_lockouts.duration
FROM expedition_lockouts
INNER JOIN expedition_details ON expedition_lockouts.expedition_id = expedition_details.id
INNER JOIN expeditions ON expedition_lockouts.expedition_id = expeditions.id
WHERE expedition_id IN ({})
ORDER BY expedition_id;
), in_expedition_ids_query);
@ -640,7 +640,7 @@ void ExpeditionDatabase::UpdateLeaderID(uint32_t expedition_id, uint32_t leader_
LogExpeditionsDetail("Updating leader [{}] for expedition [{}]", leader_id, expedition_id);
auto query = fmt::format(SQL(
UPDATE expedition_details SET leader_id = {} WHERE id = {};
UPDATE expeditions SET leader_id = {} WHERE id = {};
), leader_id, expedition_id);
database.QueryDatabase(query);
@ -651,7 +651,7 @@ void ExpeditionDatabase::UpdateLockState(uint32_t expedition_id, bool is_locked)
LogExpeditionsDetail("Updating lock state [{}] for expedition [{}]", is_locked, expedition_id);
auto query = fmt::format(SQL(
UPDATE expedition_details SET is_locked = {} WHERE id = {};
UPDATE expeditions SET is_locked = {} WHERE id = {};
), is_locked, expedition_id);
database.QueryDatabase(query);
@ -684,7 +684,7 @@ void ExpeditionDatabase::UpdateReplayLockoutOnJoin(uint32_t expedition_id, bool
LogExpeditionsDetail("Updating replay lockout on join [{}] for expedition [{}]", add_on_join, expedition_id);
auto query = fmt::format(SQL(
UPDATE expedition_details SET add_replay_on_join = {} WHERE id = {};
UPDATE expeditions SET add_replay_on_join = {} WHERE id = {};
), add_on_join, expedition_id);
database.QueryDatabase(query);