pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-25 10:28:23 +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_tradeskill_recipe_repository.h
+157 -131
View File
@@ -118,28 +118,28 @@ public:
static TradeskillRecipe NewEntity()
{
TradeskillRecipe entry{};
TradeskillRecipe e{};
entry.id = 0;
entry.name = "";
entry.tradeskill = 0;
entry.skillneeded = 0;
entry.trivial = 0;
entry.nofail = 0;
entry.replace_container = 0;
entry.notes = "";
entry.must_learn = 0;
entry.quest = 0;
entry.enabled = 1;
entry.min_expansion = -1;
entry.max_expansion = -1;
entry.content_flags = "";
entry.content_flags_disabled = "";
e.id = 0;
e.name = "";
e.tradeskill = 0;
e.skillneeded = 0;
e.trivial = 0;
e.nofail = 0;
e.replace_container = 0;
e.notes = "";
e.must_learn = 0;
e.quest = 0;
e.enabled = 1;
e.min_expansion = -1;
e.max_expansion = -1;
e.content_flags = "";
e.content_flags_disabled = "";
return entry;
return e;
}
static TradeskillRecipe GetTradeskillRecipeEntry(
static TradeskillRecipe GetTradeskillRecipe(
const std::vector<TradeskillRecipe> &tradeskill_recipes,
int tradeskill_recipe_id
)
@@ -168,25 +168,25 @@ public:
auto row = results.begin();
if (results.RowCount() == 1) {
TradeskillRecipe entry{};
TradeskillRecipe e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.tradeskill = atoi(row[2]);
entry.skillneeded = atoi(row[3]);
entry.trivial = atoi(row[4]);
entry.nofail = atoi(row[5]);
entry.replace_container = atoi(row[6]);
entry.notes = row[7] ? row[7] : "";
entry.must_learn = atoi(row[8]);
entry.quest = atoi(row[9]);
entry.enabled = atoi(row[10]);
entry.min_expansion = atoi(row[11]);
entry.max_expansion = atoi(row[12]);
entry.content_flags = row[13] ? row[13] : "";
entry.content_flags_disabled = row[14] ? row[14] : "";
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.tradeskill = atoi(row[2]);
e.skillneeded = atoi(row[3]);
e.trivial = atoi(row[4]);
e.nofail = atoi(row[5]);
e.replace_container = atoi(row[6]);
e.notes = row[7] ? row[7] : "";
e.must_learn = atoi(row[8]);
e.quest = atoi(row[9]);
e.enabled = atoi(row[10]);
e.min_expansion = atoi(row[11]);
e.max_expansion = atoi(row[12]);
e.content_flags = row[13] ? row[13] : "";
e.content_flags_disabled = row[14] ? row[14] : "";
return entry;
return e;
}
return NewEntity();
@@ -211,35 +211,35 @@ public:
static int UpdateOne(
Database& db,
TradeskillRecipe tradeskill_recipe_entry
const TradeskillRecipe &e
)
{
std::vector<std::string> update_values;
std::vector<std::string> v;
auto columns = Columns();
update_values.push_back(columns[1] + " = '" + Strings::Escape(tradeskill_recipe_entry.name) + "'");
update_values.push_back(columns[2] + " = " + std::to_string(tradeskill_recipe_entry.tradeskill));
update_values.push_back(columns[3] + " = " + std::to_string(tradeskill_recipe_entry.skillneeded));
update_values.push_back(columns[4] + " = " + std::to_string(tradeskill_recipe_entry.trivial));
update_values.push_back(columns[5] + " = " + std::to_string(tradeskill_recipe_entry.nofail));
update_values.push_back(columns[6] + " = " + std::to_string(tradeskill_recipe_entry.replace_container));
update_values.push_back(columns[7] + " = '" + Strings::Escape(tradeskill_recipe_entry.notes) + "'");
update_values.push_back(columns[8] + " = " + std::to_string(tradeskill_recipe_entry.must_learn));
update_values.push_back(columns[9] + " = " + std::to_string(tradeskill_recipe_entry.quest));
update_values.push_back(columns[10] + " = " + std::to_string(tradeskill_recipe_entry.enabled));
update_values.push_back(columns[11] + " = " + std::to_string(tradeskill_recipe_entry.min_expansion));
update_values.push_back(columns[12] + " = " + std::to_string(tradeskill_recipe_entry.max_expansion));
update_values.push_back(columns[13] + " = '" + Strings::Escape(tradeskill_recipe_entry.content_flags) + "'");
update_values.push_back(columns[14] + " = '" + Strings::Escape(tradeskill_recipe_entry.content_flags_disabled) + "'");
v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
v.push_back(columns[2] + " = " + std::to_string(e.tradeskill));
v.push_back(columns[3] + " = " + std::to_string(e.skillneeded));
v.push_back(columns[4] + " = " + std::to_string(e.trivial));
v.push_back(columns[5] + " = " + std::to_string(e.nofail));
v.push_back(columns[6] + " = " + std::to_string(e.replace_container));
v.push_back(columns[7] + " = '" + Strings::Escape(e.notes) + "'");
v.push_back(columns[8] + " = " + std::to_string(e.must_learn));
v.push_back(columns[9] + " = " + std::to_string(e.quest));
v.push_back(columns[10] + " = " + std::to_string(e.enabled));
v.push_back(columns[11] + " = " + std::to_string(e.min_expansion));
v.push_back(columns[12] + " = " + std::to_string(e.max_expansion));
v.push_back(columns[13] + " = '" + Strings::Escape(e.content_flags) + "'");
v.push_back(columns[14] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
Strings::Implode(", ", update_values),
Strings::Implode(", ", v),
PrimaryKey(),
tradeskill_recipe_entry.id
e.id
)
);
@@ -248,75 +248,75 @@ public:
static TradeskillRecipe InsertOne(
Database& db,
TradeskillRecipe tradeskill_recipe_entry
TradeskillRecipe e
)
{
std::vector<std::string> insert_values;
std::vector<std::string> v;
insert_values.push_back(std::to_string(tradeskill_recipe_entry.id));
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.name) + "'");
insert_values.push_back(std::to_string(tradeskill_recipe_entry.tradeskill));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.skillneeded));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.trivial));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.nofail));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.replace_container));
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.notes) + "'");
insert_values.push_back(std::to_string(tradeskill_recipe_entry.must_learn));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.quest));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.enabled));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.min_expansion));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.max_expansion));
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags) + "'");
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags_disabled) + "'");
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.tradeskill));
v.push_back(std::to_string(e.skillneeded));
v.push_back(std::to_string(e.trivial));
v.push_back(std::to_string(e.nofail));
v.push_back(std::to_string(e.replace_container));
v.push_back("'" + Strings::Escape(e.notes) + "'");
v.push_back(std::to_string(e.must_learn));
v.push_back(std::to_string(e.quest));
v.push_back(std::to_string(e.enabled));
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()) {
tradeskill_recipe_entry.id = results.LastInsertedID();
return tradeskill_recipe_entry;
e.id = results.LastInsertedID();
return e;
}
tradeskill_recipe_entry = NewEntity();
e = NewEntity();
return tradeskill_recipe_entry;
return e;
}
static int InsertMany(
Database& db,
std::vector<TradeskillRecipe> tradeskill_recipe_entries
const std::vector<TradeskillRecipe> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &tradeskill_recipe_entry: tradeskill_recipe_entries) {
std::vector<std::string> insert_values;
for (auto &e: entries) {
std::vector<std::string> v;
insert_values.push_back(std::to_string(tradeskill_recipe_entry.id));
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.name) + "'");
insert_values.push_back(std::to_string(tradeskill_recipe_entry.tradeskill));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.skillneeded));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.trivial));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.nofail));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.replace_container));
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.notes) + "'");
insert_values.push_back(std::to_string(tradeskill_recipe_entry.must_learn));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.quest));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.enabled));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.min_expansion));
insert_values.push_back(std::to_string(tradeskill_recipe_entry.max_expansion));
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags) + "'");
insert_values.push_back("'" + Strings::Escape(tradeskill_recipe_entry.content_flags_disabled) + "'");
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.tradeskill));
v.push_back(std::to_string(e.skillneeded));
v.push_back(std::to_string(e.trivial));
v.push_back(std::to_string(e.nofail));
v.push_back(std::to_string(e.replace_container));
v.push_back("'" + Strings::Escape(e.notes) + "'");
v.push_back(std::to_string(e.must_learn));
v.push_back(std::to_string(e.quest));
v.push_back(std::to_string(e.enabled));
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(
@@ -343,31 +343,31 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
TradeskillRecipe entry{};
TradeskillRecipe e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.tradeskill = atoi(row[2]);
entry.skillneeded = atoi(row[3]);
entry.trivial = atoi(row[4]);
entry.nofail = atoi(row[5]);
entry.replace_container = atoi(row[6]);
entry.notes = row[7] ? row[7] : "";
entry.must_learn = atoi(row[8]);
entry.quest = atoi(row[9]);
entry.enabled = atoi(row[10]);
entry.min_expansion = atoi(row[11]);
entry.max_expansion = atoi(row[12]);
entry.content_flags = row[13] ? row[13] : "";
entry.content_flags_disabled = row[14] ? row[14] : "";
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.tradeskill = atoi(row[2]);
e.skillneeded = atoi(row[3]);
e.trivial = atoi(row[4]);
e.nofail = atoi(row[5]);
e.replace_container = atoi(row[6]);
e.notes = row[7] ? row[7] : "";
e.must_learn = atoi(row[8]);
e.quest = atoi(row[9]);
e.enabled = atoi(row[10]);
e.min_expansion = atoi(row[11]);
e.max_expansion = atoi(row[12]);
e.content_flags = row[13] ? row[13] : "";
e.content_flags_disabled = row[14] ? row[14] : "";
all_entries.push_back(entry);
all_entries.push_back(e);
}
return all_entries;
}
static std::vector<TradeskillRecipe> GetWhere(Database& db, std::string where_filter)
static std::vector<TradeskillRecipe> GetWhere(Database& db, const std::string &where_filter)
{
std::vector<TradeskillRecipe> all_entries;
@@ -382,31 +382,31 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
TradeskillRecipe entry{};
TradeskillRecipe e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.tradeskill = atoi(row[2]);
entry.skillneeded = atoi(row[3]);
entry.trivial = atoi(row[4]);
entry.nofail = atoi(row[5]);
entry.replace_container = atoi(row[6]);
entry.notes = row[7] ? row[7] : "";
entry.must_learn = atoi(row[8]);
entry.quest = atoi(row[9]);
entry.enabled = atoi(row[10]);
entry.min_expansion = atoi(row[11]);
entry.max_expansion = atoi(row[12]);
entry.content_flags = row[13] ? row[13] : "";
entry.content_flags_disabled = row[14] ? row[14] : "";
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.tradeskill = atoi(row[2]);
e.skillneeded = atoi(row[3]);
e.trivial = atoi(row[4]);
e.nofail = atoi(row[5]);
e.replace_container = atoi(row[6]);
e.notes = row[7] ? row[7] : "";
e.must_learn = atoi(row[8]);
e.quest = atoi(row[9]);
e.enabled = atoi(row[10]);
e.min_expansion = atoi(row[11]);
e.max_expansion = atoi(row[12]);
e.content_flags = row[13] ? row[13] : "";
e.content_flags_disabled = row[14] ? row[14] : "";
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(
@@ -431,6 +431,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_TRADESKILL_RECIPE_REPOSITORY_H