pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-22 19:58:24 +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_inventory_repository.h
+165 -139
View File
@@ -121,29 +121,29 @@ public:
static Inventory NewEntity()
{
Inventory entry{};
Inventory e{};
entry.charid = 0;
entry.slotid = 0;
entry.itemid = 0;
entry.charges = 0;
entry.color = 0;
entry.augslot1 = 0;
entry.augslot2 = 0;
entry.augslot3 = 0;
entry.augslot4 = 0;
entry.augslot5 = 0;
entry.augslot6 = 0;
entry.instnodrop = 0;
entry.custom_data = "";
entry.ornamenticon = 0;
entry.ornamentidfile = 0;
entry.ornament_hero_model = 0;
e.charid = 0;
e.slotid = 0;
e.itemid = 0;
e.charges = 0;
e.color = 0;
e.augslot1 = 0;
e.augslot2 = 0;
e.augslot3 = 0;
e.augslot4 = 0;
e.augslot5 = 0;
e.augslot6 = 0;
e.instnodrop = 0;
e.custom_data = "";
e.ornamenticon = 0;
e.ornamentidfile = 0;
e.ornament_hero_model = 0;
return entry;
return e;
}
static Inventory GetInventoryEntry(
static Inventory GetInventory(
const std::vector<Inventory> &inventorys,
int inventory_id
)
@@ -172,26 +172,26 @@ public:
auto row = results.begin();
if (results.RowCount() == 1) {
Inventory entry{};
Inventory e{};
entry.charid = atoi(row[0]);
entry.slotid = atoi(row[1]);
entry.itemid = atoi(row[2]);
entry.charges = atoi(row[3]);
entry.color = atoi(row[4]);
entry.augslot1 = atoi(row[5]);
entry.augslot2 = atoi(row[6]);
entry.augslot3 = atoi(row[7]);
entry.augslot4 = atoi(row[8]);
entry.augslot5 = atoi(row[9]);
entry.augslot6 = atoi(row[10]);
entry.instnodrop = atoi(row[11]);
entry.custom_data = row[12] ? row[12] : "";
entry.ornamenticon = atoi(row[13]);
entry.ornamentidfile = atoi(row[14]);
entry.ornament_hero_model = atoi(row[15]);
e.charid = atoi(row[0]);
e.slotid = atoi(row[1]);
e.itemid = atoi(row[2]);
e.charges = atoi(row[3]);
e.color = atoi(row[4]);
e.augslot1 = atoi(row[5]);
e.augslot2 = atoi(row[6]);
e.augslot3 = atoi(row[7]);
e.augslot4 = atoi(row[8]);
e.augslot5 = atoi(row[9]);
e.augslot6 = atoi(row[10]);
e.instnodrop = atoi(row[11]);
e.custom_data = row[12] ? row[12] : "";
e.ornamenticon = atoi(row[13]);
e.ornamentidfile = atoi(row[14]);
e.ornament_hero_model = atoi(row[15]);
return entry;
return e;
}
return NewEntity();
@@ -216,37 +216,37 @@ public:
static int UpdateOne(
Database& db,
Inventory inventory_entry
const Inventory &e
)
{
std::vector<std::string> update_values;
std::vector<std::string> v;
auto columns = Columns();
update_values.push_back(columns[0] + " = " + std::to_string(inventory_entry.charid));
update_values.push_back(columns[1] + " = " + std::to_string(inventory_entry.slotid));
update_values.push_back(columns[2] + " = " + std::to_string(inventory_entry.itemid));
update_values.push_back(columns[3] + " = " + std::to_string(inventory_entry.charges));
update_values.push_back(columns[4] + " = " + std::to_string(inventory_entry.color));
update_values.push_back(columns[5] + " = " + std::to_string(inventory_entry.augslot1));
update_values.push_back(columns[6] + " = " + std::to_string(inventory_entry.augslot2));
update_values.push_back(columns[7] + " = " + std::to_string(inventory_entry.augslot3));
update_values.push_back(columns[8] + " = " + std::to_string(inventory_entry.augslot4));
update_values.push_back(columns[9] + " = " + std::to_string(inventory_entry.augslot5));
update_values.push_back(columns[10] + " = " + std::to_string(inventory_entry.augslot6));
update_values.push_back(columns[11] + " = " + std::to_string(inventory_entry.instnodrop));
update_values.push_back(columns[12] + " = '" + Strings::Escape(inventory_entry.custom_data) + "'");
update_values.push_back(columns[13] + " = " + std::to_string(inventory_entry.ornamenticon));
update_values.push_back(columns[14] + " = " + std::to_string(inventory_entry.ornamentidfile));
update_values.push_back(columns[15] + " = " + std::to_string(inventory_entry.ornament_hero_model));
v.push_back(columns[0] + " = " + std::to_string(e.charid));
v.push_back(columns[1] + " = " + std::to_string(e.slotid));
v.push_back(columns[2] + " = " + std::to_string(e.itemid));
v.push_back(columns[3] + " = " + std::to_string(e.charges));
v.push_back(columns[4] + " = " + std::to_string(e.color));
v.push_back(columns[5] + " = " + std::to_string(e.augslot1));
v.push_back(columns[6] + " = " + std::to_string(e.augslot2));
v.push_back(columns[7] + " = " + std::to_string(e.augslot3));
v.push_back(columns[8] + " = " + std::to_string(e.augslot4));
v.push_back(columns[9] + " = " + std::to_string(e.augslot5));
v.push_back(columns[10] + " = " + std::to_string(e.augslot6));
v.push_back(columns[11] + " = " + std::to_string(e.instnodrop));
v.push_back(columns[12] + " = '" + Strings::Escape(e.custom_data) + "'");
v.push_back(columns[13] + " = " + std::to_string(e.ornamenticon));
v.push_back(columns[14] + " = " + std::to_string(e.ornamentidfile));
v.push_back(columns[15] + " = " + std::to_string(e.ornament_hero_model));
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
Strings::Implode(", ", update_values),
Strings::Implode(", ", v),
PrimaryKey(),
inventory_entry.charid
e.charid
)
);
@@ -255,77 +255,77 @@ public:
static Inventory InsertOne(
Database& db,
Inventory inventory_entry
Inventory e
)
{
std::vector<std::string> insert_values;
std::vector<std::string> v;
insert_values.push_back(std::to_string(inventory_entry.charid));
insert_values.push_back(std::to_string(inventory_entry.slotid));
insert_values.push_back(std::to_string(inventory_entry.itemid));
insert_values.push_back(std::to_string(inventory_entry.charges));
insert_values.push_back(std::to_string(inventory_entry.color));
insert_values.push_back(std::to_string(inventory_entry.augslot1));
insert_values.push_back(std::to_string(inventory_entry.augslot2));
insert_values.push_back(std::to_string(inventory_entry.augslot3));
insert_values.push_back(std::to_string(inventory_entry.augslot4));
insert_values.push_back(std::to_string(inventory_entry.augslot5));
insert_values.push_back(std::to_string(inventory_entry.augslot6));
insert_values.push_back(std::to_string(inventory_entry.instnodrop));
insert_values.push_back("'" + Strings::Escape(inventory_entry.custom_data) + "'");
insert_values.push_back(std::to_string(inventory_entry.ornamenticon));
insert_values.push_back(std::to_string(inventory_entry.ornamentidfile));
insert_values.push_back(std::to_string(inventory_entry.ornament_hero_model));
v.push_back(std::to_string(e.charid));
v.push_back(std::to_string(e.slotid));
v.push_back(std::to_string(e.itemid));
v.push_back(std::to_string(e.charges));
v.push_back(std::to_string(e.color));
v.push_back(std::to_string(e.augslot1));
v.push_back(std::to_string(e.augslot2));
v.push_back(std::to_string(e.augslot3));
v.push_back(std::to_string(e.augslot4));
v.push_back(std::to_string(e.augslot5));
v.push_back(std::to_string(e.augslot6));
v.push_back(std::to_string(e.instnodrop));
v.push_back("'" + Strings::Escape(e.custom_data) + "'");
v.push_back(std::to_string(e.ornamenticon));
v.push_back(std::to_string(e.ornamentidfile));
v.push_back(std::to_string(e.ornament_hero_model));
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES ({})",
BaseInsert(),
Strings::Implode(",", insert_values)
Strings::Implode(",", v)
)
);
if (results.Success()) {
inventory_entry.charid = results.LastInsertedID();
return inventory_entry;
e.charid = results.LastInsertedID();
return e;
}
inventory_entry = NewEntity();
e = NewEntity();
return inventory_entry;
return e;
}
static int InsertMany(
Database& db,
std::vector<Inventory> inventory_entries
const std::vector<Inventory> &entries
)
{
std::vector<std::string> insert_chunks;
for (auto &inventory_entry: inventory_entries) {
std::vector<std::string> insert_values;
for (auto &e: entries) {
std::vector<std::string> v;
insert_values.push_back(std::to_string(inventory_entry.charid));
insert_values.push_back(std::to_string(inventory_entry.slotid));
insert_values.push_back(std::to_string(inventory_entry.itemid));
insert_values.push_back(std::to_string(inventory_entry.charges));
insert_values.push_back(std::to_string(inventory_entry.color));
insert_values.push_back(std::to_string(inventory_entry.augslot1));
insert_values.push_back(std::to_string(inventory_entry.augslot2));
insert_values.push_back(std::to_string(inventory_entry.augslot3));
insert_values.push_back(std::to_string(inventory_entry.augslot4));
insert_values.push_back(std::to_string(inventory_entry.augslot5));
insert_values.push_back(std::to_string(inventory_entry.augslot6));
insert_values.push_back(std::to_string(inventory_entry.instnodrop));
insert_values.push_back("'" + Strings::Escape(inventory_entry.custom_data) + "'");
insert_values.push_back(std::to_string(inventory_entry.ornamenticon));
insert_values.push_back(std::to_string(inventory_entry.ornamentidfile));
insert_values.push_back(std::to_string(inventory_entry.ornament_hero_model));
v.push_back(std::to_string(e.charid));
v.push_back(std::to_string(e.slotid));
v.push_back(std::to_string(e.itemid));
v.push_back(std::to_string(e.charges));
v.push_back(std::to_string(e.color));
v.push_back(std::to_string(e.augslot1));
v.push_back(std::to_string(e.augslot2));
v.push_back(std::to_string(e.augslot3));
v.push_back(std::to_string(e.augslot4));
v.push_back(std::to_string(e.augslot5));
v.push_back(std::to_string(e.augslot6));
v.push_back(std::to_string(e.instnodrop));
v.push_back("'" + Strings::Escape(e.custom_data) + "'");
v.push_back(std::to_string(e.ornamenticon));
v.push_back(std::to_string(e.ornamentidfile));
v.push_back(std::to_string(e.ornament_hero_model));
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(
@@ -352,32 +352,32 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Inventory entry{};
Inventory e{};
entry.charid = atoi(row[0]);
entry.slotid = atoi(row[1]);
entry.itemid = atoi(row[2]);
entry.charges = atoi(row[3]);
entry.color = atoi(row[4]);
entry.augslot1 = atoi(row[5]);
entry.augslot2 = atoi(row[6]);
entry.augslot3 = atoi(row[7]);
entry.augslot4 = atoi(row[8]);
entry.augslot5 = atoi(row[9]);
entry.augslot6 = atoi(row[10]);
entry.instnodrop = atoi(row[11]);
entry.custom_data = row[12] ? row[12] : "";
entry.ornamenticon = atoi(row[13]);
entry.ornamentidfile = atoi(row[14]);
entry.ornament_hero_model = atoi(row[15]);
e.charid = atoi(row[0]);
e.slotid = atoi(row[1]);
e.itemid = atoi(row[2]);
e.charges = atoi(row[3]);
e.color = atoi(row[4]);
e.augslot1 = atoi(row[5]);
e.augslot2 = atoi(row[6]);
e.augslot3 = atoi(row[7]);
e.augslot4 = atoi(row[8]);
e.augslot5 = atoi(row[9]);
e.augslot6 = atoi(row[10]);
e.instnodrop = atoi(row[11]);
e.custom_data = row[12] ? row[12] : "";
e.ornamenticon = atoi(row[13]);
e.ornamentidfile = atoi(row[14]);
e.ornament_hero_model = atoi(row[15]);
all_entries.push_back(entry);
all_entries.push_back(e);
}
return all_entries;
}
static std::vector<Inventory> GetWhere(Database& db, std::string where_filter)
static std::vector<Inventory> GetWhere(Database& db, const std::string &where_filter)
{
std::vector<Inventory> all_entries;
@@ -392,32 +392,32 @@ public:
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
Inventory entry{};
Inventory e{};
entry.charid = atoi(row[0]);
entry.slotid = atoi(row[1]);
entry.itemid = atoi(row[2]);
entry.charges = atoi(row[3]);
entry.color = atoi(row[4]);
entry.augslot1 = atoi(row[5]);
entry.augslot2 = atoi(row[6]);
entry.augslot3 = atoi(row[7]);
entry.augslot4 = atoi(row[8]);
entry.augslot5 = atoi(row[9]);
entry.augslot6 = atoi(row[10]);
entry.instnodrop = atoi(row[11]);
entry.custom_data = row[12] ? row[12] : "";
entry.ornamenticon = atoi(row[13]);
entry.ornamentidfile = atoi(row[14]);
entry.ornament_hero_model = atoi(row[15]);
e.charid = atoi(row[0]);
e.slotid = atoi(row[1]);
e.itemid = atoi(row[2]);
e.charges = atoi(row[3]);
e.color = atoi(row[4]);
e.augslot1 = atoi(row[5]);
e.augslot2 = atoi(row[6]);
e.augslot3 = atoi(row[7]);
e.augslot4 = atoi(row[8]);
e.augslot5 = atoi(row[9]);
e.augslot6 = atoi(row[10]);
e.instnodrop = atoi(row[11]);
e.custom_data = row[12] ? row[12] : "";
e.ornamenticon = atoi(row[13]);
e.ornamentidfile = atoi(row[14]);
e.ornament_hero_model = atoi(row[15]);
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(
@@ -442,6 +442,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_INVENTORY_REPOSITORY_H