pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-26 07:17:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove id from bot_settings, correct types

Browse Source
This commit is contained in:
nytmyr
2024-12-15 23:08:23 -06:00
parent 606cc11040
commit d144d58abc
2 changed files with 68 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database/database_update_manifest_bots.cpp
+19 -18
View File
@@ -171,29 +171,30 @@ CHANGE COLUMN `spellid` `spell_id` smallint(5) UNSIGNED NOT NULL DEFAULT 0 AFTER
.match = "", .match = "",
.sql = R"( .sql = R"(
CREATE TABLE `bot_settings` ( CREATE TABLE `bot_settings` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `char_id` INT(10) UNSIGNED NOT NULL,
`char_id` INT UNSIGNED NOT NULL, `bot_id` INT(10) UNSIGNED NOT NULL,
`bot_id` INT UNSIGNED NOT NULL, `stance` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
`stance` INT UNSIGNED NOT NULL, `setting_id` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
`setting_id` INT UNSIGNED NOT NULL, `setting_type` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
`setting_type` INT UNSIGNED NOT NULL, `value` INT(10) UNSIGNED NOT NULL,
`value` INT UNSIGNED NOT NULL, `category_name` VARCHAR(64) NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
`category_name` VARCHAR(64) NULL DEFAULT '', `setting_name` VARCHAR(64) NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
`setting_name` VARCHAR(64) NULL DEFAULT '', PRIMARY KEY (`char_id`, `bot_id`, `stance`, `setting_id`, `setting_type`) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) )
COLLATE='utf8mb4_general_ci'; COLLATE='utf8mb4_general_ci'
ENGINE=InnoDB
;
INSERT INTO bot_settings SELECT NULL, 0, bd.`bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 0, 0, bd.`expansion_bitmask`, 'BaseSetting', 'ExpansionBitmask' FROM bot_data bd INSERT INTO bot_settings SELECT 0, bd.`bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 0, 0, bd.`expansion_bitmask`, 'BaseSetting', 'ExpansionBitmask' FROM bot_data bd
JOIN rule_values rv JOIN rule_values rv
WHERE rv.rule_name LIKE 'Bots:BotExpansionSettings' WHERE rv.rule_name LIKE 'Bots:BotExpansionSettings'
AND bd.expansion_bitmask != rv.rule_value; AND bd.expansion_bitmask != rv.rule_value;
INSERT INTO bot_settings SELECT NULL, 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 1, 0, `show_helm`, 'BaseSetting', 'ShowHelm' FROM bot_data WHERE `show_helm` != 1; INSERT INTO bot_settings SELECT 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 1, 0, `show_helm`, 'BaseSetting', 'ShowHelm' FROM bot_data WHERE `show_helm` != 1;
INSERT INTO bot_settings SELECT NULL, 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 2, 0, sqrt(`follow_distance`), 'BaseSetting', 'FollowDistance' FROM bot_data WHERE `follow_distance` != 184; INSERT INTO bot_settings SELECT 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 2, 0, sqrt(`follow_distance`), 'BaseSetting', 'FollowDistance' FROM bot_data WHERE `follow_distance` != 184;
INSERT INTO bot_settings INSERT INTO bot_settings
SELECT NULL, 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 3, 0, `stop_melee_level`, 'BaseSetting', 'StopMeleeLevel' SELECT 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 3, 0, `stop_melee_level`, 'BaseSetting', 'StopMeleeLevel'
FROM ( FROM (
SELECT `bot_id`, SELECT `bot_id`,
(CASE (CASE
@@ -205,11 +206,11 @@ FROM (
) AS `subquery` ) AS `subquery`
WHERE `sml` != `stop_melee_level`; WHERE `sml` != `stop_melee_level`;
INSERT INTO bot_settings SELECT NULL, 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 4, 0, `enforce_spell_settings`, 'BaseSetting', 'EnforceSpellSettings' FROM bot_data WHERE `enforce_spell_settings` != 0; INSERT INTO bot_settings SELECT 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 4, 0, `enforce_spell_settings`, 'BaseSetting', 'EnforceSpellSettings' FROM bot_data WHERE `enforce_spell_settings` != 0;
INSERT INTO bot_settings SELECT NULL, 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 5, 0, `archery_setting`, 'BaseSetting', 'RangedSetting' FROM bot_data WHERE `archery_setting` != 0; INSERT INTO bot_settings SELECT 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 5, 0, `archery_setting`, 'BaseSetting', 'RangedSetting' FROM bot_data WHERE `archery_setting` != 0;
INSERT INTO bot_settings INSERT INTO bot_settings
SELECT NULL, 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 8, 0, `caster_range`, 'BaseSetting', 'DistanceRanged' SELECT 0, `bot_id`, (SELECT bs.`stance_id` FROM bot_stances bs WHERE bs.`bot_id` = bd.`bot_id`) AS stance_id, 8, 0, `caster_range`, 'BaseSetting', 'DistanceRanged'
FROM ( FROM (
SELECT `bot_id`, SELECT `bot_id`,
(CASE (CASE
common/repositories/base/base_bot_settings_repository.h
+49 -61
View File
@@ -19,26 +19,24 @@
class BaseBotSettingsRepository { class BaseBotSettingsRepository {
public: public:
struct BotSettings { struct BotSettings {
uint32_t id; uint32_t char_id;
uint32_t char_id; uint32_t bot_id;
uint32_t bot_id; uint8_t stance;
uint8_t stance; uint16_t setting_id;
uint16_t setting_id; uint8_t setting_type;
uint8_t setting_type; int32_t value;
int32_t value;
std::string category_name; std::string category_name;
std::string setting_name; std::string setting_name;
}; };
static std::string PrimaryKey() static std::string PrimaryKey()
{ {
return std::string("id"); return std::string("char_id");
} }
static std::vector<std::string> Columns() static std::vector<std::string> Columns()
{ {
return { return {
"id",
"char_id", "char_id",
"bot_id", "bot_id",
"stance", "stance",
@@ -53,7 +51,6 @@ public:
static std::vector<std::string> SelectColumns() static std::vector<std::string> SelectColumns()
{ {
return { return {
"id",
"char_id", "char_id",
"bot_id", "bot_id",
"stance", "stance",
@@ -102,15 +99,14 @@ public:
{ {
BotSettings e{}; BotSettings e{};
e.id = 0; e.char_id = 0;
e.char_id = 0; e.bot_id = 0;
e.bot_id = 0; e.stance = 0;
e.stance = 0; e.setting_id = 0;
e.setting_id = 0; e.setting_type = 0;
e.setting_type = 0; e.value = 0;
e.value = 0;
e.category_name = ""; e.category_name = "";
e.setting_name = ""; e.setting_name = "";
return e; return e;
} }
@@ -121,7 +117,7 @@ public:
) )
{ {
for (auto &bot_settings : bot_settingss) { for (auto &bot_settings : bot_settingss) {
if (bot_settings.id == bot_settings_id) { if (bot_settings.char_id == bot_settings_id) {
return bot_settings; return bot_settings;
} }
} }
@@ -147,15 +143,14 @@ public:
if (results.RowCount() == 1) { if (results.RowCount() == 1) {
BotSettings e{}; BotSettings e{};
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0; e.char_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.char_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0; e.bot_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.bot_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0; e.stance = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
e.stance = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0; e.setting_id = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
e.setting_id = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0; e.setting_type = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
e.setting_type = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0; e.value = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
e.value = row[6] ? static_cast<int32_t>(strtoul(row[6], nullptr, 10)) : 0; e.category_name = row[6] ? row[6] : "";
e.category_name = row[7] ? row[7] : ""; e.setting_name = row[7] ? row[7] : "";
e.setting_name = row[8] ? row[8] : "";
return e; return e;
} }
@@ -189,15 +184,14 @@ public:
auto columns = Columns(); auto columns = Columns();
v.push_back(columns[0] + " = " + std::to_string(e.id)); v.push_back(columns[0] + " = " + std::to_string(e.char_id));
v.push_back(columns[1] + " = " + std::to_string(e.char_id)); v.push_back(columns[1] + " = " + std::to_string(e.bot_id));
v.push_back(columns[2] + " = " + std::to_string(e.bot_id)); v.push_back(columns[2] + " = " + std::to_string(e.stance));
v.push_back(columns[3] + " = " + std::to_string(e.stance)); v.push_back(columns[3] + " = " + std::to_string(e.setting_id));
v.push_back(columns[4] + " = " + std::to_string(e.setting_id)); v.push_back(columns[4] + " = " + std::to_string(e.setting_type));
v.push_back(columns[5] + " = " + std::to_string(e.setting_type)); v.push_back(columns[5] + " = " + std::to_string(e.value));
v.push_back(columns[6] + " = " + std::to_string(e.value)); v.push_back(columns[6] + " = '" + Strings::Escape(e.category_name) + "'");
v.push_back(columns[7] + " = '" + Strings::Escape(e.category_name) + "'"); v.push_back(columns[7] + " = '" + Strings::Escape(e.setting_name) + "'");
v.push_back(columns[8] + " = '" + Strings::Escape(e.setting_name) + "'");
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@@ -205,7 +199,7 @@ public:
TableName(), TableName(),
Strings::Implode(", ", v), Strings::Implode(", ", v),
PrimaryKey(), PrimaryKey(),
e.bot_id e.char_id
) )
); );
@@ -219,7 +213,6 @@ public:
{ {
std::vector<std::string> v; std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.char_id));
v.push_back(std::to_string(e.bot_id)); v.push_back(std::to_string(e.bot_id));
v.push_back(std::to_string(e.stance)); v.push_back(std::to_string(e.stance));
@@ -238,7 +231,7 @@ public:
); );
if (results.Success()) { if (results.Success()) {
e.id = results.LastInsertedID(); e.char_id = results.LastInsertedID();
return e; return e;
} }
@@ -257,7 +250,6 @@ public:
for (auto &e: entries) { for (auto &e: entries) {
std::vector<std::string> v; std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.char_id));
v.push_back(std::to_string(e.bot_id)); v.push_back(std::to_string(e.bot_id));
v.push_back(std::to_string(e.stance)); v.push_back(std::to_string(e.stance));
@@ -299,15 +291,14 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
BotSettings e{}; BotSettings e{};
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0; e.char_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.char_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0; e.bot_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.bot_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0; e.stance = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
e.stance = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0; e.setting_id = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
e.setting_id = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0; e.setting_type = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
e.setting_type = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0; e.value = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
e.value = row[6] ? static_cast<int32_t>(strtoul(row[6], nullptr, 10)) : 0; e.category_name = row[6] ? row[6] : "";
e.category_name = row[7] ? row[7] : ""; e.setting_name = row[7] ? row[7] : "";
e.setting_name = row[8] ? row[8] : "";
all_entries.push_back(e); all_entries.push_back(e);
} }
@@ -332,15 +323,14 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
BotSettings e{}; BotSettings e{};
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0; e.char_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.char_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0; e.bot_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.bot_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0; e.stance = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
e.stance = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0; e.setting_id = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
e.setting_id = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0; e.setting_type = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
e.setting_type = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0; e.value = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
e.value = row[6] ? static_cast<int32_t>(strtoul(row[6], nullptr, 10)) : 0; e.category_name = row[6] ? row[6] : "";
e.category_name = row[7] ? row[7] : ""; e.setting_name = row[7] ? row[7] : "";
e.setting_name = row[8] ? row[8] : "";
all_entries.push_back(e); all_entries.push_back(e);
} }
@@ -415,7 +405,6 @@ public:
{ {
std::vector<std::string> v; std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.char_id));
v.push_back(std::to_string(e.bot_id)); v.push_back(std::to_string(e.bot_id));
v.push_back(std::to_string(e.stance)); v.push_back(std::to_string(e.stance));
@@ -446,7 +435,6 @@ public:
for (auto &e: entries) { for (auto &e: entries) {
std::vector<std::string> v; std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.char_id));
v.push_back(std::to_string(e.bot_id)); v.push_back(std::to_string(e.bot_id));
v.push_back(std::to_string(e.stance)); v.push_back(std::to_string(e.stance));