Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merchants] Change database structure for merchant slots #3974

Merged
merged 2 commits into from Jan 14, 2024
Merged

[Merchants] Change database structure for merchant slots #3974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba60850
[Merchants] Change database structure for merchant slots
joligario Jan 14, 2024
c527d46
Update version.h
joligario Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions common/database/database_update_manifest.cpp
View file
Open in desktop
Expand Up @@ -5198,6 +5198,29 @@ ADD COLUMN `idle_when_empty` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 AFTER `min_l
ADD COLUMN `seconds_before_idle` int(11) UNSIGNED NOT NULL DEFAULT 60 AFTER `idle_when_empty`;
)",
.content_schema_update = true
},
ManifestEntry{
.version = 9253,
.description = "2024_01_13_merchantlist_slot.sql",
.check = "SHOW COLUMNS FROM `merchantlist` LIKE 'slot'",
.condition = "missing",
.match = "unsigned",
.sql = R"(
ALTER TABLE `merchantlist`
MODIFY COLUMN `slot` int(11) UNSIGNED NOT NULL DEFAULT 0
)",
.content_schema_update = true
},
ManifestEntry{
.version = 9254,
.description = "2024_01_13_merchantlist_temp_slot.sql",
.check = "SHOW COLUMNS FROM `merchantlist_temp` LIKE 'slot'",
.condition = "contains",
.match = "tinyint",
.sql = R"(
ALTER TABLE `merchantlist_temp`
MODIFY COLUMN `slot` int(11) UNSIGNED NOT NULL DEFAULT 0
)"
}
// -- template; copy/paste this when you need to create a new entry
// ManifestEntry{
Expand Down
50 changes: 25 additions & 25 deletions common/repositories/base/base_merchantlist_repository.h
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ class BaseMerchantlistRepository {
public:
struct Merchantlist {
int32_t merchantid;
int32_t slot;
uint32_t slot;
int32_t item;
int16_t faction_required;
uint8_t level_required;
Expand Down Expand Up @@ -179,21 +179,21 @@ class BaseMerchantlistRepository {
if (results.RowCount() == 1) {
Merchantlist e{};

e.merchantid = static_cast<int32_t>(atoi(row[0]));
e.slot = static_cast<int32_t>(atoi(row[1]));
e.item = static_cast<int32_t>(atoi(row[2]));
e.faction_required = static_cast<int16_t>(atoi(row[3]));
e.merchantid = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
e.slot = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.item = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
e.faction_required = row[3] ? static_cast<int16_t>(atoi(row[3])) : -100;
e.level_required = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
e.min_status = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
e.max_status = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 255;
e.alt_currency_cost = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
e.classes_required = static_cast<int32_t>(atoi(row[8]));
e.probability = static_cast<int32_t>(atoi(row[9]));
e.classes_required = row[8] ? static_cast<int32_t>(atoi(row[8])) : 65535;
e.probability = row[9] ? static_cast<int32_t>(atoi(row[9])) : 100;
e.bucket_name = row[10] ? row[10] : "";
e.bucket_value = row[11] ? row[11] : "";
e.bucket_comparison = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
e.min_expansion = static_cast<int8_t>(atoi(row[13]));
e.max_expansion = static_cast<int8_t>(atoi(row[14]));
e.min_expansion = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
e.max_expansion = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
e.content_flags = row[15] ? row[15] : "";
e.content_flags_disabled = row[16] ? row[16] : "";

Expand Down Expand Up @@ -363,21 +363,21 @@ class BaseMerchantlistRepository {
for (auto row = results.begin(); row != results.end(); ++row) {
Merchantlist e{};

e.merchantid = static_cast<int32_t>(atoi(row[0]));
e.slot = static_cast<int32_t>(atoi(row[1]));
e.item = static_cast<int32_t>(atoi(row[2]));
e.faction_required = static_cast<int16_t>(atoi(row[3]));
e.merchantid = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
e.slot = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.item = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
e.faction_required = row[3] ? static_cast<int16_t>(atoi(row[3])) : -100;
e.level_required = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
e.min_status = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
e.max_status = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 255;
e.alt_currency_cost = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
e.classes_required = static_cast<int32_t>(atoi(row[8]));
e.probability = static_cast<int32_t>(atoi(row[9]));
e.classes_required = row[8] ? static_cast<int32_t>(atoi(row[8])) : 65535;
e.probability = row[9] ? static_cast<int32_t>(atoi(row[9])) : 100;
e.bucket_name = row[10] ? row[10] : "";
e.bucket_value = row[11] ? row[11] : "";
e.bucket_comparison = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
e.min_expansion = static_cast<int8_t>(atoi(row[13]));
e.max_expansion = static_cast<int8_t>(atoi(row[14]));
e.min_expansion = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
e.max_expansion = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
e.content_flags = row[15] ? row[15] : "";
e.content_flags_disabled = row[16] ? row[16] : "";

Expand All @@ -404,21 +404,21 @@ class BaseMerchantlistRepository {
for (auto row = results.begin(); row != results.end(); ++row) {
Merchantlist e{};

e.merchantid = static_cast<int32_t>(atoi(row[0]));
e.slot = static_cast<int32_t>(atoi(row[1]));
e.item = static_cast<int32_t>(atoi(row[2]));
e.faction_required = static_cast<int16_t>(atoi(row[3]));
e.merchantid = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
e.slot = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.item = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
e.faction_required = row[3] ? static_cast<int16_t>(atoi(row[3])) : -100;
e.level_required = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
e.min_status = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
e.max_status = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 255;
e.alt_currency_cost = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
e.classes_required = static_cast<int32_t>(atoi(row[8]));
e.probability = static_cast<int32_t>(atoi(row[9]));
e.classes_required = row[8] ? static_cast<int32_t>(atoi(row[8])) : 65535;
e.probability = row[9] ? static_cast<int32_t>(atoi(row[9])) : 100;
e.bucket_name = row[10] ? row[10] : "";
e.bucket_value = row[11] ? row[11] : "";
e.bucket_comparison = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
e.min_expansion = static_cast<int8_t>(atoi(row[13]));
e.max_expansion = static_cast<int8_t>(atoi(row[14]));
e.min_expansion = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
e.max_expansion = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
e.content_flags = row[15] ? row[15] : "";
e.content_flags_disabled = row[16] ? row[16] : "";

Expand Down
21 changes: 10 additions & 11 deletions common/repositories/base/base_merchantlist_temp_repository.h
View file
Open in desktop
Expand Up @@ -16,12 +16,11 @@
#include "../../strings.h"
#include <ctime>


class BaseMerchantlistTempRepository {
public:
struct MerchantlistTemp {
uint32_t npcid;
uint8_t slot;
uint32_t slot;
int32_t zone_id;
int32_t instance_id;
uint32_t itemid;
Expand Down Expand Up @@ -137,9 +136,9 @@ class BaseMerchantlistTempRepository {
MerchantlistTemp e{};

e.npcid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.slot = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
e.zone_id = static_cast<int32_t>(atoi(row[2]));
e.instance_id = static_cast<int32_t>(atoi(row[3]));
e.slot = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.zone_id = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
e.instance_id = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
e.itemid = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
e.charges = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 1;

Expand Down Expand Up @@ -277,9 +276,9 @@ class BaseMerchantlistTempRepository {
MerchantlistTemp e{};

e.npcid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.slot = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
e.zone_id = static_cast<int32_t>(atoi(row[2]));
e.instance_id = static_cast<int32_t>(atoi(row[3]));
e.slot = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.zone_id = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
e.instance_id = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
e.itemid = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
e.charges = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 1;

Expand Down Expand Up @@ -307,9 +306,9 @@ class BaseMerchantlistTempRepository {
MerchantlistTemp e{};

e.npcid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.slot = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
e.zone_id = static_cast<int32_t>(atoi(row[2]));
e.instance_id = static_cast<int32_t>(atoi(row[3]));
e.slot = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.zone_id = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
e.instance_id = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
e.itemid = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
e.charges = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 1;

Expand Down