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

Rename character expedition lockouts table

Browse Source
This commit is contained in:
hg 2020-10-10 18:49:03 -04:00
parent 3a1eb51890
commit 3ed7215a92
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/database_schema.h
View File

@ -50,6 +50,7 @@ namespace DatabaseSchema {
{"character_data", "id"}, {"character_data", "id"},
{"character_disciplines", "id"}, {"character_disciplines", "id"},
{"character_enabledtasks", "charid"}, {"character_enabledtasks", "charid"},
{"character_expedition_lockouts", "character_id"},
{"character_inspect_messages", "id"}, {"character_inspect_messages", "id"},
{"character_item_recast", "id"}, {"character_item_recast", "id"},
{"character_languages", "id"}, {"character_languages", "id"},
@ -66,7 +67,6 @@ namespace DatabaseSchema {
{"character_tribute", "id"}, {"character_tribute", "id"},
{"completed_tasks", "charid"}, {"completed_tasks", "charid"},
{"data_buckets", "id"}, {"data_buckets", "id"},
{"expedition_character_lockouts", "character_id"},
{"faction_values", "char_id"}, {"faction_values", "char_id"},
{"friends", "charid"}, {"friends", "charid"},
{"guild_members", "char_id"}, {"guild_members", "char_id"},
@ -115,6 +115,7 @@ namespace DatabaseSchema {
"character_data", "character_data",
"character_disciplines", "character_disciplines",
"character_enabledtasks", "character_enabledtasks",
"character_expedition_lockouts",
"character_inspect_messages", "character_inspect_messages",
"character_item_recast", "character_item_recast",
"character_languages", "character_languages",
@ -132,7 +133,6 @@ namespace DatabaseSchema {
"completed_tasks", "completed_tasks",
"data_buckets", "data_buckets",
"discovered_items", "discovered_items",
"expedition_character_lockouts",
"faction_values", "faction_values",
"friends", "friends",
"guild_bank", "guild_bank",

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

@ -40,7 +40,7 @@ COLLATE='utf8mb4_general_ci'
ENGINE=InnoDB ENGINE=InnoDB
; ;
CREATE TABLE `expedition_character_lockouts` ( CREATE TABLE `character_expedition_lockouts` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`character_id` INT(10) UNSIGNED NOT NULL, `character_id` INT(10) UNSIGNED NOT NULL,
`expedition_name` VARCHAR(128) NOT NULL, `expedition_name` VARCHAR(128) NOT NULL,

2
world/expedition.cpp
View File

@ -287,7 +287,7 @@ void ExpeditionDatabase::PurgeExpiredExpeditions()
void ExpeditionDatabase::PurgeExpiredCharacterLockouts() void ExpeditionDatabase::PurgeExpiredCharacterLockouts()
{ {
std::string query = SQL( std::string query = SQL(
DELETE FROM expedition_character_lockouts DELETE FROM character_expedition_lockouts
WHERE expire_time <= NOW(); WHERE expire_time <= NOW();
); );

26
zone/expedition_database.cpp
View File

@ -109,7 +109,7 @@ std::vector<ExpeditionLockoutTimer> ExpeditionDatabase::LoadCharacterLockouts(ui
event_name, event_name,
UNIX_TIMESTAMP(expire_time), UNIX_TIMESTAMP(expire_time),
duration duration
FROM expedition_character_lockouts FROM character_expedition_lockouts
WHERE character_id = {} AND is_pending = FALSE AND expire_time > NOW(); WHERE character_id = {} AND is_pending = FALSE AND expire_time > NOW();
), character_id); ), character_id);
@ -144,7 +144,7 @@ std::vector<ExpeditionLockoutTimer> ExpeditionDatabase::LoadCharacterLockouts(
event_name, event_name,
UNIX_TIMESTAMP(expire_time), UNIX_TIMESTAMP(expire_time),
duration duration
FROM expedition_character_lockouts FROM character_expedition_lockouts
WHERE WHERE
character_id = {} character_id = {}
AND is_pending = FALSE AND is_pending = FALSE
@ -254,7 +254,7 @@ MySQLRequestResult ExpeditionDatabase::LoadMembersForCreateRequest(
lockout.duration, lockout.duration,
lockout.event_name lockout.event_name
FROM character_data FROM character_data
LEFT JOIN expedition_character_lockouts lockout LEFT JOIN character_expedition_lockouts lockout
ON character_data.id = lockout.character_id ON character_data.id = lockout.character_id
AND lockout.is_pending = FALSE AND lockout.is_pending = FALSE
AND lockout.expire_time > NOW() AND lockout.expire_time > NOW()
@ -277,7 +277,7 @@ void ExpeditionDatabase::DeleteAllCharacterLockouts(uint32_t character_id)
if (character_id != 0) if (character_id != 0)
{ {
std::string query = fmt::format(SQL( std::string query = fmt::format(SQL(
DELETE FROM expedition_character_lockouts DELETE FROM character_expedition_lockouts
WHERE character_id = {}; WHERE character_id = {};
), character_id); ), character_id);
@ -293,7 +293,7 @@ void ExpeditionDatabase::DeleteAllCharacterLockouts(
if (character_id != 0 && !expedition_name.empty()) if (character_id != 0 && !expedition_name.empty())
{ {
std::string query = fmt::format(SQL( std::string query = fmt::format(SQL(
DELETE FROM expedition_character_lockouts DELETE FROM character_expedition_lockouts
WHERE character_id = {} AND expedition_name = '{}'; WHERE character_id = {} AND expedition_name = '{}';
), character_id, EscapeString(expedition_name)); ), character_id, EscapeString(expedition_name));
@ -309,7 +309,7 @@ void ExpeditionDatabase::DeleteCharacterLockout(
); );
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
DELETE FROM expedition_character_lockouts DELETE FROM character_expedition_lockouts
WHERE WHERE
character_id = {} character_id = {}
AND is_pending = FALSE AND is_pending = FALSE
@ -337,7 +337,7 @@ void ExpeditionDatabase::DeleteMembersLockout(
query_character_ids.pop_back(); // trailing comma query_character_ids.pop_back(); // trailing comma
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
DELETE FROM expedition_character_lockouts DELETE FROM character_expedition_lockouts
WHERE character_id WHERE character_id
IN ({}) IN ({})
AND is_pending = FALSE AND is_pending = FALSE
@ -354,7 +354,7 @@ void ExpeditionDatabase::AssignPendingLockouts(uint32_t character_id, const std:
LogExpeditionsDetail("Assigning character [{}] pending lockouts [{}]", character_id, expedition_name); LogExpeditionsDetail("Assigning character [{}] pending lockouts [{}]", character_id, expedition_name);
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
UPDATE expedition_character_lockouts UPDATE character_expedition_lockouts
SET is_pending = FALSE SET is_pending = FALSE
WHERE WHERE
character_id = {} character_id = {}
@ -370,7 +370,7 @@ void ExpeditionDatabase::DeletePendingLockouts(uint32_t character_id)
LogExpeditionsDetail("Deleting character [{}] pending lockouts", character_id); LogExpeditionsDetail("Deleting character [{}] pending lockouts", character_id);
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
DELETE FROM expedition_character_lockouts DELETE FROM character_expedition_lockouts
WHERE character_id = {} AND is_pending = TRUE; WHERE character_id = {} AND is_pending = TRUE;
), character_id); ), character_id);
@ -392,7 +392,7 @@ void ExpeditionDatabase::DeleteAllMembersPendingLockouts(const std::vector<Exped
query_character_ids.pop_back(); // trailing comma query_character_ids.pop_back(); // trailing comma
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
DELETE FROM expedition_character_lockouts DELETE FROM character_expedition_lockouts
WHERE character_id IN ({}) AND is_pending = TRUE; WHERE character_id IN ({}) AND is_pending = TRUE;
), query_character_ids); ), query_character_ids);
@ -470,7 +470,7 @@ void ExpeditionDatabase::InsertCharacterLockouts(
} }
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
INSERT INTO expedition_character_lockouts INSERT INTO character_expedition_lockouts
( (
character_id, character_id,
expire_time, expire_time,
@ -515,7 +515,7 @@ void ExpeditionDatabase::InsertMembersLockout(
insert_values.pop_back(); // trailing comma insert_values.pop_back(); // trailing comma
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
INSERT INTO expedition_character_lockouts INSERT INTO character_expedition_lockouts
(character_id, expire_time, duration, from_expedition_uuid, expedition_name, event_name) (character_id, expire_time, duration, from_expedition_uuid, expedition_name, event_name)
VALUES {} VALUES {}
ON DUPLICATE KEY UPDATE ON DUPLICATE KEY UPDATE
@ -716,7 +716,7 @@ void ExpeditionDatabase::AddLockoutDuration(const std::vector<ExpeditionMember>&
insert_values.pop_back(); // trailing comma insert_values.pop_back(); // trailing comma
auto query = fmt::format(SQL( auto query = fmt::format(SQL(
INSERT INTO expedition_character_lockouts INSERT INTO character_expedition_lockouts
(character_id, expire_time, duration, from_expedition_uuid, expedition_name, event_name) (character_id, expire_time, duration, from_expedition_uuid, expedition_name, event_name)
VALUES {} VALUES {}
ON DUPLICATE KEY UPDATE ON DUPLICATE KEY UPDATE