mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-26 07:17:16 +00:00
[Repository] Add null integer column support, instance_list notes migration, regenerate repositories (#3969)
This commit is contained in:
Chris Miles
GitHub
@@ -6,7 +6,7 @@
|
||||
* Any modifications to base repositories are to be made by the generator only
|
||||
*
|
||||
* @generator ./utils/scripts/generators/repository-generator.pl
|
||||
* @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
|
||||
* @docs https://docs.eqemu.io/developer/repositories
|
||||
*/
|
||||
|
||||
#ifndef EQEMU_BASE_INVENTORY_REPOSITORY_H
|
||||
@@ -164,8 +164,9 @@ public:
|
||||
{
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} WHERE id = {} LIMIT 1",
|
||||
"{} WHERE {} = {} LIMIT 1",
|
||||
BaseSelect(),
|
||||
PrimaryKey(),
|
||||
inventory_id
|
||||
)
|
||||
);
|
||||
@@ -174,21 +175,21 @@ public:
|
||||
if (results.RowCount() == 1) {
|
||||
Inventory e{};
|
||||
|
||||
e.charid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.slotid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
|
||||
e.itemid = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
|
||||
e.charges = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
|
||||
e.color = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
|
||||
e.augslot1 = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
|
||||
e.augslot2 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
|
||||
e.augslot3 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
|
||||
e.augslot4 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
|
||||
e.augslot5 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
|
||||
e.charid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
|
||||
e.slotid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
|
||||
e.itemid = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
|
||||
e.charges = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
|
||||
e.color = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
|
||||
e.augslot1 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
|
||||
e.augslot2 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
|
||||
e.augslot3 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
|
||||
e.augslot4 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
|
||||
e.augslot5 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
|
||||
e.augslot6 = static_cast<int32_t>(atoi(row[10]));
|
||||
e.instnodrop = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
|
||||
e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
|
||||
e.custom_data = row[12] ? row[12] : "";
|
||||
e.ornamenticon = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
|
||||
e.ornamentidfile = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
|
||||
e.ornamenticon = 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_hero_model = static_cast<int32_t>(atoi(row[15]));
|
||||
|
||||
return e;
|
||||
@@ -354,21 +355,21 @@ public:
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
Inventory e{};
|
||||
|
||||
e.charid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.slotid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
|
||||
e.itemid = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
|
||||
e.charges = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
|
||||
e.color = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
|
||||
e.augslot1 = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
|
||||
e.augslot2 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
|
||||
e.augslot3 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
|
||||
e.augslot4 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
|
||||
e.augslot5 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
|
||||
e.charid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
|
||||
e.slotid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
|
||||
e.itemid = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
|
||||
e.charges = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
|
||||
e.color = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
|
||||
e.augslot1 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
|
||||
e.augslot2 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
|
||||
e.augslot3 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
|
||||
e.augslot4 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
|
||||
e.augslot5 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
|
||||
e.augslot6 = static_cast<int32_t>(atoi(row[10]));
|
||||
e.instnodrop = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
|
||||
e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
|
||||
e.custom_data = row[12] ? row[12] : "";
|
||||
e.ornamenticon = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
|
||||
e.ornamentidfile = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
|
||||
e.ornamenticon = 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_hero_model = static_cast<int32_t>(atoi(row[15]));
|
||||
|
||||
all_entries.push_back(e);
|
||||
@@ -394,21 +395,21 @@ public:
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
Inventory e{};
|
||||
|
||||
e.charid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.slotid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
|
||||
e.itemid = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
|
||||
e.charges = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
|
||||
e.color = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
|
||||
e.augslot1 = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
|
||||
e.augslot2 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
|
||||
e.augslot3 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
|
||||
e.augslot4 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
|
||||
e.augslot5 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
|
||||
e.charid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
|
||||
e.slotid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
|
||||
e.itemid = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
|
||||
e.charges = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
|
||||
e.color = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
|
||||
e.augslot1 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
|
||||
e.augslot2 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
|
||||
e.augslot3 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
|
||||
e.augslot4 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
|
||||
e.augslot5 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
|
||||
e.augslot6 = static_cast<int32_t>(atoi(row[10]));
|
||||
e.instnodrop = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
|
||||
e.instnodrop = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
|
||||
e.custom_data = row[12] ? row[12] : "";
|
||||
e.ornamenticon = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
|
||||
e.ornamentidfile = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
|
||||
e.ornamenticon = 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_hero_model = static_cast<int32_t>(atoi(row[15]));
|
||||
|
||||
all_entries.push_back(e);
|
||||
@@ -468,6 +469,92 @@ public:
|
||||
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
|
||||
}
|
||||
|
||||
static std::string BaseReplace()
|
||||
{
|
||||
return fmt::format(
|
||||
"REPLACE INTO {} ({}) ",
|
||||
TableName(),
|
||||
ColumnsRaw()
|
||||
);
|
||||
}
|
||||
|
||||
static int ReplaceOne(
|
||||
Database& db,
|
||||
const Inventory &e
|
||||
)
|
||||
{
|
||||
std::vector<std::string> v;
|
||||
|
||||
v.push_back(std::to_string(e.charid));
|
||||
v.push_back(std::to_string(e.slotid));
|
||||
v.push_back(std::to_string(e.itemid));
|
||||
v.push_back(std::to_string(e.charges));
|
||||
v.push_back(std::to_string(e.color));
|
||||
v.push_back(std::to_string(e.augslot1));
|
||||
v.push_back(std::to_string(e.augslot2));
|
||||
v.push_back(std::to_string(e.augslot3));
|
||||
v.push_back(std::to_string(e.augslot4));
|
||||
v.push_back(std::to_string(e.augslot5));
|
||||
v.push_back(std::to_string(e.augslot6));
|
||||
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_hero_model));
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES ({})",
|
||||
BaseReplace(),
|
||||
Strings::Implode(",", v)
|
||||
)
|
||||
);
|
||||
|
||||
return (results.Success() ? results.RowsAffected() : 0);
|
||||
}
|
||||
|
||||
static int ReplaceMany(
|
||||
Database& db,
|
||||
const std::vector<Inventory> &entries
|
||||
)
|
||||
{
|
||||
std::vector<std::string> insert_chunks;
|
||||
|
||||
for (auto &e: entries) {
|
||||
std::vector<std::string> v;
|
||||
|
||||
v.push_back(std::to_string(e.charid));
|
||||
v.push_back(std::to_string(e.slotid));
|
||||
v.push_back(std::to_string(e.itemid));
|
||||
v.push_back(std::to_string(e.charges));
|
||||
v.push_back(std::to_string(e.color));
|
||||
v.push_back(std::to_string(e.augslot1));
|
||||
v.push_back(std::to_string(e.augslot2));
|
||||
v.push_back(std::to_string(e.augslot3));
|
||||
v.push_back(std::to_string(e.augslot4));
|
||||
v.push_back(std::to_string(e.augslot5));
|
||||
v.push_back(std::to_string(e.augslot6));
|
||||
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_hero_model));
|
||||
|
||||
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
|
||||
}
|
||||
|
||||
std::vector<std::string> v;
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES {}",
|
||||
BaseReplace(),
|
||||
Strings::Implode(",", insert_chunks)
|
||||
)
|
||||
);
|
||||
|
||||
return (results.Success() ? results.RowsAffected() : 0);
|
||||
}
|
||||
};
|
||||
|
||||
#endif //EQEMU_BASE_INVENTORY_REPOSITORY_H
|
||||
|
||||
Reference in New Issue
Block a user