pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Repositories] Add GetMaxId, Count (#2371)

Browse Source 
* [Repositories] Add GetMaxId, Count

* Update cmake with repositories, regenerate extended repos

* Remove license from files

* Simplify receivers

* Receiver simplify remaining

* Simplify receivers final

* Pass params by const reference

* Modernize grid tables

* Remove guild members since it doesn't conform as a generatable table

* PR comment
This commit is contained in:
Chris Miles
2022-08-13 18:40:56 -05:00
committed by GitHub
parent b79e1947f1
commit 79285b1002
374 changed files with 26837 additions and 26020 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_zone_points_repository.h
+220 -194
View File
@@ -145,37 +145,37 @@ public:
static ZonePoints NewEntity()
{
ZonePoints entry{};
ZonePoints e{};
entry.id = 0;
entry.zone = "";
entry.version = 0;
entry.number = 1;
entry.y = 0;
entry.x = 0;
entry.z = 0;
entry.heading = 0;
entry.target_y = 0;
entry.target_x = 0;
entry.target_z = 0;
entry.target_heading = 0;
entry.zoneinst = 0;
entry.target_zone_id = 0;
entry.target_instance = 0;
entry.buffer = 0;
entry.client_version_mask = 4294967295;
entry.min_expansion = -1;
entry.max_expansion = -1;
entry.content_flags = "";
entry.content_flags_disabled = "";
entry.is_virtual = 0;
entry.height = 0;
entry.width = 0;
e.id = 0;
e.zone = "";
e.version = 0;
e.number = 1;
e.y = 0;
e.x = 0;
e.z = 0;
e.heading = 0;
e.target_y = 0;
e.target_x = 0;
e.target_z = 0;
e.target_heading = 0;
e.zoneinst = 0;
e.target_zone_id = 0;
e.target_instance = 0;
e.buffer = 0;
e.client_version_mask = 4294967295;
e.min_expansion = -1;
e.max_expansion = -1;
e.content_flags = "";
e.content_flags_disabled = "";
e.is_virtual = 0;
e.height = 0;
e.width = 0;
return entry;
return e;
}
static ZonePoints GetZonePointsEntry(
static ZonePoints GetZonePoints(
const std::vector<ZonePoints> &zone_pointss,
int zone_points_id
)
@@ -204,34 +204,34 @@ public:
auto row = results.begin();
if (results.RowCount() == 1) {
ZonePoints entry{};
ZonePoints e{};
entry.id = atoi(row[0]);
entry.zone = row[1] ? row[1] : "";
entry.version = atoi(row[2]);
entry.number = atoi(row[3]);
entry.y = static_cast<float>(atof(row[4]));
entry.x = static_cast<float>(atof(row[5]));
entry.z = static_cast<float>(atof(row[6]));
entry.heading = static_cast<float>(atof(row[7]));
entry.target_y = static_cast<float>(atof(row[8]));
entry.target_x = static_cast<float>(atof(row[9]));
entry.target_z = static_cast<float>(atof(row[10]));
entry.target_heading = static_cast<float>(atof(row[11]));
entry.zoneinst = atoi(row[12]);
entry.target_zone_id = atoi(row[13]);
entry.target_instance = atoi(row[14]);
entry.buffer = static_cast<float>(atof(row[15]));
entry.client_version_mask = atoi(row[16]);
entry.min_expansion = atoi(row[17]);
entry.max_expansion = atoi(row[18]);
entry.content_flags = row[19] ? row[19] : "";
entry.content_flags_disabled = row[20] ? row[20] : "";
entry.is_virtual = atoi(row[21]);
entry.height = atoi(row[22]);
entry.width = atoi(row[23]);
e.id = atoi(row[0]);
e.zone = row[1] ? row[1] : "";
e.version = atoi(row[2]);
e.number = atoi(row[3]);
e.y = static_cast<float>(atof(row[4]));
e.x = static_cast<float>(atof(row[5]));
e.z = static_cast<float>(atof(row[6]));
e.heading = static_cast<float>(atof(row[7]));
e.target_y = static_cast<float>(atof(row[8]));
e.target_x = static_cast<float>(atof(row[9]));
e.target_z = static_cast<float>(atof(row[10]));
e.target_heading = static_cast<float>(atof(row[11]));
e.zoneinst = atoi(row[12]);
e.target_zone_id = atoi(row[13]);
e.target_instance = atoi(row[14]);
e.buffer = static_cast<float>(atof(row[15]));
e.client_version_mask = atoi(row[16]);
e.min_expansion = atoi(row[17]);
e.max_expansion = atoi(row[18]);
e.content_flags = row[19] ? row[19] : "";
e.content_flags_disabled = row[20] ? row[20] : "";
e.is_virtual = atoi(row[21]);
e.height = atoi(row[22]);
e.width = atoi(row[23]);
return entry;
return e;
}
return NewEntity();
@@ -256,44 +256,44 @@ public:
static int UpdateOne(
Database& db,
ZonePoints zone_points_entry
const ZonePoints &e
)
{
std::vector<std::string> update_values;
std::vector<std::string> v;
auto columns = Columns();
update_values.push_back(columns[1] + " = '" + Strings::Escape(zone_points_entry.zone) + "'");
update_values.push_back(columns[2] + " = " + std::to_string(zone_points_entry.version));
update_values.push_back(columns[3] + " = " + std::to_string(zone_points_entry.number));
update_values.push_back(columns[4] + " = " + std::to_string(zone_points_entry.y));
update_values.push_back(columns[5] + " = " + std::to_string(zone_points_entry.x));
update_values.push_back(columns[6] + " = " + std::to_string(zone_points_entry.z));
update_values.push_back(columns[7] + " = " + std::to_string(zone_points_entry.heading));
update_values.push_back(columns[8] + " = " + std::to_string(zone_points_entry.target_y));
update_values.push_back(columns[9] + " = " + std::to_string(zone_points_entry.target_x));
update_values.push_back(columns[10] + " = " + std::to_string(zone_points_entry.target_z));
update_values.push_back(columns[11] + " = " + std::to_string(zone_points_entry.target_heading));
update_values.push_back(columns[12] + " = " + std::to_string(zone_points_entry.zoneinst));
update_values.push_back(columns[13] + " = " + std::to_string(zone_points_entry.target_zone_id));
update_values.push_back(columns[14] + " = " + std::to_string(zone_points_entry.target_instance));
update_values.push_back(columns[15] + " = " + std::to_string(zone_points_entry.buffer));
update_values.push_back(columns[16] + " = " + std::to_string(zone_points_entry.client_version_mask));
update_values.push_back(columns[17] + " = " + std::to_string(zone_points_entry.min_expansion));
update_values.push_back(columns[18] + " = " + std::to_string(zone_points_entry.max_expansion));
update_values.push_back(columns[19] + " = '" + Strings::Escape(zone_points_entry.content_flags) + "'");
update_values.push_back(columns[20] + " = '" + Strings::Escape(zone_points_entry.content_flags_disabled) + "'");
update_values.push_back(columns[21] + " = " + std::to_string(zone_points_entry.is_virtual));
update_values.push_back(columns[22] + " = " + std::to_string(zone_points_entry.height));
update_values.push_back(columns[23] + " = " + std::to_string(zone_points_entry.width));
v.push_back(columns[1] + " = '" + Strings::Escape(e.zone) + "'");
v.push_back(columns[2] + " = " + std::to_string(e.version));
v.push_back(columns[3] + " = " + std::to_string(e.number));
v.push_back(columns[4] + " = " + std::to_string(e.y));
v.push_back(columns[5] + " = " + std::to_string(e.x));
v.push_back(columns[6] + " = " + std::to_string(e.z));
v.push_back(columns[7] + " = " + std::to_string(e.heading));
v.push_back(columns[8] + " = " + std::to_string(e.target_y));
v.push_back(columns[9] + " = " + std::to_string(e.target_x));
v.push_back(columns[10] + " = " + std::to_string(e.target_z));
v.push_back(columns[11] + " = " + std::to_string(e.target_heading));
v.push_back(columns[12] + " = " + std::to_string(e.zoneinst));
v.push_back(columns[13] + " = " + std::to_string(e.target_zone_id));
v.push_back(columns[14] + " = " + std::to_string(e.target_instance));
v.push_back(columns[15] + " = " + std::to_string(e.buffer));
v.push_back(columns[16] + " = " + std::to_string(e.client_version_mask));
v.push_back(columns[17] + " = " + std::to_string(e.min_expansion));
v.push_back(columns[18] + " = " + std::to_string(e.max_expansion));
v.push_back(columns[19] + " = '" + Strings::Escape(e.content_flags) + "'");
v.push_back(columns[20] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
v.push_back(columns[21] + " = " + std::to_string(e.is_virtual));
v.push_back(columns[22] + " = " + std::to_string(e.height));
v.push_back(columns[23] + " = " + std::to_string(e.width));
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
Strings::Implode(", ", update_values),
Strings::Implode(", ", v),
PrimaryKey(),
zone_points_entry.id
e.id
)
);
@@ -302,93 +302,93 @@ public:
static ZonePoints InsertOne(
Database& db,
ZonePoints zone_points_entry
ZonePoints e
)
{
std::vector<std::string> insert_values;
std::vector<std::string> v;
insert_values.push_back(std::to_string(zone_points_entry.id));
insert_values.push_back("'" + Strings::Escape(zone_points_entry.zone) + "'");
insert_values.push_back(std::to_string(zone_points_entry.version));
insert_values.push_back(std::to_string(zone_points_entry.number));
insert_values.push_back(std::to_string(zone_points_entry.y));
insert_values.push_back(std::to_string(zone_points_entry.x));
insert_values.push_back(std::to_string(zone_points_entry.z));
insert_values.push_back(std::to_string(zone_points_entry.heading));
insert_values.push_back(std::to_string(zone_points_entry.target_y));
insert_values.push_back(std::to_string(zone_points_entry.target_x));
insert_values.push_back(std::to_string(zone_points_entry.target_z));
insert_values.push_back(std::to_string(zone_points_entry.target_heading));
insert_values.push_back(std::to_string(zone_points_entry.zoneinst));
insert_values.push_back(std::to_string(zone_points_entry.target_zone_id));
insert_values.push_back(std::to_string(zone_points_entry.target_instance));
insert_values.push_back(std::to_string(zone_points_entry.buffer));
insert_values.push_back(std::to_string(zone_points_entry.client_version_mask));
insert_values.push_back(std::to_string(zone_points_entry.min_expansion));
insert_values.push_back(std::to_string(zone_points_entry.max_expansion));
insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags) + "'");
insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags_disabled) + "'");
insert_values.push_back(std::to_string(zone_points_entry.is_virtual));
insert_values.push_back(std::to_string(zone_points_entry.height));
insert_values.push_back(std::to_string(zone_points_entry.width));
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.zone) + "'");
v.push_back(std::to_string(e.version));
v.push_back(std::to_string(e.number));
v.push_back(std::to_string(e.y));
v.push_back(std::to_string(e.x));
v.push_back(std::to_string(e.z));
v.push_back(std::to_string(e.heading));
v.push_back(std::to_string(e.target_y));
v.push_back(std::to_string(e.target_x));
v.push_back(std::to_string(e.target_z));
v.push_back(std::to_string(e.target_heading));
v.push_back(std::to_string(e.zoneinst));
v.push_back(std::to_string(e.target_zone_id));
v.push_back(std::to_string(e.target_instance));
v.push_back(std::to_string(e.buffer));
v.push_back(std::to_string(e.client_version_mask));
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) + "'");
v.push_back(std::to_string(e.is_virtual));
v.push_back(std::to_string(e.height));
v.push_back(std::to_string(e.width));
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES ({})",
BaseInsert(),
Strings::Implode(",", insert_values)
Strings::Implode(",", v)
)
);
if (results.Success()) {
zone_points_entry.id = results.LastInsertedID();
return zone_points_entry;
e.id = results.LastInsertedID();
return e;
}
zone_points_entry = NewEntity();
e = NewEntity();
return zone_points_entry;
return e;
}
static int InsertMany(
Database& db,
std::vector<ZonePoints> zone_points_entries
const std::vector<ZonePoints> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &zone_points_entry: zone_points_entries) {
std::vector<std::string> insert_values;
for (auto &e: entries) {
std::vector<std::string> v;
insert_values.push_back(std::to_string(zone_points_entry.id));
insert_values.push_back("'" + Strings::Escape(zone_points_entry.zone) + "'");
insert_values.push_back(std::to_string(zone_points_entry.version));
insert_values.push_back(std::to_string(zone_points_entry.number));
insert_values.push_back(std::to_string(zone_points_entry.y));
insert_values.push_back(std::to_string(zone_points_entry.x));
insert_values.push_back(std::to_string(zone_points_entry.z));
insert_values.push_back(std::to_string(zone_points_entry.heading));
insert_values.push_back(std::to_string(zone_points_entry.target_y));
insert_values.push_back(std::to_string(zone_points_entry.target_x));
insert_values.push_back(std::to_string(zone_points_entry.target_z));
insert_values.push_back(std::to_string(zone_points_entry.target_heading));
insert_values.push_back(std::to_string(zone_points_entry.zoneinst));
insert_values.push_back(std::to_string(zone_points_entry.target_zone_id));
insert_values.push_back(std::to_string(zone_points_entry.target_instance));
insert_values.push_back(std::to_string(zone_points_entry.buffer));
insert_values.push_back(std::to_string(zone_points_entry.client_version_mask));
insert_values.push_back(std::to_string(zone_points_entry.min_expansion));
insert_values.push_back(std::to_string(zone_points_entry.max_expansion));
insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags) + "'");
insert_values.push_back("'" + Strings::Escape(zone_points_entry.content_flags_disabled) + "'");
insert_values.push_back(std::to_string(zone_points_entry.is_virtual));
insert_values.push_back(std::to_string(zone_points_entry.height));
insert_values.push_back(std::to_string(zone_points_entry.width));
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.zone) + "'");
v.push_back(std::to_string(e.version));
v.push_back(std::to_string(e.number));
v.push_back(std::to_string(e.y));
v.push_back(std::to_string(e.x));
v.push_back(std::to_string(e.z));
v.push_back(std::to_string(e.heading));
v.push_back(std::to_string(e.target_y));
v.push_back(std::to_string(e.target_x));
v.push_back(std::to_string(e.target_z));
v.push_back(std::to_string(e.target_heading));
v.push_back(std::to_string(e.zoneinst));
v.push_back(std::to_string(e.target_zone_id));
v.push_back(std::to_string(e.target_instance));
v.push_back(std::to_string(e.buffer));
v.push_back(std::to_string(e.client_version_mask));
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) + "'");
v.push_back(std::to_string(e.is_virtual));
v.push_back(std::to_string(e.height));
v.push_back(std::to_string(e.width));
insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")");
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
}
std::vector<std::string> insert_values;
std::vector<std::string> v;
auto results = db.QueryDatabase(
fmt::format(
@@ -415,40 +415,40 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
ZonePoints entry{};
ZonePoints e{};
entry.id = atoi(row[0]);
entry.zone = row[1] ? row[1] : "";
entry.version = atoi(row[2]);
entry.number = atoi(row[3]);
entry.y = static_cast<float>(atof(row[4]));
entry.x = static_cast<float>(atof(row[5]));
entry.z = static_cast<float>(atof(row[6]));
entry.heading = static_cast<float>(atof(row[7]));
entry.target_y = static_cast<float>(atof(row[8]));
entry.target_x = static_cast<float>(atof(row[9]));
entry.target_z = static_cast<float>(atof(row[10]));
entry.target_heading = static_cast<float>(atof(row[11]));
entry.zoneinst = atoi(row[12]);
entry.target_zone_id = atoi(row[13]);
entry.target_instance = atoi(row[14]);
entry.buffer = static_cast<float>(atof(row[15]));
entry.client_version_mask = atoi(row[16]);
entry.min_expansion = atoi(row[17]);
entry.max_expansion = atoi(row[18]);
entry.content_flags = row[19] ? row[19] : "";
entry.content_flags_disabled = row[20] ? row[20] : "";
entry.is_virtual = atoi(row[21]);
entry.height = atoi(row[22]);
entry.width = atoi(row[23]);
e.id = atoi(row[0]);
e.zone = row[1] ? row[1] : "";
e.version = atoi(row[2]);
e.number = atoi(row[3]);
e.y = static_cast<float>(atof(row[4]));
e.x = static_cast<float>(atof(row[5]));
e.z = static_cast<float>(atof(row[6]));
e.heading = static_cast<float>(atof(row[7]));
e.target_y = static_cast<float>(atof(row[8]));
e.target_x = static_cast<float>(atof(row[9]));
e.target_z = static_cast<float>(atof(row[10]));
e.target_heading = static_cast<float>(atof(row[11]));
e.zoneinst = atoi(row[12]);
e.target_zone_id = atoi(row[13]);
e.target_instance = atoi(row[14]);
e.buffer = static_cast<float>(atof(row[15]));
e.client_version_mask = atoi(row[16]);
e.min_expansion = atoi(row[17]);
e.max_expansion = atoi(row[18]);
e.content_flags = row[19] ? row[19] : "";
e.content_flags_disabled = row[20] ? row[20] : "";
e.is_virtual = atoi(row[21]);
e.height = atoi(row[22]);
e.width = atoi(row[23]);
all_entries.push_back(entry);
all_entries.push_back(e);
}
return all_entries;
}
static std::vector<ZonePoints> GetWhere(Database& db, std::string where_filter)
static std::vector<ZonePoints> GetWhere(Database& db, const std::string &where_filter)
{
std::vector<ZonePoints> all_entries;
@@ -463,40 +463,40 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
ZonePoints entry{};
ZonePoints e{};
entry.id = atoi(row[0]);
entry.zone = row[1] ? row[1] : "";
entry.version = atoi(row[2]);
entry.number = atoi(row[3]);
entry.y = static_cast<float>(atof(row[4]));
entry.x = static_cast<float>(atof(row[5]));
entry.z = static_cast<float>(atof(row[6]));
entry.heading = static_cast<float>(atof(row[7]));
entry.target_y = static_cast<float>(atof(row[8]));
entry.target_x = static_cast<float>(atof(row[9]));
entry.target_z = static_cast<float>(atof(row[10]));
entry.target_heading = static_cast<float>(atof(row[11]));
entry.zoneinst = atoi(row[12]);
entry.target_zone_id = atoi(row[13]);
entry.target_instance = atoi(row[14]);
entry.buffer = static_cast<float>(atof(row[15]));
entry.client_version_mask = atoi(row[16]);
entry.min_expansion = atoi(row[17]);
entry.max_expansion = atoi(row[18]);
entry.content_flags = row[19] ? row[19] : "";
entry.content_flags_disabled = row[20] ? row[20] : "";
entry.is_virtual = atoi(row[21]);
entry.height = atoi(row[22]);
entry.width = atoi(row[23]);
e.id = atoi(row[0]);
e.zone = row[1] ? row[1] : "";
e.version = atoi(row[2]);
e.number = atoi(row[3]);
e.y = static_cast<float>(atof(row[4]));
e.x = static_cast<float>(atof(row[5]));
e.z = static_cast<float>(atof(row[6]));
e.heading = static_cast<float>(atof(row[7]));
e.target_y = static_cast<float>(atof(row[8]));
e.target_x = static_cast<float>(atof(row[9]));
e.target_z = static_cast<float>(atof(row[10]));
e.target_heading = static_cast<float>(atof(row[11]));
e.zoneinst = atoi(row[12]);
e.target_zone_id = atoi(row[13]);
e.target_instance = atoi(row[14]);
e.buffer = static_cast<float>(atof(row[15]));
e.client_version_mask = atoi(row[16]);
e.min_expansion = atoi(row[17]);
e.max_expansion = atoi(row[18]);
e.content_flags = row[19] ? row[19] : "";
e.content_flags_disabled = row[20] ? row[20] : "";
e.is_virtual = atoi(row[21]);
e.height = atoi(row[22]);
e.width = atoi(row[23]);
all_entries.push_back(entry);
all_entries.push_back(e);
}
return all_entries;
}
static int DeleteWhere(Database& db, std::string where_filter)
static int DeleteWhere(Database& db, const std::string &where_filter)
{
auto results = db.QueryDatabase(
fmt::format(
@@ -521,6 +521,32 @@ public:
return (results.Success() ? results.RowsAffected() : 0);
}
static int64 GetMaxId(Database& db)
{
auto results = db.QueryDatabase(
fmt::format(
"SELECT COALESCE(MAX({}), 0) FROM {}",
PrimaryKey(),
TableName()
)
);
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
}
static int64 Count(Database& db, const std::string &where_filter = "")
{
auto results = db.QueryDatabase(
fmt::format(
"SELECT COUNT(*) FROM {} {}",
TableName(),
(where_filter.empty() ? "" : "WHERE " + where_filter)
)
);
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
}
};
#endif //EQEMU_BASE_ZONE_POINTS_REPOSITORY_H