pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-19 15:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DB scheme changes

Browse Source
This commit is contained in:
Michael Cook (mackal) 2019-06-10 22:40:05 -04:00
parent ece9251bd6
commit 1304b9c80f
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
utils/sql/git/required/sharedtasks.sql
View File

@ -21,30 +21,30 @@ CREATE TABLE `task_replay_groups` (
PRIMARY KEY(`id`)
);
CREATE TABLE `character_task_lockouts` (
`charid` INT NOT NULL,
`character_id` INT NOT NULL,
`replay_group` INT NOT NULL,
`original_id` INT NOT NULL,
`timestamp` INT NOT NULL,
PRIMARY KEY(`charid`, `replay_group`)
PRIMARY KEY(`character_id`, `replay_group`)
);
CREATE TABLE `shared_task_state` (
`id` INT NOT NULL,
`taskid` INT NOT NULL,
`acceptedtime` INT NOT NULL,
`locked` TINYINT NOT NULL DEFAULT '0',
`task_id` INT NOT NULL,
`accepted_time` INT NOT NULL,
`is_locked` TINYINT NOT NULL DEFAULT '0',
PRIMARY KEY(`id`)
);
CREATE TABLE `shared_task_activities` (
`shared_id` INT NOT NULL,
`shared_task_id` INT NOT NULL,
`activity_id` INT NOT NULL,
`done_count` INT NOT NULL,
`completed` TINYINT,
PRIMARY KEY(`shared_id`, `activity_id`)
PRIMARY KEY(`shared_task_id`, `activity_id`)
);
CREATE TABLE `shared_task_members` (
`shared_id` INT NOT NULL,
`charid` INT NOT NULL,
`name` VARCHAR(64) NOT NULL,
`leader` TINYINT,
PRIMARY KEY(`charid`)
`shared_task_id` INT NOT NULL,
`character_id` INT NOT NULL,
`character_name` VARCHAR(64) NOT NULL,
`is_leader` TINYINT DEFAULT 0,
PRIMARY KEY(shared_task_id, character_id)
);

4
world/cliententry.cpp
View File

@ -384,7 +384,7 @@ int ClientListEntry::GetTaskLockoutTimeLeft(int id) const
bool ClientListEntry::CleanExpiredTaskLockouts() const
{
std::string query =
StringFormat("DELETE FROM `character_task_lockouts` WHERE `charid` = %i AND `timestamp` > %i", pcharid,
StringFormat("DELETE FROM `character_task_lockouts` WHERE `character_id` = %i AND `timestamp` > %i", pcharid,
Timer::GetCurrentTime());
auto results = database.QueryDatabase(query);
return results.Success();
@ -397,7 +397,7 @@ bool ClientListEntry::LoadTaskLockouts()
{
CleanExpiredTaskLockouts();
std::string query = StringFormat(
"SELECT `replay_group`, `original_id`, `timestamp` FROM `character_task_lockouts` WHERE `charid` = %i",
"SELECT `replay_group`, `original_id`, `timestamp` FROM `character_task_lockouts` WHERE `character_id` = %i",
pcharid);
auto results = database.QueryDatabase(query);
if (!results.Success())

4
world/shared_tasks.cpp
View File

@ -374,7 +374,7 @@ bool SharedTaskManager::LoadSharedTaskState()
{
// one may think we should clean up expired tasks, but we don't just in case world is booting back up after a crash
// we will clean them up in the normal process loop so zones get told to clean up
std::string query = "SELECT `id`, `taskid`, `acceptedtime`, `locked` FROM `shared_task_state`";
std::string query = "SELECT `id`, `task_id`, `accepted_time`, `is_locked` FROM `shared_task_state`";
auto results = database.QueryDatabase(query);
if (results.Success() && results.RowCount() > 0) {
@ -389,7 +389,7 @@ bool SharedTaskManager::LoadSharedTaskState()
}
}
query = "SELECT `shared_id`, `charid`, `name`, `leader` FROM `shared_task_members` ORDER BY shared_id ASC";
query = "SELECT `shared_task_id`, `character_id`, `character_name`, `is_leader` FROM `shared_task_members` ORDER BY shared_task_id ASC";
results = database.QueryDatabase(query);
if (results.Success() && results.RowCount() > 0) {
for (auto row = results.begin(); row != results.end(); ++row) {