mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 09:06:46 +00:00
[Repositories] Add GetMaxId, Count (#2371)
* [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
GitHub
@@ -112,26 +112,26 @@ public:
|
||||
|
||||
static Bugs NewEntity()
|
||||
{
|
||||
Bugs entry{};
|
||||
Bugs e{};
|
||||
|
||||
entry.id = 0;
|
||||
entry.zone = "";
|
||||
entry.name = "";
|
||||
entry.ui = "";
|
||||
entry.x = 0;
|
||||
entry.y = 0;
|
||||
entry.z = 0;
|
||||
entry.type = "";
|
||||
entry.flag = 0;
|
||||
entry.target = "";
|
||||
entry.bug = "";
|
||||
entry.date = 0;
|
||||
entry.status = 0;
|
||||
e.id = 0;
|
||||
e.zone = "";
|
||||
e.name = "";
|
||||
e.ui = "";
|
||||
e.x = 0;
|
||||
e.y = 0;
|
||||
e.z = 0;
|
||||
e.type = "";
|
||||
e.flag = 0;
|
||||
e.target = "";
|
||||
e.bug = "";
|
||||
e.date = 0;
|
||||
e.status = 0;
|
||||
|
||||
return entry;
|
||||
return e;
|
||||
}
|
||||
|
||||
static Bugs GetBugsEntry(
|
||||
static Bugs GetBugs(
|
||||
const std::vector<Bugs> &bugss,
|
||||
int bugs_id
|
||||
)
|
||||
@@ -160,23 +160,23 @@ public:
|
||||
|
||||
auto row = results.begin();
|
||||
if (results.RowCount() == 1) {
|
||||
Bugs entry{};
|
||||
Bugs e{};
|
||||
|
||||
entry.id = atoi(row[0]);
|
||||
entry.zone = row[1] ? row[1] : "";
|
||||
entry.name = row[2] ? row[2] : "";
|
||||
entry.ui = row[3] ? row[3] : "";
|
||||
entry.x = static_cast<float>(atof(row[4]));
|
||||
entry.y = static_cast<float>(atof(row[5]));
|
||||
entry.z = static_cast<float>(atof(row[6]));
|
||||
entry.type = row[7] ? row[7] : "";
|
||||
entry.flag = atoi(row[8]);
|
||||
entry.target = row[9] ? row[9] : "";
|
||||
entry.bug = row[10] ? row[10] : "";
|
||||
entry.date = row[11] ? row[11] : "";
|
||||
entry.status = atoi(row[12]);
|
||||
e.id = atoi(row[0]);
|
||||
e.zone = row[1] ? row[1] : "";
|
||||
e.name = row[2] ? row[2] : "";
|
||||
e.ui = row[3] ? row[3] : "";
|
||||
e.x = static_cast<float>(atof(row[4]));
|
||||
e.y = static_cast<float>(atof(row[5]));
|
||||
e.z = static_cast<float>(atof(row[6]));
|
||||
e.type = row[7] ? row[7] : "";
|
||||
e.flag = atoi(row[8]);
|
||||
e.target = row[9] ? row[9] : "";
|
||||
e.bug = row[10] ? row[10] : "";
|
||||
e.date = row[11] ? row[11] : "";
|
||||
e.status = atoi(row[12]);
|
||||
|
||||
return entry;
|
||||
return e;
|
||||
}
|
||||
|
||||
return NewEntity();
|
||||
@@ -201,33 +201,33 @@ public:
|
||||
|
||||
static int UpdateOne(
|
||||
Database& db,
|
||||
Bugs bugs_entry
|
||||
const Bugs &e
|
||||
)
|
||||
{
|
||||
std::vector<std::string> update_values;
|
||||
std::vector<std::string> v;
|
||||
|
||||
auto columns = Columns();
|
||||
|
||||
update_values.push_back(columns[1] + " = '" + Strings::Escape(bugs_entry.zone) + "'");
|
||||
update_values.push_back(columns[2] + " = '" + Strings::Escape(bugs_entry.name) + "'");
|
||||
update_values.push_back(columns[3] + " = '" + Strings::Escape(bugs_entry.ui) + "'");
|
||||
update_values.push_back(columns[4] + " = " + std::to_string(bugs_entry.x));
|
||||
update_values.push_back(columns[5] + " = " + std::to_string(bugs_entry.y));
|
||||
update_values.push_back(columns[6] + " = " + std::to_string(bugs_entry.z));
|
||||
update_values.push_back(columns[7] + " = '" + Strings::Escape(bugs_entry.type) + "'");
|
||||
update_values.push_back(columns[8] + " = " + std::to_string(bugs_entry.flag));
|
||||
update_values.push_back(columns[9] + " = '" + Strings::Escape(bugs_entry.target) + "'");
|
||||
update_values.push_back(columns[10] + " = '" + Strings::Escape(bugs_entry.bug) + "'");
|
||||
update_values.push_back(columns[11] + " = '" + Strings::Escape(bugs_entry.date) + "'");
|
||||
update_values.push_back(columns[12] + " = " + std::to_string(bugs_entry.status));
|
||||
v.push_back(columns[1] + " = '" + Strings::Escape(e.zone) + "'");
|
||||
v.push_back(columns[2] + " = '" + Strings::Escape(e.name) + "'");
|
||||
v.push_back(columns[3] + " = '" + Strings::Escape(e.ui) + "'");
|
||||
v.push_back(columns[4] + " = " + std::to_string(e.x));
|
||||
v.push_back(columns[5] + " = " + std::to_string(e.y));
|
||||
v.push_back(columns[6] + " = " + std::to_string(e.z));
|
||||
v.push_back(columns[7] + " = '" + Strings::Escape(e.type) + "'");
|
||||
v.push_back(columns[8] + " = " + std::to_string(e.flag));
|
||||
v.push_back(columns[9] + " = '" + Strings::Escape(e.target) + "'");
|
||||
v.push_back(columns[10] + " = '" + Strings::Escape(e.bug) + "'");
|
||||
v.push_back(columns[11] + " = '" + Strings::Escape(e.date) + "'");
|
||||
v.push_back(columns[12] + " = " + std::to_string(e.status));
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"UPDATE {} SET {} WHERE {} = {}",
|
||||
TableName(),
|
||||
Strings::Implode(", ", update_values),
|
||||
Strings::Implode(", ", v),
|
||||
PrimaryKey(),
|
||||
bugs_entry.id
|
||||
e.id
|
||||
)
|
||||
);
|
||||
|
||||
@@ -236,71 +236,71 @@ public:
|
||||
|
||||
static Bugs InsertOne(
|
||||
Database& db,
|
||||
Bugs bugs_entry
|
||||
Bugs e
|
||||
)
|
||||
{
|
||||
std::vector<std::string> insert_values;
|
||||
std::vector<std::string> v;
|
||||
|
||||
insert_values.push_back(std::to_string(bugs_entry.id));
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.zone) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.name) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.ui) + "'");
|
||||
insert_values.push_back(std::to_string(bugs_entry.x));
|
||||
insert_values.push_back(std::to_string(bugs_entry.y));
|
||||
insert_values.push_back(std::to_string(bugs_entry.z));
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.type) + "'");
|
||||
insert_values.push_back(std::to_string(bugs_entry.flag));
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.target) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.bug) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.date) + "'");
|
||||
insert_values.push_back(std::to_string(bugs_entry.status));
|
||||
v.push_back(std::to_string(e.id));
|
||||
v.push_back("'" + Strings::Escape(e.zone) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.name) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.ui) + "'");
|
||||
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("'" + Strings::Escape(e.type) + "'");
|
||||
v.push_back(std::to_string(e.flag));
|
||||
v.push_back("'" + Strings::Escape(e.target) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.bug) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.date) + "'");
|
||||
v.push_back(std::to_string(e.status));
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES ({})",
|
||||
BaseInsert(),
|
||||
Strings::Implode(",", insert_values)
|
||||
Strings::Implode(",", v)
|
||||
)
|
||||
);
|
||||
|
||||
if (results.Success()) {
|
||||
bugs_entry.id = results.LastInsertedID();
|
||||
return bugs_entry;
|
||||
e.id = results.LastInsertedID();
|
||||
return e;
|
||||
}
|
||||
|
||||
bugs_entry = NewEntity();
|
||||
e = NewEntity();
|
||||
|
||||
return bugs_entry;
|
||||
return e;
|
||||
}
|
||||
|
||||
static int InsertMany(
|
||||
Database& db,
|
||||
std::vector<Bugs> bugs_entries
|
||||
const std::vector<Bugs> &entries
|
||||
)
|
||||
{
|
||||
std::vector<std::string> insert_chunks;
|
||||
|
||||
for (auto &bugs_entry: bugs_entries) {
|
||||
std::vector<std::string> insert_values;
|
||||
for (auto &e: entries) {
|
||||
std::vector<std::string> v;
|
||||
|
||||
insert_values.push_back(std::to_string(bugs_entry.id));
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.zone) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.name) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.ui) + "'");
|
||||
insert_values.push_back(std::to_string(bugs_entry.x));
|
||||
insert_values.push_back(std::to_string(bugs_entry.y));
|
||||
insert_values.push_back(std::to_string(bugs_entry.z));
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.type) + "'");
|
||||
insert_values.push_back(std::to_string(bugs_entry.flag));
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.target) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.bug) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(bugs_entry.date) + "'");
|
||||
insert_values.push_back(std::to_string(bugs_entry.status));
|
||||
v.push_back(std::to_string(e.id));
|
||||
v.push_back("'" + Strings::Escape(e.zone) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.name) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.ui) + "'");
|
||||
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("'" + Strings::Escape(e.type) + "'");
|
||||
v.push_back(std::to_string(e.flag));
|
||||
v.push_back("'" + Strings::Escape(e.target) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.bug) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.date) + "'");
|
||||
v.push_back(std::to_string(e.status));
|
||||
|
||||
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) {
|
||||
Bugs entry{};
|
||||
Bugs e{};
|
||||
|
||||
entry.id = atoi(row[0]);
|
||||
entry.zone = row[1] ? row[1] : "";
|
||||
entry.name = row[2] ? row[2] : "";
|
||||
entry.ui = row[3] ? row[3] : "";
|
||||
entry.x = static_cast<float>(atof(row[4]));
|
||||
entry.y = static_cast<float>(atof(row[5]));
|
||||
entry.z = static_cast<float>(atof(row[6]));
|
||||
entry.type = row[7] ? row[7] : "";
|
||||
entry.flag = atoi(row[8]);
|
||||
entry.target = row[9] ? row[9] : "";
|
||||
entry.bug = row[10] ? row[10] : "";
|
||||
entry.date = row[11] ? row[11] : "";
|
||||
entry.status = atoi(row[12]);
|
||||
e.id = atoi(row[0]);
|
||||
e.zone = row[1] ? row[1] : "";
|
||||
e.name = row[2] ? row[2] : "";
|
||||
e.ui = row[3] ? row[3] : "";
|
||||
e.x = static_cast<float>(atof(row[4]));
|
||||
e.y = static_cast<float>(atof(row[5]));
|
||||
e.z = static_cast<float>(atof(row[6]));
|
||||
e.type = row[7] ? row[7] : "";
|
||||
e.flag = atoi(row[8]);
|
||||
e.target = row[9] ? row[9] : "";
|
||||
e.bug = row[10] ? row[10] : "";
|
||||
e.date = row[11] ? row[11] : "";
|
||||
e.status = atoi(row[12]);
|
||||
|
||||
all_entries.push_back(entry);
|
||||
all_entries.push_back(e);
|
||||
}
|
||||
|
||||
return all_entries;
|
||||
}
|
||||
|
||||
static std::vector<Bugs> GetWhere(Database& db, std::string where_filter)
|
||||
static std::vector<Bugs> GetWhere(Database& db, const std::string &where_filter)
|
||||
{
|
||||
std::vector<Bugs> all_entries;
|
||||
|
||||
@@ -364,29 +364,29 @@ public:
|
||||
all_entries.reserve(results.RowCount());
|
||||
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
Bugs entry{};
|
||||
Bugs e{};
|
||||
|
||||
entry.id = atoi(row[0]);
|
||||
entry.zone = row[1] ? row[1] : "";
|
||||
entry.name = row[2] ? row[2] : "";
|
||||
entry.ui = row[3] ? row[3] : "";
|
||||
entry.x = static_cast<float>(atof(row[4]));
|
||||
entry.y = static_cast<float>(atof(row[5]));
|
||||
entry.z = static_cast<float>(atof(row[6]));
|
||||
entry.type = row[7] ? row[7] : "";
|
||||
entry.flag = atoi(row[8]);
|
||||
entry.target = row[9] ? row[9] : "";
|
||||
entry.bug = row[10] ? row[10] : "";
|
||||
entry.date = row[11] ? row[11] : "";
|
||||
entry.status = atoi(row[12]);
|
||||
e.id = atoi(row[0]);
|
||||
e.zone = row[1] ? row[1] : "";
|
||||
e.name = row[2] ? row[2] : "";
|
||||
e.ui = row[3] ? row[3] : "";
|
||||
e.x = static_cast<float>(atof(row[4]));
|
||||
e.y = static_cast<float>(atof(row[5]));
|
||||
e.z = static_cast<float>(atof(row[6]));
|
||||
e.type = row[7] ? row[7] : "";
|
||||
e.flag = atoi(row[8]);
|
||||
e.target = row[9] ? row[9] : "";
|
||||
e.bug = row[10] ? row[10] : "";
|
||||
e.date = row[11] ? row[11] : "";
|
||||
e.status = 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_BUGS_REPOSITORY_H
|
||||
|
||||
Reference in New Issue
Block a user