pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-26 03:07:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_object_contents_repository.h
+108 -29
View File
@@ -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_OBJECT_CONTENTS_REPOSITORY_H
@@ -148,8 +148,9 @@ public:
{
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE id = {} LIMIT 1",
"{} WHERE {} = {} LIMIT 1",
BaseSelect(),
PrimaryKey(),
object_contents_id
)
);
@@ -158,17 +159,17 @@ public:
if (results.RowCount() == 1) {
ObjectContents e{};
e.zoneid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.parentid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
e.bagidx = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.itemid = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.zoneid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.parentid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.bagidx = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
e.itemid = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
e.charges = static_cast<int16_t>(atoi(row[4]));
e.droptime = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
e.augslot1 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
e.augslot2 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
e.augslot3 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
e.augslot4 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.augslot5 = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
e.augslot1 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
e.augslot2 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
e.augslot3 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
e.augslot4 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
e.augslot5 = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.augslot6 = static_cast<int32_t>(atoi(row[11]));
return e;
@@ -322,17 +323,17 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
ObjectContents e{};
e.zoneid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.parentid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
e.bagidx = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.itemid = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.zoneid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.parentid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.bagidx = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
e.itemid = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
e.charges = static_cast<int16_t>(atoi(row[4]));
e.droptime = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
e.augslot1 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
e.augslot2 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
e.augslot3 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
e.augslot4 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.augslot5 = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
e.augslot1 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
e.augslot2 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
e.augslot3 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
e.augslot4 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
e.augslot5 = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.augslot6 = static_cast<int32_t>(atoi(row[11]));
all_entries.push_back(e);
@@ -358,17 +359,17 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
ObjectContents e{};
e.zoneid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.parentid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
e.bagidx = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.itemid = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.zoneid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
e.parentid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.bagidx = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
e.itemid = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
e.charges = static_cast<int16_t>(atoi(row[4]));
e.droptime = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
e.augslot1 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
e.augslot2 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
e.augslot3 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
e.augslot4 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.augslot5 = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
e.augslot1 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
e.augslot2 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
e.augslot3 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
e.augslot4 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
e.augslot5 = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.augslot6 = static_cast<int32_t>(atoi(row[11]));
all_entries.push_back(e);
@@ -428,6 +429,84 @@ 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 ObjectContents &e
)
{
std::vector<std::string> v;
v.push_back(std::to_string(e.zoneid));
v.push_back(std::to_string(e.parentid));
v.push_back(std::to_string(e.bagidx));
v.push_back(std::to_string(e.itemid));
v.push_back(std::to_string(e.charges));
v.push_back("FROM_UNIXTIME(" + (e.droptime > 0 ? std::to_string(e.droptime) : "null") + ")");
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));
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<ObjectContents> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &e: entries) {
std::vector<std::string> v;
v.push_back(std::to_string(e.zoneid));
v.push_back(std::to_string(e.parentid));
v.push_back(std::to_string(e.bagidx));
v.push_back(std::to_string(e.itemid));
v.push_back(std::to_string(e.charges));
v.push_back("FROM_UNIXTIME(" + (e.droptime > 0 ? std::to_string(e.droptime) : "null") + ")");
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));
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_OBJECT_CONTENTS_REPOSITORY_H