From 609beec23a6e814cbedb0f7da0d529aa69104eb1 Mon Sep 17 00:00:00 2001 From: Mitch Freeman <65987027+neckkola@users.noreply.github.com> Date: Sun, 4 May 2025 21:03:08 -0300 Subject: [PATCH] Fix error messages in zone tests --- .../base/base_inventory_repository.h | 68 +++++-------------- .../inventory_snapshots_repository.h | 2 - 2 files changed, 16 insertions(+), 54 deletions(-) diff --git a/common/repositories/base/base_inventory_repository.h b/common/repositories/base/base_inventory_repository.h index b02648483..7900fcfae 100644 --- a/common/repositories/base/base_inventory_repository.h +++ b/common/repositories/base/base_inventory_repository.h @@ -32,13 +32,10 @@ public: uint32_t augment_six; uint8_t instnodrop; std::string custom_data; - uint32_t ornamenticon; - uint32_t ornamentidfile; uint32_t ornament_icon; uint32_t ornament_idfile; int32_t ornament_hero_model; std::string item_unique_id; - uint32_t guid; }; static std::string PrimaryKey() @@ -62,13 +59,10 @@ public: "augment_six", "instnodrop", "custom_data", - "ornamenticon", - "ornamentidfile", "ornament_icon", "ornament_idfile", "ornament_hero_model", "item_unique_id", - "guid", }; } @@ -88,13 +82,10 @@ public: "augment_six", "instnodrop", "custom_data", - "ornamenticon", - "ornamentidfile", "ornament_icon", "ornament_idfile", "ornament_hero_model", "item_unique_id", - "guid", }; } @@ -148,13 +139,10 @@ public: e.augment_six = 0; e.instnodrop = 0; e.custom_data = ""; - e.ornamenticon = 0; - e.ornamentidfile = 0; e.ornament_icon = 0; e.ornament_idfile = 0; e.ornament_hero_model = 0; e.item_unique_id = ""; - e.guid = 0; return e; } @@ -204,13 +192,10 @@ public: e.augment_six = row[10] ? static_cast(strtoul(row[10], nullptr, 10)) : 0; e.instnodrop = row[11] ? static_cast(strtoul(row[11], nullptr, 10)) : 0; e.custom_data = row[12] ? row[12] : ""; - e.ornamenticon = row[13] ? static_cast(strtoul(row[13], nullptr, 10)) : 0; - e.ornamentidfile = row[14] ? static_cast(strtoul(row[14], nullptr, 10)) : 0; - e.ornament_icon = row[15] ? static_cast(strtoul(row[15], nullptr, 10)) : 0; - e.ornament_idfile = row[16] ? static_cast(strtoul(row[16], nullptr, 10)) : 0; - e.ornament_hero_model = row[17] ? static_cast(atoi(row[17])) : 0; - e.item_unique_id = row[18] ? row[18] : ""; - e.guid = row[19] ? static_cast(strtoul(row[19], nullptr, 10)) : 0; + e.ornament_icon = row[13] ? static_cast(strtoul(row[13], nullptr, 10)) : 0; + e.ornament_idfile = row[14] ? static_cast(strtoul(row[14], nullptr, 10)) : 0; + e.ornament_hero_model = row[15] ? static_cast(atoi(row[15])) : 0; + e.item_unique_id = row[16] ? row[16] : ""; return e; } @@ -257,13 +242,10 @@ public: 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[12] + " = '" + Strings::Escape(e.custom_data) + "'"); - v.push_back(columns[13] + " = " + std::to_string(e.ornamenticon)); - v.push_back(columns[14] + " = " + std::to_string(e.ornamentidfile)); - v.push_back(columns[15] + " = " + std::to_string(e.ornament_icon)); - v.push_back(columns[16] + " = " + std::to_string(e.ornament_idfile)); - 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)); + v.push_back(columns[13] + " = " + std::to_string(e.ornament_icon)); + v.push_back(columns[14] + " = " + std::to_string(e.ornament_idfile)); + v.push_back(columns[15] + " = " + std::to_string(e.ornament_hero_model)); + v.push_back(columns[16] + " = '" + Strings::Escape(e.item_unique_id) + "'"); auto results = db.QueryDatabase( fmt::format( @@ -298,13 +280,10 @@ public: v.push_back(std::to_string(e.augment_six)); v.push_back(std::to_string(e.instnodrop)); 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_idfile)); v.push_back(std::to_string(e.ornament_hero_model)); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); - v.push_back(std::to_string(e.guid)); auto results = db.QueryDatabase( fmt::format( @@ -347,13 +326,10 @@ public: v.push_back(std::to_string(e.augment_six)); v.push_back(std::to_string(e.instnodrop)); 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_idfile)); v.push_back(std::to_string(e.ornament_hero_model)); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); - v.push_back(std::to_string(e.guid)); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); } @@ -400,13 +376,10 @@ public: e.augment_six = row[10] ? static_cast(strtoul(row[10], nullptr, 10)) : 0; e.instnodrop = row[11] ? static_cast(strtoul(row[11], nullptr, 10)) : 0; e.custom_data = row[12] ? row[12] : ""; - e.ornamenticon = row[13] ? static_cast(strtoul(row[13], nullptr, 10)) : 0; - e.ornamentidfile = row[14] ? static_cast(strtoul(row[14], nullptr, 10)) : 0; - e.ornament_icon = row[15] ? static_cast(strtoul(row[15], nullptr, 10)) : 0; - e.ornament_idfile = row[16] ? static_cast(strtoul(row[16], nullptr, 10)) : 0; - e.ornament_hero_model = row[17] ? static_cast(atoi(row[17])) : 0; - e.item_unique_id = row[18] ? row[18] : ""; - e.guid = row[19] ? static_cast(strtoul(row[19], nullptr, 10)) : 0; + e.ornament_icon = row[13] ? static_cast(strtoul(row[13], nullptr, 10)) : 0; + e.ornament_idfile = row[14] ? static_cast(strtoul(row[14], nullptr, 10)) : 0; + e.ornament_hero_model = row[15] ? static_cast(atoi(row[15])) : 0; + e.item_unique_id = row[16] ? row[16] : ""; all_entries.push_back(e); } @@ -444,13 +417,10 @@ public: e.augment_six = row[10] ? static_cast(strtoul(row[10], nullptr, 10)) : 0; e.instnodrop = row[11] ? static_cast(strtoul(row[11], nullptr, 10)) : 0; e.custom_data = row[12] ? row[12] : ""; - e.ornamenticon = row[13] ? static_cast(strtoul(row[13], nullptr, 10)) : 0; - e.ornamentidfile = row[14] ? static_cast(strtoul(row[14], nullptr, 10)) : 0; - e.ornament_icon = row[15] ? static_cast(strtoul(row[15], nullptr, 10)) : 0; - e.ornament_idfile = row[16] ? static_cast(strtoul(row[16], nullptr, 10)) : 0; - e.ornament_hero_model = row[17] ? static_cast(atoi(row[17])) : 0; - e.item_unique_id = row[18] ? row[18] : ""; - e.guid = row[19] ? static_cast(strtoul(row[19], nullptr, 10)) : 0; + e.ornament_icon = row[13] ? static_cast(strtoul(row[13], nullptr, 10)) : 0; + e.ornament_idfile = row[14] ? static_cast(strtoul(row[14], nullptr, 10)) : 0; + e.ornament_hero_model = row[15] ? static_cast(atoi(row[15])) : 0; + e.item_unique_id = row[16] ? row[16] : ""; 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.instnodrop)); 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_idfile)); v.push_back(std::to_string(e.ornament_hero_model)); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); - v.push_back(std::to_string(e.guid)); auto results = db.QueryDatabase( fmt::format( @@ -580,13 +547,10 @@ public: v.push_back(std::to_string(e.augment_six)); v.push_back(std::to_string(e.instnodrop)); 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_idfile)); v.push_back(std::to_string(e.ornament_hero_model)); v.push_back("'" + Strings::Escape(e.item_unique_id) + "'"); - v.push_back(std::to_string(e.guid)); insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); } diff --git a/common/repositories/inventory_snapshots_repository.h b/common/repositories/inventory_snapshots_repository.h index 6acf9ea8d..731dced62 100644 --- a/common/repositories/inventory_snapshots_repository.h +++ b/common/repositories/inventory_snapshots_repository.h @@ -243,7 +243,6 @@ public: snapshot.ornament_hero_model = i.ornament_hero_model; snapshot.ornament_icon = i.ornament_icon; snapshot.ornament_idfile = i.ornament_idfile; - snapshot.guid = i.guid; snapshot.slot_id = i.slot_id; snapshot.time_index = time_index; queue.push_back(snapshot); @@ -295,7 +294,6 @@ public: inventory_entry.ornament_hero_model = i.ornament_hero_model; inventory_entry.ornament_icon = i.ornament_icon; inventory_entry.ornament_idfile = i.ornament_idfile; - inventory_entry.guid = i.guid; inventory_entry.slot_id = i.slot_id; queue.push_back(inventory_entry); }