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_spawngroup_repository.h
+143 -117
View File
@@ -112,26 +112,26 @@ public:
static Spawngroup NewEntity()
{
Spawngroup entry{};
Spawngroup e{};
entry.id = 0;
entry.name = "";
entry.spawn_limit = 0;
entry.dist = 0;
entry.max_x = 0;
entry.min_x = 0;
entry.max_y = 0;
entry.min_y = 0;
entry.delay = 45000;
entry.mindelay = 15000;
entry.despawn = 0;
entry.despawn_timer = 100;
entry.wp_spawns = 0;
e.id = 0;
e.name = "";
e.spawn_limit = 0;
e.dist = 0;
e.max_x = 0;
e.min_x = 0;
e.max_y = 0;
e.min_y = 0;
e.delay = 45000;
e.mindelay = 15000;
e.despawn = 0;
e.despawn_timer = 100;
e.wp_spawns = 0;
return entry;
return e;
}
static Spawngroup GetSpawngroupEntry(
static Spawngroup GetSpawngroup(
const std::vector<Spawngroup> &spawngroups,
int spawngroup_id
)
@@ -160,23 +160,23 @@ public:
auto row = results.begin();
if (results.RowCount() == 1) {
Spawngroup entry{};
Spawngroup e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.spawn_limit = atoi(row[2]);
entry.dist = static_cast<float>(atof(row[3]));
entry.max_x = static_cast<float>(atof(row[4]));
entry.min_x = static_cast<float>(atof(row[5]));
entry.max_y = static_cast<float>(atof(row[6]));
entry.min_y = static_cast<float>(atof(row[7]));
entry.delay = atoi(row[8]);
entry.mindelay = atoi(row[9]);
entry.despawn = atoi(row[10]);
entry.despawn_timer = atoi(row[11]);
entry.wp_spawns = atoi(row[12]);
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.spawn_limit = atoi(row[2]);
e.dist = static_cast<float>(atof(row[3]));
e.max_x = static_cast<float>(atof(row[4]));
e.min_x = static_cast<float>(atof(row[5]));
e.max_y = static_cast<float>(atof(row[6]));
e.min_y = static_cast<float>(atof(row[7]));
e.delay = atoi(row[8]);
e.mindelay = atoi(row[9]);
e.despawn = atoi(row[10]);
e.despawn_timer = atoi(row[11]);
e.wp_spawns = atoi(row[12]);
return entry;
return e;
}
return NewEntity();
@@ -201,33 +201,33 @@ public:
static int UpdateOne(
Database& db,
Spawngroup spawngroup_entry
const Spawngroup &e
)
{
std::vector<std::string> update_values;
std::vector<std::string> v;
auto columns = Columns();
update_values.push_back(columns[1] + " = '" + Strings::Escape(spawngroup_entry.name) + "'");
update_values.push_back(columns[2] + " = " + std::to_string(spawngroup_entry.spawn_limit));
update_values.push_back(columns[3] + " = " + std::to_string(spawngroup_entry.dist));
update_values.push_back(columns[4] + " = " + std::to_string(spawngroup_entry.max_x));
update_values.push_back(columns[5] + " = " + std::to_string(spawngroup_entry.min_x));
update_values.push_back(columns[6] + " = " + std::to_string(spawngroup_entry.max_y));
update_values.push_back(columns[7] + " = " + std::to_string(spawngroup_entry.min_y));
update_values.push_back(columns[8] + " = " + std::to_string(spawngroup_entry.delay));
update_values.push_back(columns[9] + " = " + std::to_string(spawngroup_entry.mindelay));
update_values.push_back(columns[10] + " = " + std::to_string(spawngroup_entry.despawn));
update_values.push_back(columns[11] + " = " + std::to_string(spawngroup_entry.despawn_timer));
update_values.push_back(columns[12] + " = " + std::to_string(spawngroup_entry.wp_spawns));
v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
v.push_back(columns[2] + " = " + std::to_string(e.spawn_limit));
v.push_back(columns[3] + " = " + std::to_string(e.dist));
v.push_back(columns[4] + " = " + std::to_string(e.max_x));
v.push_back(columns[5] + " = " + std::to_string(e.min_x));
v.push_back(columns[6] + " = " + std::to_string(e.max_y));
v.push_back(columns[7] + " = " + std::to_string(e.min_y));
v.push_back(columns[8] + " = " + std::to_string(e.delay));
v.push_back(columns[9] + " = " + std::to_string(e.mindelay));
v.push_back(columns[10] + " = " + std::to_string(e.despawn));
v.push_back(columns[11] + " = " + std::to_string(e.despawn_timer));
v.push_back(columns[12] + " = " + std::to_string(e.wp_spawns));
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
Strings::Implode(", ", update_values),
Strings::Implode(", ", v),
PrimaryKey(),
spawngroup_entry.id
e.id
)
);
@@ -236,71 +236,71 @@ public:
static Spawngroup InsertOne(
Database& db,
Spawngroup spawngroup_entry
Spawngroup e
)
{
std::vector<std::string> insert_values;
std::vector<std::string> v;
insert_values.push_back(std::to_string(spawngroup_entry.id));
insert_values.push_back("'" + Strings::Escape(spawngroup_entry.name) + "'");
insert_values.push_back(std::to_string(spawngroup_entry.spawn_limit));
insert_values.push_back(std::to_string(spawngroup_entry.dist));
insert_values.push_back(std::to_string(spawngroup_entry.max_x));
insert_values.push_back(std::to_string(spawngroup_entry.min_x));
insert_values.push_back(std::to_string(spawngroup_entry.max_y));
insert_values.push_back(std::to_string(spawngroup_entry.min_y));
insert_values.push_back(std::to_string(spawngroup_entry.delay));
insert_values.push_back(std::to_string(spawngroup_entry.mindelay));
insert_values.push_back(std::to_string(spawngroup_entry.despawn));
insert_values.push_back(std::to_string(spawngroup_entry.despawn_timer));
insert_values.push_back(std::to_string(spawngroup_entry.wp_spawns));
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.spawn_limit));
v.push_back(std::to_string(e.dist));
v.push_back(std::to_string(e.max_x));
v.push_back(std::to_string(e.min_x));
v.push_back(std::to_string(e.max_y));
v.push_back(std::to_string(e.min_y));
v.push_back(std::to_string(e.delay));
v.push_back(std::to_string(e.mindelay));
v.push_back(std::to_string(e.despawn));
v.push_back(std::to_string(e.despawn_timer));
v.push_back(std::to_string(e.wp_spawns));
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES ({})",
BaseInsert(),
Strings::Implode(",", insert_values)
Strings::Implode(",", v)
)
);
if (results.Success()) {
spawngroup_entry.id = results.LastInsertedID();
return spawngroup_entry;
e.id = results.LastInsertedID();
return e;
}
spawngroup_entry = NewEntity();
e = NewEntity();
return spawngroup_entry;
return e;
}
static int InsertMany(
Database& db,
std::vector<Spawngroup> spawngroup_entries
const std::vector<Spawngroup> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &spawngroup_entry: spawngroup_entries) {
std::vector<std::string> insert_values;
for (auto &e: entries) {
std::vector<std::string> v;
insert_values.push_back(std::to_string(spawngroup_entry.id));
insert_values.push_back("'" + Strings::Escape(spawngroup_entry.name) + "'");
insert_values.push_back(std::to_string(spawngroup_entry.spawn_limit));
insert_values.push_back(std::to_string(spawngroup_entry.dist));
insert_values.push_back(std::to_string(spawngroup_entry.max_x));
insert_values.push_back(std::to_string(spawngroup_entry.min_x));
insert_values.push_back(std::to_string(spawngroup_entry.max_y));
insert_values.push_back(std::to_string(spawngroup_entry.min_y));
insert_values.push_back(std::to_string(spawngroup_entry.delay));
insert_values.push_back(std::to_string(spawngroup_entry.mindelay));
insert_values.push_back(std::to_string(spawngroup_entry.despawn));
insert_values.push_back(std::to_string(spawngroup_entry.despawn_timer));
insert_values.push_back(std::to_string(spawngroup_entry.wp_spawns));
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.spawn_limit));
v.push_back(std::to_string(e.dist));
v.push_back(std::to_string(e.max_x));
v.push_back(std::to_string(e.min_x));
v.push_back(std::to_string(e.max_y));
v.push_back(std::to_string(e.min_y));
v.push_back(std::to_string(e.delay));
v.push_back(std::to_string(e.mindelay));
v.push_back(std::to_string(e.despawn));
v.push_back(std::to_string(e.despawn_timer));
v.push_back(std::to_string(e.wp_spawns));
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(
@@ -327,29 +327,29 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Spawngroup entry{};
Spawngroup e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.spawn_limit = atoi(row[2]);
entry.dist = static_cast<float>(atof(row[3]));
entry.max_x = static_cast<float>(atof(row[4]));
entry.min_x = static_cast<float>(atof(row[5]));
entry.max_y = static_cast<float>(atof(row[6]));
entry.min_y = static_cast<float>(atof(row[7]));
entry.delay = atoi(row[8]);
entry.mindelay = atoi(row[9]);
entry.despawn = atoi(row[10]);
entry.despawn_timer = atoi(row[11]);
entry.wp_spawns = atoi(row[12]);
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.spawn_limit = atoi(row[2]);
e.dist = static_cast<float>(atof(row[3]));
e.max_x = static_cast<float>(atof(row[4]));
e.min_x = static_cast<float>(atof(row[5]));
e.max_y = static_cast<float>(atof(row[6]));
e.min_y = static_cast<float>(atof(row[7]));
e.delay = atoi(row[8]);
e.mindelay = atoi(row[9]);
e.despawn = atoi(row[10]);
e.despawn_timer = atoi(row[11]);
e.wp_spawns = atoi(row[12]);
all_entries.push_back(entry);
all_entries.push_back(e);
}
return all_entries;
}
static std::vector<Spawngroup> GetWhere(Database& db, std::string where_filter)
static std::vector<Spawngroup> GetWhere(Database& db, const std::string &where_filter)
{
std::vector<Spawngroup> all_entries;
@@ -364,29 +364,29 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Spawngroup entry{};
Spawngroup e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.spawn_limit = atoi(row[2]);
entry.dist = static_cast<float>(atof(row[3]));
entry.max_x = static_cast<float>(atof(row[4]));
entry.min_x = static_cast<float>(atof(row[5]));
entry.max_y = static_cast<float>(atof(row[6]));
entry.min_y = static_cast<float>(atof(row[7]));
entry.delay = atoi(row[8]);
entry.mindelay = atoi(row[9]);
entry.despawn = atoi(row[10]);
entry.despawn_timer = atoi(row[11]);
entry.wp_spawns = atoi(row[12]);
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.spawn_limit = atoi(row[2]);
e.dist = static_cast<float>(atof(row[3]));
e.max_x = static_cast<float>(atof(row[4]));
e.min_x = static_cast<float>(atof(row[5]));
e.max_y = static_cast<float>(atof(row[6]));
e.min_y = static_cast<float>(atof(row[7]));
e.delay = atoi(row[8]);
e.mindelay = atoi(row[9]);
e.despawn = atoi(row[10]);
e.despawn_timer = atoi(row[11]);
e.wp_spawns = atoi(row[12]);
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(
@@ -411,6 +411,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_SPAWNGROUP_REPOSITORY_H