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_traps_repository.h
+227 -201
View File
@@ -148,38 +148,38 @@ public:
static Traps NewEntity()
{
Traps entry{};
Traps e{};
entry.id = 0;
entry.zone = "";
entry.version = 0;
entry.x = 0;
entry.y = 0;
entry.z = 0;
entry.chance = 0;
entry.maxzdiff = 0;
entry.radius = 0;
entry.effect = 0;
entry.effectvalue = 0;
entry.effectvalue2 = 0;
entry.message = "";
entry.skill = 0;
entry.level = 1;
entry.respawn_time = 60;
entry.respawn_var = 0;
entry.triggered_number = 0;
entry.group = 0;
entry.despawn_when_triggered = 0;
entry.undetectable = 0;
entry.min_expansion = -1;
entry.max_expansion = -1;
entry.content_flags = "";
entry.content_flags_disabled = "";
e.id = 0;
e.zone = "";
e.version = 0;
e.x = 0;
e.y = 0;
e.z = 0;
e.chance = 0;
e.maxzdiff = 0;
e.radius = 0;
e.effect = 0;
e.effectvalue = 0;
e.effectvalue2 = 0;
e.message = "";
e.skill = 0;
e.level = 1;
e.respawn_time = 60;
e.respawn_var = 0;
e.triggered_number = 0;
e.group = 0;
e.despawn_when_triggered = 0;
e.undetectable = 0;
e.min_expansion = -1;
e.max_expansion = -1;
e.content_flags = "";
e.content_flags_disabled = "";
return entry;
return e;
}
static Traps GetTrapsEntry(
static Traps GetTraps(
const std::vector<Traps> &trapss,
int traps_id
)
@@ -208,35 +208,35 @@ public:
auto row = results.begin();
if (results.RowCount() == 1) {
Traps entry{};
Traps e{};
entry.id = atoi(row[0]);
entry.zone = row[1] ? row[1] : "";
entry.version = atoi(row[2]);
entry.x = atoi(row[3]);
entry.y = atoi(row[4]);
entry.z = atoi(row[5]);
entry.chance = atoi(row[6]);
entry.maxzdiff = static_cast<float>(atof(row[7]));
entry.radius = static_cast<float>(atof(row[8]));
entry.effect = atoi(row[9]);
entry.effectvalue = atoi(row[10]);
entry.effectvalue2 = atoi(row[11]);
entry.message = row[12] ? row[12] : "";
entry.skill = atoi(row[13]);
entry.level = atoi(row[14]);
entry.respawn_time = atoi(row[15]);
entry.respawn_var = atoi(row[16]);
entry.triggered_number = atoi(row[17]);
entry.group = atoi(row[18]);
entry.despawn_when_triggered = atoi(row[19]);
entry.undetectable = atoi(row[20]);
entry.min_expansion = atoi(row[21]);
entry.max_expansion = atoi(row[22]);
entry.content_flags = row[23] ? row[23] : "";
entry.content_flags_disabled = row[24] ? row[24] : "";
e.id = atoi(row[0]);
e.zone = row[1] ? row[1] : "";
e.version = atoi(row[2]);
e.x = atoi(row[3]);
e.y = atoi(row[4]);
e.z = atoi(row[5]);
e.chance = atoi(row[6]);
e.maxzdiff = static_cast<float>(atof(row[7]));
e.radius = static_cast<float>(atof(row[8]));
e.effect = atoi(row[9]);
e.effectvalue = atoi(row[10]);
e.effectvalue2 = atoi(row[11]);
e.message = row[12] ? row[12] : "";
e.skill = atoi(row[13]);
e.level = atoi(row[14]);
e.respawn_time = atoi(row[15]);
e.respawn_var = atoi(row[16]);
e.triggered_number = atoi(row[17]);
e.group = atoi(row[18]);
e.despawn_when_triggered = atoi(row[19]);
e.undetectable = atoi(row[20]);
e.min_expansion = atoi(row[21]);
e.max_expansion = atoi(row[22]);
e.content_flags = row[23] ? row[23] : "";
e.content_flags_disabled = row[24] ? row[24] : "";
return entry;
return e;
}
return NewEntity();
@@ -261,45 +261,45 @@ public:
static int UpdateOne(
Database& db,
Traps traps_entry
const Traps &e
)
{
std::vector<std::string> update_values;
std::vector<std::string> v;
auto columns = Columns();
update_values.push_back(columns[1] + " = '" + Strings::Escape(traps_entry.zone) + "'");
update_values.push_back(columns[2] + " = " + std::to_string(traps_entry.version));
update_values.push_back(columns[3] + " = " + std::to_string(traps_entry.x));
update_values.push_back(columns[4] + " = " + std::to_string(traps_entry.y));
update_values.push_back(columns[5] + " = " + std::to_string(traps_entry.z));
update_values.push_back(columns[6] + " = " + std::to_string(traps_entry.chance));
update_values.push_back(columns[7] + " = " + std::to_string(traps_entry.maxzdiff));
update_values.push_back(columns[8] + " = " + std::to_string(traps_entry.radius));
update_values.push_back(columns[9] + " = " + std::to_string(traps_entry.effect));
update_values.push_back(columns[10] + " = " + std::to_string(traps_entry.effectvalue));
update_values.push_back(columns[11] + " = " + std::to_string(traps_entry.effectvalue2));
update_values.push_back(columns[12] + " = '" + Strings::Escape(traps_entry.message) + "'");
update_values.push_back(columns[13] + " = " + std::to_string(traps_entry.skill));
update_values.push_back(columns[14] + " = " + std::to_string(traps_entry.level));
update_values.push_back(columns[15] + " = " + std::to_string(traps_entry.respawn_time));
update_values.push_back(columns[16] + " = " + std::to_string(traps_entry.respawn_var));
update_values.push_back(columns[17] + " = " + std::to_string(traps_entry.triggered_number));
update_values.push_back(columns[18] + " = " + std::to_string(traps_entry.group));
update_values.push_back(columns[19] + " = " + std::to_string(traps_entry.despawn_when_triggered));
update_values.push_back(columns[20] + " = " + std::to_string(traps_entry.undetectable));
update_values.push_back(columns[21] + " = " + std::to_string(traps_entry.min_expansion));
update_values.push_back(columns[22] + " = " + std::to_string(traps_entry.max_expansion));
update_values.push_back(columns[23] + " = '" + Strings::Escape(traps_entry.content_flags) + "'");
update_values.push_back(columns[24] + " = '" + Strings::Escape(traps_entry.content_flags_disabled) + "'");
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.x));
v.push_back(columns[4] + " = " + std::to_string(e.y));
v.push_back(columns[5] + " = " + std::to_string(e.z));
v.push_back(columns[6] + " = " + std::to_string(e.chance));
v.push_back(columns[7] + " = " + std::to_string(e.maxzdiff));
v.push_back(columns[8] + " = " + std::to_string(e.radius));
v.push_back(columns[9] + " = " + std::to_string(e.effect));
v.push_back(columns[10] + " = " + std::to_string(e.effectvalue));
v.push_back(columns[11] + " = " + std::to_string(e.effectvalue2));
v.push_back(columns[12] + " = '" + Strings::Escape(e.message) + "'");
v.push_back(columns[13] + " = " + std::to_string(e.skill));
v.push_back(columns[14] + " = " + std::to_string(e.level));
v.push_back(columns[15] + " = " + std::to_string(e.respawn_time));
v.push_back(columns[16] + " = " + std::to_string(e.respawn_var));
v.push_back(columns[17] + " = " + std::to_string(e.triggered_number));
v.push_back(columns[18] + " = " + std::to_string(e.group));
v.push_back(columns[19] + " = " + std::to_string(e.despawn_when_triggered));
v.push_back(columns[20] + " = " + std::to_string(e.undetectable));
v.push_back(columns[21] + " = " + std::to_string(e.min_expansion));
v.push_back(columns[22] + " = " + std::to_string(e.max_expansion));
v.push_back(columns[23] + " = '" + Strings::Escape(e.content_flags) + "'");
v.push_back(columns[24] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
Strings::Implode(", ", update_values),
Strings::Implode(", ", v),
PrimaryKey(),
traps_entry.id
e.id
)
);
@@ -308,95 +308,95 @@ public:
static Traps InsertOne(
Database& db,
Traps traps_entry
Traps e
)
{
std::vector<std::string> insert_values;
std::vector<std::string> v;
insert_values.push_back(std::to_string(traps_entry.id));
insert_values.push_back("'" + Strings::Escape(traps_entry.zone) + "'");
insert_values.push_back(std::to_string(traps_entry.version));
insert_values.push_back(std::to_string(traps_entry.x));
insert_values.push_back(std::to_string(traps_entry.y));
insert_values.push_back(std::to_string(traps_entry.z));
insert_values.push_back(std::to_string(traps_entry.chance));
insert_values.push_back(std::to_string(traps_entry.maxzdiff));
insert_values.push_back(std::to_string(traps_entry.radius));
insert_values.push_back(std::to_string(traps_entry.effect));
insert_values.push_back(std::to_string(traps_entry.effectvalue));
insert_values.push_back(std::to_string(traps_entry.effectvalue2));
insert_values.push_back("'" + Strings::Escape(traps_entry.message) + "'");
insert_values.push_back(std::to_string(traps_entry.skill));
insert_values.push_back(std::to_string(traps_entry.level));
insert_values.push_back(std::to_string(traps_entry.respawn_time));
insert_values.push_back(std::to_string(traps_entry.respawn_var));
insert_values.push_back(std::to_string(traps_entry.triggered_number));
insert_values.push_back(std::to_string(traps_entry.group));
insert_values.push_back(std::to_string(traps_entry.despawn_when_triggered));
insert_values.push_back(std::to_string(traps_entry.undetectable));
insert_values.push_back(std::to_string(traps_entry.min_expansion));
insert_values.push_back(std::to_string(traps_entry.max_expansion));
insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags) + "'");
insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags_disabled) + "'");
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.x));
v.push_back(std::to_string(e.y));
v.push_back(std::to_string(e.z));
v.push_back(std::to_string(e.chance));
v.push_back(std::to_string(e.maxzdiff));
v.push_back(std::to_string(e.radius));
v.push_back(std::to_string(e.effect));
v.push_back(std::to_string(e.effectvalue));
v.push_back(std::to_string(e.effectvalue2));
v.push_back("'" + Strings::Escape(e.message) + "'");
v.push_back(std::to_string(e.skill));
v.push_back(std::to_string(e.level));
v.push_back(std::to_string(e.respawn_time));
v.push_back(std::to_string(e.respawn_var));
v.push_back(std::to_string(e.triggered_number));
v.push_back(std::to_string(e.group));
v.push_back(std::to_string(e.despawn_when_triggered));
v.push_back(std::to_string(e.undetectable));
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 ({})",
BaseInsert(),
Strings::Implode(",", insert_values)
Strings::Implode(",", v)
)
);
if (results.Success()) {
traps_entry.id = results.LastInsertedID();
return traps_entry;
e.id = results.LastInsertedID();
return e;
}
traps_entry = NewEntity();
e = NewEntity();
return traps_entry;
return e;
}
static int InsertMany(
Database& db,
std::vector<Traps> traps_entries
const std::vector<Traps> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &traps_entry: traps_entries) {
std::vector<std::string> insert_values;
for (auto &e: entries) {
std::vector<std::string> v;
insert_values.push_back(std::to_string(traps_entry.id));
insert_values.push_back("'" + Strings::Escape(traps_entry.zone) + "'");
insert_values.push_back(std::to_string(traps_entry.version));
insert_values.push_back(std::to_string(traps_entry.x));
insert_values.push_back(std::to_string(traps_entry.y));
insert_values.push_back(std::to_string(traps_entry.z));
insert_values.push_back(std::to_string(traps_entry.chance));
insert_values.push_back(std::to_string(traps_entry.maxzdiff));
insert_values.push_back(std::to_string(traps_entry.radius));
insert_values.push_back(std::to_string(traps_entry.effect));
insert_values.push_back(std::to_string(traps_entry.effectvalue));
insert_values.push_back(std::to_string(traps_entry.effectvalue2));
insert_values.push_back("'" + Strings::Escape(traps_entry.message) + "'");
insert_values.push_back(std::to_string(traps_entry.skill));
insert_values.push_back(std::to_string(traps_entry.level));
insert_values.push_back(std::to_string(traps_entry.respawn_time));
insert_values.push_back(std::to_string(traps_entry.respawn_var));
insert_values.push_back(std::to_string(traps_entry.triggered_number));
insert_values.push_back(std::to_string(traps_entry.group));
insert_values.push_back(std::to_string(traps_entry.despawn_when_triggered));
insert_values.push_back(std::to_string(traps_entry.undetectable));
insert_values.push_back(std::to_string(traps_entry.min_expansion));
insert_values.push_back(std::to_string(traps_entry.max_expansion));
insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags) + "'");
insert_values.push_back("'" + Strings::Escape(traps_entry.content_flags_disabled) + "'");
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.x));
v.push_back(std::to_string(e.y));
v.push_back(std::to_string(e.z));
v.push_back(std::to_string(e.chance));
v.push_back(std::to_string(e.maxzdiff));
v.push_back(std::to_string(e.radius));
v.push_back(std::to_string(e.effect));
v.push_back(std::to_string(e.effectvalue));
v.push_back(std::to_string(e.effectvalue2));
v.push_back("'" + Strings::Escape(e.message) + "'");
v.push_back(std::to_string(e.skill));
v.push_back(std::to_string(e.level));
v.push_back(std::to_string(e.respawn_time));
v.push_back(std::to_string(e.respawn_var));
v.push_back(std::to_string(e.triggered_number));
v.push_back(std::to_string(e.group));
v.push_back(std::to_string(e.despawn_when_triggered));
v.push_back(std::to_string(e.undetectable));
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(",", 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(
@@ -423,41 +423,41 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Traps entry{};
Traps e{};
entry.id = atoi(row[0]);
entry.zone = row[1] ? row[1] : "";
entry.version = atoi(row[2]);
entry.x = atoi(row[3]);
entry.y = atoi(row[4]);
entry.z = atoi(row[5]);
entry.chance = atoi(row[6]);
entry.maxzdiff = static_cast<float>(atof(row[7]));
entry.radius = static_cast<float>(atof(row[8]));
entry.effect = atoi(row[9]);
entry.effectvalue = atoi(row[10]);
entry.effectvalue2 = atoi(row[11]);
entry.message = row[12] ? row[12] : "";
entry.skill = atoi(row[13]);
entry.level = atoi(row[14]);
entry.respawn_time = atoi(row[15]);
entry.respawn_var = atoi(row[16]);
entry.triggered_number = atoi(row[17]);
entry.group = atoi(row[18]);
entry.despawn_when_triggered = atoi(row[19]);
entry.undetectable = atoi(row[20]);
entry.min_expansion = atoi(row[21]);
entry.max_expansion = atoi(row[22]);
entry.content_flags = row[23] ? row[23] : "";
entry.content_flags_disabled = row[24] ? row[24] : "";
e.id = atoi(row[0]);
e.zone = row[1] ? row[1] : "";
e.version = atoi(row[2]);
e.x = atoi(row[3]);
e.y = atoi(row[4]);
e.z = atoi(row[5]);
e.chance = atoi(row[6]);
e.maxzdiff = static_cast<float>(atof(row[7]));
e.radius = static_cast<float>(atof(row[8]));
e.effect = atoi(row[9]);
e.effectvalue = atoi(row[10]);
e.effectvalue2 = atoi(row[11]);
e.message = row[12] ? row[12] : "";
e.skill = atoi(row[13]);
e.level = atoi(row[14]);
e.respawn_time = atoi(row[15]);
e.respawn_var = atoi(row[16]);
e.triggered_number = atoi(row[17]);
e.group = atoi(row[18]);
e.despawn_when_triggered = atoi(row[19]);
e.undetectable = atoi(row[20]);
e.min_expansion = atoi(row[21]);
e.max_expansion = atoi(row[22]);
e.content_flags = row[23] ? row[23] : "";
e.content_flags_disabled = row[24] ? row[24] : "";
all_entries.push_back(entry);
all_entries.push_back(e);
}
return all_entries;
}
static std::vector<Traps> GetWhere(Database& db, std::string where_filter)
static std::vector<Traps> GetWhere(Database& db, const std::string &where_filter)
{
std::vector<Traps> all_entries;
@@ -472,41 +472,41 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Traps entry{};
Traps e{};
entry.id = atoi(row[0]);
entry.zone = row[1] ? row[1] : "";
entry.version = atoi(row[2]);
entry.x = atoi(row[3]);
entry.y = atoi(row[4]);
entry.z = atoi(row[5]);
entry.chance = atoi(row[6]);
entry.maxzdiff = static_cast<float>(atof(row[7]));
entry.radius = static_cast<float>(atof(row[8]));
entry.effect = atoi(row[9]);
entry.effectvalue = atoi(row[10]);
entry.effectvalue2 = atoi(row[11]);
entry.message = row[12] ? row[12] : "";
entry.skill = atoi(row[13]);
entry.level = atoi(row[14]);
entry.respawn_time = atoi(row[15]);
entry.respawn_var = atoi(row[16]);
entry.triggered_number = atoi(row[17]);
entry.group = atoi(row[18]);
entry.despawn_when_triggered = atoi(row[19]);
entry.undetectable = atoi(row[20]);
entry.min_expansion = atoi(row[21]);
entry.max_expansion = atoi(row[22]);
entry.content_flags = row[23] ? row[23] : "";
entry.content_flags_disabled = row[24] ? row[24] : "";
e.id = atoi(row[0]);
e.zone = row[1] ? row[1] : "";
e.version = atoi(row[2]);
e.x = atoi(row[3]);
e.y = atoi(row[4]);
e.z = atoi(row[5]);
e.chance = atoi(row[6]);
e.maxzdiff = static_cast<float>(atof(row[7]));
e.radius = static_cast<float>(atof(row[8]));
e.effect = atoi(row[9]);
e.effectvalue = atoi(row[10]);
e.effectvalue2 = atoi(row[11]);
e.message = row[12] ? row[12] : "";
e.skill = atoi(row[13]);
e.level = atoi(row[14]);
e.respawn_time = atoi(row[15]);
e.respawn_var = atoi(row[16]);
e.triggered_number = atoi(row[17]);
e.group = atoi(row[18]);
e.despawn_when_triggered = atoi(row[19]);
e.undetectable = atoi(row[20]);
e.min_expansion = atoi(row[21]);
e.max_expansion = atoi(row[22]);
e.content_flags = row[23] ? row[23] : "";
e.content_flags_disabled = row[24] ? row[24] : "";
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(
@@ -531,6 +531,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_TRAPS_REPOSITORY_H