pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +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_npc_spells_repository.h
+199 -173
View File
@@ -136,34 +136,34 @@ public:
static NpcSpells NewEntity()
{
NpcSpells entry{};
NpcSpells e{};
entry.id = 0;
entry.name = "";
entry.parent_list = 0;
entry.attack_proc = -1;
entry.proc_chance = 3;
entry.range_proc = -1;
entry.rproc_chance = 0;
entry.defensive_proc = -1;
entry.dproc_chance = 0;
entry.fail_recast = 0;
entry.engaged_no_sp_recast_min = 0;
entry.engaged_no_sp_recast_max = 0;
entry.engaged_b_self_chance = 0;
entry.engaged_b_other_chance = 0;
entry.engaged_d_chance = 0;
entry.pursue_no_sp_recast_min = 0;
entry.pursue_no_sp_recast_max = 0;
entry.pursue_d_chance = 0;
entry.idle_no_sp_recast_min = 0;
entry.idle_no_sp_recast_max = 0;
entry.idle_b_chance = 0;
e.id = 0;
e.name = "";
e.parent_list = 0;
e.attack_proc = -1;
e.proc_chance = 3;
e.range_proc = -1;
e.rproc_chance = 0;
e.defensive_proc = -1;
e.dproc_chance = 0;
e.fail_recast = 0;
e.engaged_no_sp_recast_min = 0;
e.engaged_no_sp_recast_max = 0;
e.engaged_b_self_chance = 0;
e.engaged_b_other_chance = 0;
e.engaged_d_chance = 0;
e.pursue_no_sp_recast_min = 0;
e.pursue_no_sp_recast_max = 0;
e.pursue_d_chance = 0;
e.idle_no_sp_recast_min = 0;
e.idle_no_sp_recast_max = 0;
e.idle_b_chance = 0;
return entry;
return e;
}
static NpcSpells GetNpcSpellsEntry(
static NpcSpells GetNpcSpells(
const std::vector<NpcSpells> &npc_spellss,
int npc_spells_id
)
@@ -192,31 +192,31 @@ public:
auto row = results.begin();
if (results.RowCount() == 1) {
NpcSpells entry{};
NpcSpells e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.parent_list = atoi(row[2]);
entry.attack_proc = atoi(row[3]);
entry.proc_chance = atoi(row[4]);
entry.range_proc = atoi(row[5]);
entry.rproc_chance = atoi(row[6]);
entry.defensive_proc = atoi(row[7]);
entry.dproc_chance = atoi(row[8]);
entry.fail_recast = atoi(row[9]);
entry.engaged_no_sp_recast_min = atoi(row[10]);
entry.engaged_no_sp_recast_max = atoi(row[11]);
entry.engaged_b_self_chance = atoi(row[12]);
entry.engaged_b_other_chance = atoi(row[13]);
entry.engaged_d_chance = atoi(row[14]);
entry.pursue_no_sp_recast_min = atoi(row[15]);
entry.pursue_no_sp_recast_max = atoi(row[16]);
entry.pursue_d_chance = atoi(row[17]);
entry.idle_no_sp_recast_min = atoi(row[18]);
entry.idle_no_sp_recast_max = atoi(row[19]);
entry.idle_b_chance = atoi(row[20]);
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.parent_list = atoi(row[2]);
e.attack_proc = atoi(row[3]);
e.proc_chance = atoi(row[4]);
e.range_proc = atoi(row[5]);
e.rproc_chance = atoi(row[6]);
e.defensive_proc = atoi(row[7]);
e.dproc_chance = atoi(row[8]);
e.fail_recast = atoi(row[9]);
e.engaged_no_sp_recast_min = atoi(row[10]);
e.engaged_no_sp_recast_max = atoi(row[11]);
e.engaged_b_self_chance = atoi(row[12]);
e.engaged_b_other_chance = atoi(row[13]);
e.engaged_d_chance = atoi(row[14]);
e.pursue_no_sp_recast_min = atoi(row[15]);
e.pursue_no_sp_recast_max = atoi(row[16]);
e.pursue_d_chance = atoi(row[17]);
e.idle_no_sp_recast_min = atoi(row[18]);
e.idle_no_sp_recast_max = atoi(row[19]);
e.idle_b_chance = atoi(row[20]);
return entry;
return e;
}
return NewEntity();
@@ -241,41 +241,41 @@ public:
static int UpdateOne(
Database& db,
NpcSpells npc_spells_entry
const NpcSpells &e
)
{
std::vector<std::string> update_values;
std::vector<std::string> v;
auto columns = Columns();
update_values.push_back(columns[1] + " = '" + Strings::Escape(npc_spells_entry.name) + "'");
update_values.push_back(columns[2] + " = " + std::to_string(npc_spells_entry.parent_list));
update_values.push_back(columns[3] + " = " + std::to_string(npc_spells_entry.attack_proc));
update_values.push_back(columns[4] + " = " + std::to_string(npc_spells_entry.proc_chance));
update_values.push_back(columns[5] + " = " + std::to_string(npc_spells_entry.range_proc));
update_values.push_back(columns[6] + " = " + std::to_string(npc_spells_entry.rproc_chance));
update_values.push_back(columns[7] + " = " + std::to_string(npc_spells_entry.defensive_proc));
update_values.push_back(columns[8] + " = " + std::to_string(npc_spells_entry.dproc_chance));
update_values.push_back(columns[9] + " = " + std::to_string(npc_spells_entry.fail_recast));
update_values.push_back(columns[10] + " = " + std::to_string(npc_spells_entry.engaged_no_sp_recast_min));
update_values.push_back(columns[11] + " = " + std::to_string(npc_spells_entry.engaged_no_sp_recast_max));
update_values.push_back(columns[12] + " = " + std::to_string(npc_spells_entry.engaged_b_self_chance));
update_values.push_back(columns[13] + " = " + std::to_string(npc_spells_entry.engaged_b_other_chance));
update_values.push_back(columns[14] + " = " + std::to_string(npc_spells_entry.engaged_d_chance));
update_values.push_back(columns[15] + " = " + std::to_string(npc_spells_entry.pursue_no_sp_recast_min));
update_values.push_back(columns[16] + " = " + std::to_string(npc_spells_entry.pursue_no_sp_recast_max));
update_values.push_back(columns[17] + " = " + std::to_string(npc_spells_entry.pursue_d_chance));
update_values.push_back(columns[18] + " = " + std::to_string(npc_spells_entry.idle_no_sp_recast_min));
update_values.push_back(columns[19] + " = " + std::to_string(npc_spells_entry.idle_no_sp_recast_max));
update_values.push_back(columns[20] + " = " + std::to_string(npc_spells_entry.idle_b_chance));
v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
v.push_back(columns[2] + " = " + std::to_string(e.parent_list));
v.push_back(columns[3] + " = " + std::to_string(e.attack_proc));
v.push_back(columns[4] + " = " + std::to_string(e.proc_chance));
v.push_back(columns[5] + " = " + std::to_string(e.range_proc));
v.push_back(columns[6] + " = " + std::to_string(e.rproc_chance));
v.push_back(columns[7] + " = " + std::to_string(e.defensive_proc));
v.push_back(columns[8] + " = " + std::to_string(e.dproc_chance));
v.push_back(columns[9] + " = " + std::to_string(e.fail_recast));
v.push_back(columns[10] + " = " + std::to_string(e.engaged_no_sp_recast_min));
v.push_back(columns[11] + " = " + std::to_string(e.engaged_no_sp_recast_max));
v.push_back(columns[12] + " = " + std::to_string(e.engaged_b_self_chance));
v.push_back(columns[13] + " = " + std::to_string(e.engaged_b_other_chance));
v.push_back(columns[14] + " = " + std::to_string(e.engaged_d_chance));
v.push_back(columns[15] + " = " + std::to_string(e.pursue_no_sp_recast_min));
v.push_back(columns[16] + " = " + std::to_string(e.pursue_no_sp_recast_max));
v.push_back(columns[17] + " = " + std::to_string(e.pursue_d_chance));
v.push_back(columns[18] + " = " + std::to_string(e.idle_no_sp_recast_min));
v.push_back(columns[19] + " = " + std::to_string(e.idle_no_sp_recast_max));
v.push_back(columns[20] + " = " + std::to_string(e.idle_b_chance));
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
Strings::Implode(", ", update_values),
Strings::Implode(", ", v),
PrimaryKey(),
npc_spells_entry.id
e.id
)
);
@@ -284,87 +284,87 @@ public:
static NpcSpells InsertOne(
Database& db,
NpcSpells npc_spells_entry
NpcSpells e
)
{
std::vector<std::string> insert_values;
std::vector<std::string> v;
insert_values.push_back(std::to_string(npc_spells_entry.id));
insert_values.push_back("'" + Strings::Escape(npc_spells_entry.name) + "'");
insert_values.push_back(std::to_string(npc_spells_entry.parent_list));
insert_values.push_back(std::to_string(npc_spells_entry.attack_proc));
insert_values.push_back(std::to_string(npc_spells_entry.proc_chance));
insert_values.push_back(std::to_string(npc_spells_entry.range_proc));
insert_values.push_back(std::to_string(npc_spells_entry.rproc_chance));
insert_values.push_back(std::to_string(npc_spells_entry.defensive_proc));
insert_values.push_back(std::to_string(npc_spells_entry.dproc_chance));
insert_values.push_back(std::to_string(npc_spells_entry.fail_recast));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_no_sp_recast_min));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_no_sp_recast_max));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_b_self_chance));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_b_other_chance));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_d_chance));
insert_values.push_back(std::to_string(npc_spells_entry.pursue_no_sp_recast_min));
insert_values.push_back(std::to_string(npc_spells_entry.pursue_no_sp_recast_max));
insert_values.push_back(std::to_string(npc_spells_entry.pursue_d_chance));
insert_values.push_back(std::to_string(npc_spells_entry.idle_no_sp_recast_min));
insert_values.push_back(std::to_string(npc_spells_entry.idle_no_sp_recast_max));
insert_values.push_back(std::to_string(npc_spells_entry.idle_b_chance));
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.parent_list));
v.push_back(std::to_string(e.attack_proc));
v.push_back(std::to_string(e.proc_chance));
v.push_back(std::to_string(e.range_proc));
v.push_back(std::to_string(e.rproc_chance));
v.push_back(std::to_string(e.defensive_proc));
v.push_back(std::to_string(e.dproc_chance));
v.push_back(std::to_string(e.fail_recast));
v.push_back(std::to_string(e.engaged_no_sp_recast_min));
v.push_back(std::to_string(e.engaged_no_sp_recast_max));
v.push_back(std::to_string(e.engaged_b_self_chance));
v.push_back(std::to_string(e.engaged_b_other_chance));
v.push_back(std::to_string(e.engaged_d_chance));
v.push_back(std::to_string(e.pursue_no_sp_recast_min));
v.push_back(std::to_string(e.pursue_no_sp_recast_max));
v.push_back(std::to_string(e.pursue_d_chance));
v.push_back(std::to_string(e.idle_no_sp_recast_min));
v.push_back(std::to_string(e.idle_no_sp_recast_max));
v.push_back(std::to_string(e.idle_b_chance));
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES ({})",
BaseInsert(),
Strings::Implode(",", insert_values)
Strings::Implode(",", v)
)
);
if (results.Success()) {
npc_spells_entry.id = results.LastInsertedID();
return npc_spells_entry;
e.id = results.LastInsertedID();
return e;
}
npc_spells_entry = NewEntity();
e = NewEntity();
return npc_spells_entry;
return e;
}
static int InsertMany(
Database& db,
std::vector<NpcSpells> npc_spells_entries
const std::vector<NpcSpells> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &npc_spells_entry: npc_spells_entries) {
std::vector<std::string> insert_values;
for (auto &e: entries) {
std::vector<std::string> v;
insert_values.push_back(std::to_string(npc_spells_entry.id));
insert_values.push_back("'" + Strings::Escape(npc_spells_entry.name) + "'");
insert_values.push_back(std::to_string(npc_spells_entry.parent_list));
insert_values.push_back(std::to_string(npc_spells_entry.attack_proc));
insert_values.push_back(std::to_string(npc_spells_entry.proc_chance));
insert_values.push_back(std::to_string(npc_spells_entry.range_proc));
insert_values.push_back(std::to_string(npc_spells_entry.rproc_chance));
insert_values.push_back(std::to_string(npc_spells_entry.defensive_proc));
insert_values.push_back(std::to_string(npc_spells_entry.dproc_chance));
insert_values.push_back(std::to_string(npc_spells_entry.fail_recast));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_no_sp_recast_min));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_no_sp_recast_max));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_b_self_chance));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_b_other_chance));
insert_values.push_back(std::to_string(npc_spells_entry.engaged_d_chance));
insert_values.push_back(std::to_string(npc_spells_entry.pursue_no_sp_recast_min));
insert_values.push_back(std::to_string(npc_spells_entry.pursue_no_sp_recast_max));
insert_values.push_back(std::to_string(npc_spells_entry.pursue_d_chance));
insert_values.push_back(std::to_string(npc_spells_entry.idle_no_sp_recast_min));
insert_values.push_back(std::to_string(npc_spells_entry.idle_no_sp_recast_max));
insert_values.push_back(std::to_string(npc_spells_entry.idle_b_chance));
v.push_back(std::to_string(e.id));
v.push_back("'" + Strings::Escape(e.name) + "'");
v.push_back(std::to_string(e.parent_list));
v.push_back(std::to_string(e.attack_proc));
v.push_back(std::to_string(e.proc_chance));
v.push_back(std::to_string(e.range_proc));
v.push_back(std::to_string(e.rproc_chance));
v.push_back(std::to_string(e.defensive_proc));
v.push_back(std::to_string(e.dproc_chance));
v.push_back(std::to_string(e.fail_recast));
v.push_back(std::to_string(e.engaged_no_sp_recast_min));
v.push_back(std::to_string(e.engaged_no_sp_recast_max));
v.push_back(std::to_string(e.engaged_b_self_chance));
v.push_back(std::to_string(e.engaged_b_other_chance));
v.push_back(std::to_string(e.engaged_d_chance));
v.push_back(std::to_string(e.pursue_no_sp_recast_min));
v.push_back(std::to_string(e.pursue_no_sp_recast_max));
v.push_back(std::to_string(e.pursue_d_chance));
v.push_back(std::to_string(e.idle_no_sp_recast_min));
v.push_back(std::to_string(e.idle_no_sp_recast_max));
v.push_back(std::to_string(e.idle_b_chance));
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(
@@ -391,37 +391,37 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
NpcSpells entry{};
NpcSpells e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.parent_list = atoi(row[2]);
entry.attack_proc = atoi(row[3]);
entry.proc_chance = atoi(row[4]);
entry.range_proc = atoi(row[5]);
entry.rproc_chance = atoi(row[6]);
entry.defensive_proc = atoi(row[7]);
entry.dproc_chance = atoi(row[8]);
entry.fail_recast = atoi(row[9]);
entry.engaged_no_sp_recast_min = atoi(row[10]);
entry.engaged_no_sp_recast_max = atoi(row[11]);
entry.engaged_b_self_chance = atoi(row[12]);
entry.engaged_b_other_chance = atoi(row[13]);
entry.engaged_d_chance = atoi(row[14]);
entry.pursue_no_sp_recast_min = atoi(row[15]);
entry.pursue_no_sp_recast_max = atoi(row[16]);
entry.pursue_d_chance = atoi(row[17]);
entry.idle_no_sp_recast_min = atoi(row[18]);
entry.idle_no_sp_recast_max = atoi(row[19]);
entry.idle_b_chance = atoi(row[20]);
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.parent_list = atoi(row[2]);
e.attack_proc = atoi(row[3]);
e.proc_chance = atoi(row[4]);
e.range_proc = atoi(row[5]);
e.rproc_chance = atoi(row[6]);
e.defensive_proc = atoi(row[7]);
e.dproc_chance = atoi(row[8]);
e.fail_recast = atoi(row[9]);
e.engaged_no_sp_recast_min = atoi(row[10]);
e.engaged_no_sp_recast_max = atoi(row[11]);
e.engaged_b_self_chance = atoi(row[12]);
e.engaged_b_other_chance = atoi(row[13]);
e.engaged_d_chance = atoi(row[14]);
e.pursue_no_sp_recast_min = atoi(row[15]);
e.pursue_no_sp_recast_max = atoi(row[16]);
e.pursue_d_chance = atoi(row[17]);
e.idle_no_sp_recast_min = atoi(row[18]);
e.idle_no_sp_recast_max = atoi(row[19]);
e.idle_b_chance = atoi(row[20]);
all_entries.push_back(entry);
all_entries.push_back(e);
}
return all_entries;
}
static std::vector<NpcSpells> GetWhere(Database& db, std::string where_filter)
static std::vector<NpcSpells> GetWhere(Database& db, const std::string &where_filter)
{
std::vector<NpcSpells> all_entries;
@@ -436,37 +436,37 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
NpcSpells entry{};
NpcSpells e{};
entry.id = atoi(row[0]);
entry.name = row[1] ? row[1] : "";
entry.parent_list = atoi(row[2]);
entry.attack_proc = atoi(row[3]);
entry.proc_chance = atoi(row[4]);
entry.range_proc = atoi(row[5]);
entry.rproc_chance = atoi(row[6]);
entry.defensive_proc = atoi(row[7]);
entry.dproc_chance = atoi(row[8]);
entry.fail_recast = atoi(row[9]);
entry.engaged_no_sp_recast_min = atoi(row[10]);
entry.engaged_no_sp_recast_max = atoi(row[11]);
entry.engaged_b_self_chance = atoi(row[12]);
entry.engaged_b_other_chance = atoi(row[13]);
entry.engaged_d_chance = atoi(row[14]);
entry.pursue_no_sp_recast_min = atoi(row[15]);
entry.pursue_no_sp_recast_max = atoi(row[16]);
entry.pursue_d_chance = atoi(row[17]);
entry.idle_no_sp_recast_min = atoi(row[18]);
entry.idle_no_sp_recast_max = atoi(row[19]);
entry.idle_b_chance = atoi(row[20]);
e.id = atoi(row[0]);
e.name = row[1] ? row[1] : "";
e.parent_list = atoi(row[2]);
e.attack_proc = atoi(row[3]);
e.proc_chance = atoi(row[4]);
e.range_proc = atoi(row[5]);
e.rproc_chance = atoi(row[6]);
e.defensive_proc = atoi(row[7]);
e.dproc_chance = atoi(row[8]);
e.fail_recast = atoi(row[9]);
e.engaged_no_sp_recast_min = atoi(row[10]);
e.engaged_no_sp_recast_max = atoi(row[11]);
e.engaged_b_self_chance = atoi(row[12]);
e.engaged_b_other_chance = atoi(row[13]);
e.engaged_d_chance = atoi(row[14]);
e.pursue_no_sp_recast_min = atoi(row[15]);
e.pursue_no_sp_recast_max = atoi(row[16]);
e.pursue_d_chance = atoi(row[17]);
e.idle_no_sp_recast_min = atoi(row[18]);
e.idle_no_sp_recast_max = atoi(row[19]);
e.idle_b_chance = atoi(row[20]);
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(
@@ -491,6 +491,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_NPC_SPELLS_REPOSITORY_H