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

Fix error messages in zone tests

Browse Source
This commit is contained in:
Mitch Freeman 2025-05-04 21:03:08 -03:00
parent 2a76c60f63
commit 609beec23a
2 changed files with 16 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
common/repositories/base/base_inventory_repository.h
View File

@ -32,13 +32,10 @@ public:
uint32_t augment_six; uint32_t augment_six;
uint8_t instnodrop; uint8_t instnodrop;
std::string custom_data; std::string custom_data;
uint32_t ornamenticon;
uint32_t ornamentidfile;
uint32_t ornament_icon; uint32_t ornament_icon;
uint32_t ornament_idfile; uint32_t ornament_idfile;
int32_t ornament_hero_model; int32_t ornament_hero_model;
std::string item_unique_id; std::string item_unique_id;
uint32_t guid;
}; };
static std::string PrimaryKey() static std::string PrimaryKey()
@ -62,13 +59,10 @@ public:
"augment_six", "augment_six",
"instnodrop", "instnodrop",
"custom_data", "custom_data",
"ornamenticon",
"ornamentidfile",
"ornament_icon", "ornament_icon",
"ornament_idfile", "ornament_idfile",
"ornament_hero_model", "ornament_hero_model",
"item_unique_id", "item_unique_id",
"guid",
}; };
} }
@ -88,13 +82,10 @@ public:
"augment_six", "augment_six",
"instnodrop", "instnodrop",
"custom_data", "custom_data",
"ornamenticon",
"ornamentidfile",
"ornament_icon", "ornament_icon",
"ornament_idfile", "ornament_idfile",
"ornament_hero_model", "ornament_hero_model",
"item_unique_id", "item_unique_id",
"guid",
}; };
} }
@ -148,13 +139,10 @@ public:
e.augment_six = 0; e.augment_six = 0;
e.instnodrop = 0; e.instnodrop = 0;
e.custom_data = ""; e.custom_data = "";
e.ornamenticon = 0;
e.ornamentidfile = 0;
e.ornament_icon = 0; e.ornament_icon = 0;
e.ornament_idfile = 0; e.ornament_idfile = 0;
e.ornament_hero_model = 0; e.ornament_hero_model = 0;
e.item_unique_id = ""; e.item_unique_id = "";
e.guid = 0;
return e; return e;
} }
@ -204,13 +192,10 @@ public:
e.augment_six = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0; e.augment_six = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0; e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
e.custom_data = row[12] ? row[12] : ""; e.custom_data = row[12] ? row[12] : "";
e.ornamenticon = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0; e.ornament_icon = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
e.ornamentidfile = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0; e.ornament_idfile = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
e.ornament_icon = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0; e.ornament_hero_model = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
e.ornament_idfile = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0; e.item_unique_id = row[16] ? row[16] : "";
e.ornament_hero_model = row[17] ? static_cast<int32_t>(atoi(row[17])) : 0;
e.item_unique_id = row[18] ? row[18] : "";
e.guid = row[19] ? static_cast<uint32_t>(strtoul(row[19], nullptr, 10)) : 0;
return e; return e;
} }
@ -257,13 +242,10 @@ public:
v.push_back(columns[10] + " = " + std::to_string(e.augment_six)); v.push_back(columns[10] + " = " + std::to_string(e.augment_six));
v.push_back(columns[11] + " = " + std::to_string(e.instnodrop)); v.push_back(columns[11] + " = " + std::to_string(e.instnodrop));
v.push_back(columns[12] + " = '" + Strings::Escape(e.custom_data) + "'"); v.push_back(columns[12] + " = '" + Strings::Escape(e.custom_data) + "'");
v.push_back(columns[13] + " = " + std::to_string(e.ornamenticon)); v.push_back(columns[13] + " = " + std::to_string(e.ornament_icon));
v.push_back(columns[14] + " = " + std::to_string(e.ornamentidfile)); v.push_back(columns[14] + " = " + std::to_string(e.ornament_idfile));
v.push_back(columns[15] + " = " + std::to_string(e.ornament_icon)); v.push_back(columns[15] + " = " + std::to_string(e.ornament_hero_model));
v.push_back(columns[16] + " = " + std::to_string(e.ornament_idfile)); v.push_back(columns[16] + " = '" + Strings::Escape(e.item_unique_id) + "'");
v.push_back(columns[17] + " = " + std::to_string(e.ornament_hero_model));
v.push_back(columns[18] + " = '" + Strings::Escape(e.item_unique_id) + "'");
v.push_back(columns[19] + " = " + std::to_string(e.guid));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -298,13 +280,10 @@ public:
v.push_back(std::to_string(e.augment_six)); v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.instnodrop)); v.push_back(std::to_string(e.instnodrop));
v.push_back("'" + Strings::Escape(e.custom_data) + "'"); v.push_back("'" + Strings::Escape(e.custom_data) + "'");
v.push_back(std::to_string(e.ornamenticon));
v.push_back(std::to_string(e.ornamentidfile));
v.push_back(std::to_string(e.ornament_icon)); v.push_back(std::to_string(e.ornament_icon));
v.push_back(std::to_string(e.ornament_idfile)); v.push_back(std::to_string(e.ornament_idfile));
v.push_back(std::to_string(e.ornament_hero_model)); v.push_back(std::to_string(e.ornament_hero_model));
v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'");
v.push_back(std::to_string(e.guid));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -347,13 +326,10 @@ public:
v.push_back(std::to_string(e.augment_six)); v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.instnodrop)); v.push_back(std::to_string(e.instnodrop));
v.push_back("'" + Strings::Escape(e.custom_data) + "'"); v.push_back("'" + Strings::Escape(e.custom_data) + "'");
v.push_back(std::to_string(e.ornamenticon));
v.push_back(std::to_string(e.ornamentidfile));
v.push_back(std::to_string(e.ornament_icon)); v.push_back(std::to_string(e.ornament_icon));
v.push_back(std::to_string(e.ornament_idfile)); v.push_back(std::to_string(e.ornament_idfile));
v.push_back(std::to_string(e.ornament_hero_model)); v.push_back(std::to_string(e.ornament_hero_model));
v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'");
v.push_back(std::to_string(e.guid));
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
} }
@ -400,13 +376,10 @@ public:
e.augment_six = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0; e.augment_six = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0; e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
e.custom_data = row[12] ? row[12] : ""; e.custom_data = row[12] ? row[12] : "";
e.ornamenticon = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0; e.ornament_icon = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
e.ornamentidfile = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0; e.ornament_idfile = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
e.ornament_icon = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0; e.ornament_hero_model = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
e.ornament_idfile = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0; e.item_unique_id = row[16] ? row[16] : "";
e.ornament_hero_model = row[17] ? static_cast<int32_t>(atoi(row[17])) : 0;
e.item_unique_id = row[18] ? row[18] : "";
e.guid = row[19] ? static_cast<uint32_t>(strtoul(row[19], nullptr, 10)) : 0;
all_entries.push_back(e); all_entries.push_back(e);
} }
@ -444,13 +417,10 @@ public:
e.augment_six = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0; e.augment_six = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0; e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
e.custom_data = row[12] ? row[12] : ""; e.custom_data = row[12] ? row[12] : "";
e.ornamenticon = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0; e.ornament_icon = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
e.ornamentidfile = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0; e.ornament_idfile = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
e.ornament_icon = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0; e.ornament_hero_model = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
e.ornament_idfile = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0; e.item_unique_id = row[16] ? row[16] : "";
e.ornament_hero_model = row[17] ? static_cast<int32_t>(atoi(row[17])) : 0;
e.item_unique_id = row[18] ? row[18] : "";
e.guid = row[19] ? static_cast<uint32_t>(strtoul(row[19], nullptr, 10)) : 0;
all_entries.push_back(e); all_entries.push_back(e);
} }
@ -538,13 +508,10 @@ public:
v.push_back(std::to_string(e.augment_six)); v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.instnodrop)); v.push_back(std::to_string(e.instnodrop));
v.push_back("'" + Strings::Escape(e.custom_data) + "'"); v.push_back("'" + Strings::Escape(e.custom_data) + "'");
v.push_back(std::to_string(e.ornamenticon));
v.push_back(std::to_string(e.ornamentidfile));
v.push_back(std::to_string(e.ornament_icon)); v.push_back(std::to_string(e.ornament_icon));
v.push_back(std::to_string(e.ornament_idfile)); v.push_back(std::to_string(e.ornament_idfile));
v.push_back(std::to_string(e.ornament_hero_model)); v.push_back(std::to_string(e.ornament_hero_model));
v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'");
v.push_back(std::to_string(e.guid));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -580,13 +547,10 @@ public:
v.push_back(std::to_string(e.augment_six)); v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.instnodrop)); v.push_back(std::to_string(e.instnodrop));
v.push_back("'" + Strings::Escape(e.custom_data) + "'"); v.push_back("'" + Strings::Escape(e.custom_data) + "'");
v.push_back(std::to_string(e.ornamenticon));
v.push_back(std::to_string(e.ornamentidfile));
v.push_back(std::to_string(e.ornament_icon)); v.push_back(std::to_string(e.ornament_icon));
v.push_back(std::to_string(e.ornament_idfile)); v.push_back(std::to_string(e.ornament_idfile));
v.push_back(std::to_string(e.ornament_hero_model)); v.push_back(std::to_string(e.ornament_hero_model));
v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'");
v.push_back(std::to_string(e.guid));
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
} }

2
common/repositories/inventory_snapshots_repository.h
View File

@ -243,7 +243,6 @@ public:
snapshot.ornament_hero_model = i.ornament_hero_model; snapshot.ornament_hero_model = i.ornament_hero_model;
snapshot.ornament_icon = i.ornament_icon; snapshot.ornament_icon = i.ornament_icon;
snapshot.ornament_idfile = i.ornament_idfile; snapshot.ornament_idfile = i.ornament_idfile;
snapshot.guid = i.guid;
snapshot.slot_id = i.slot_id; snapshot.slot_id = i.slot_id;
snapshot.time_index = time_index; snapshot.time_index = time_index;
queue.push_back(snapshot); queue.push_back(snapshot);
@ -295,7 +294,6 @@ public:
inventory_entry.ornament_hero_model = i.ornament_hero_model; inventory_entry.ornament_hero_model = i.ornament_hero_model;
inventory_entry.ornament_icon = i.ornament_icon; inventory_entry.ornament_icon = i.ornament_icon;
inventory_entry.ornament_idfile = i.ornament_idfile; inventory_entry.ornament_idfile = i.ornament_idfile;
inventory_entry.guid = i.guid;
inventory_entry.slot_id = i.slot_id; inventory_entry.slot_id = i.slot_id;
queue.push_back(inventory_entry); queue.push_back(inventory_entry);
} }