[Repository] Add null integer column support, instance_list notes migration, regenerate repositories (#3969)

This commit is contained in:
Chris Miles
2024-01-12 22:23:55 -06:00
committed by GitHub
parent 1238a6ca68
commit 818f833d04
189 changed files with 17218 additions and 3604 deletions
@@ -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_LOOTTABLE_REPOSITORY_H
@@ -140,8 +140,9 @@ public:
{
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE id = {} LIMIT 1",
"{} WHERE {} = {} LIMIT 1",
BaseSelect(),
PrimaryKey(),
loottable_id
)
);
@@ -150,11 +151,11 @@ public:
if (results.RowCount() == 1) {
Loottable e{};
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.name = row[1] ? row[1] : "";
e.mincash = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.maxcash = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.avgcoin = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.mincash = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
e.maxcash = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
e.avgcoin = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
e.done = static_cast<int8_t>(atoi(row[5]));
e.min_expansion = static_cast<int8_t>(atoi(row[6]));
e.max_expansion = static_cast<int8_t>(atoi(row[7]));
@@ -305,11 +306,11 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Loottable e{};
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.name = row[1] ? row[1] : "";
e.mincash = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.maxcash = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.avgcoin = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.mincash = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
e.maxcash = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
e.avgcoin = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
e.done = static_cast<int8_t>(atoi(row[5]));
e.min_expansion = static_cast<int8_t>(atoi(row[6]));
e.max_expansion = static_cast<int8_t>(atoi(row[7]));
@@ -339,11 +340,11 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Loottable e{};
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.name = row[1] ? row[1] : "";
e.mincash = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.maxcash = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.avgcoin = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.mincash = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
e.maxcash = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
e.avgcoin = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
e.done = static_cast<int8_t>(atoi(row[5]));
e.min_expansion = static_cast<int8_t>(atoi(row[6]));
e.max_expansion = static_cast<int8_t>(atoi(row[7]));
@@ -407,6 +408,80 @@ 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 Loottable &e
)
{
std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.mincash));
v.push_back(std::to_string(e.maxcash));
v.push_back(std::to_string(e.avgcoin));
v.push_back(std::to_string(e.done));
v.push_back(std::to_string(e.min_expansion));
v.push_back(std::to_string(e.max_expansion));
v.push_back("'" + Strings::Escape(e.content_flags) + "'");
v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
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<Loottable> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &e: entries) {
std::vector<std::string> v;
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.mincash));
v.push_back(std::to_string(e.maxcash));
v.push_back(std::to_string(e.avgcoin));
v.push_back(std::to_string(e.done));
v.push_back(std::to_string(e.min_expansion));
v.push_back(std::to_string(e.max_expansion));
v.push_back("'" + Strings::Escape(e.content_flags) + "'");
v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
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_LOOTTABLE_REPOSITORY_H