mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 04:56:20 +00:00
[Strings] Refactor Strings Usage (#2305)
* Initial commit checkpoint * More functions converted * Commify * More functions * Fin * Sort declarations * Split functions between files * Bots * Update strings.h * Split * Revert find replaces * Repository template * Money * Misc function * Update CMakeLists.txt * Saylink * Update strings.cpp * Swap Strings::Saylink for Saylink::Create since saylink is coupled to zone database * API casings
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
#define EQEMU_TRADER_AUDIT_REPOSITORY_H
|
||||
|
||||
#include "../database.h"
|
||||
#include "../string_util.h"
|
||||
#include "../strings.h"
|
||||
|
||||
class TraderAuditRepository {
|
||||
public:
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
|
||||
static std::string ColumnsRaw()
|
||||
{
|
||||
return std::string(implode(", ", Columns()));
|
||||
return std::string(Strings::Implode(", ", Columns()));
|
||||
}
|
||||
|
||||
static std::string InsertColumnsRaw()
|
||||
@@ -71,7 +71,7 @@ public:
|
||||
insert_columns.push_back(column);
|
||||
}
|
||||
|
||||
return std::string(implode(", ", insert_columns));
|
||||
return std::string(Strings::Implode(", ", insert_columns));
|
||||
}
|
||||
|
||||
static std::string TableName()
|
||||
@@ -180,10 +180,10 @@ public:
|
||||
|
||||
auto columns = Columns();
|
||||
|
||||
update_values.push_back(columns[0] + " = '" + EscapeString(trader_audit_entry.time) + "'");
|
||||
update_values.push_back(columns[1] + " = '" + EscapeString(trader_audit_entry.seller) + "'");
|
||||
update_values.push_back(columns[2] + " = '" + EscapeString(trader_audit_entry.buyer) + "'");
|
||||
update_values.push_back(columns[3] + " = '" + EscapeString(trader_audit_entry.itemname) + "'");
|
||||
update_values.push_back(columns[0] + " = '" + Strings::Escape(trader_audit_entry.time) + "'");
|
||||
update_values.push_back(columns[1] + " = '" + Strings::Escape(trader_audit_entry.seller) + "'");
|
||||
update_values.push_back(columns[2] + " = '" + Strings::Escape(trader_audit_entry.buyer) + "'");
|
||||
update_values.push_back(columns[3] + " = '" + Strings::Escape(trader_audit_entry.itemname) + "'");
|
||||
update_values.push_back(columns[4] + " = " + std::to_string(trader_audit_entry.quantity));
|
||||
update_values.push_back(columns[5] + " = " + std::to_string(trader_audit_entry.totalcost));
|
||||
update_values.push_back(columns[6] + " = " + std::to_string(trader_audit_entry.trantype));
|
||||
@@ -192,7 +192,7 @@ public:
|
||||
fmt::format(
|
||||
"UPDATE {} SET {} WHERE {} = {}",
|
||||
TableName(),
|
||||
implode(", ", update_values),
|
||||
Strings::Implode(", ", update_values),
|
||||
PrimaryKey(),
|
||||
trader_audit_entry.
|
||||
)
|
||||
@@ -207,10 +207,10 @@ public:
|
||||
{
|
||||
std::vector<std::string> insert_values;
|
||||
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.time) + "'");
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.seller) + "'");
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.buyer) + "'");
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.itemname) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.time) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.seller) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.buyer) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.itemname) + "'");
|
||||
insert_values.push_back(std::to_string(trader_audit_entry.quantity));
|
||||
insert_values.push_back(std::to_string(trader_audit_entry.totalcost));
|
||||
insert_values.push_back(std::to_string(trader_audit_entry.trantype));
|
||||
@@ -219,7 +219,7 @@ public:
|
||||
fmt::format(
|
||||
"{} VALUES ({})",
|
||||
BaseInsert(),
|
||||
implode(",", insert_values)
|
||||
Strings::Implode(",", insert_values)
|
||||
)
|
||||
);
|
||||
|
||||
@@ -242,15 +242,15 @@ public:
|
||||
for (auto &trader_audit_entry: trader_audit_entries) {
|
||||
std::vector<std::string> insert_values;
|
||||
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.time) + "'");
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.seller) + "'");
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.buyer) + "'");
|
||||
insert_values.push_back("'" + EscapeString(trader_audit_entry.itemname) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.time) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.seller) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.buyer) + "'");
|
||||
insert_values.push_back("'" + Strings::Escape(trader_audit_entry.itemname) + "'");
|
||||
insert_values.push_back(std::to_string(trader_audit_entry.quantity));
|
||||
insert_values.push_back(std::to_string(trader_audit_entry.totalcost));
|
||||
insert_values.push_back(std::to_string(trader_audit_entry.trantype));
|
||||
|
||||
insert_chunks.push_back("(" + implode(",", insert_values) + ")");
|
||||
insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")");
|
||||
}
|
||||
|
||||
std::vector<std::string> insert_values;
|
||||
@@ -259,7 +259,7 @@ public:
|
||||
fmt::format(
|
||||
"{} VALUES {}",
|
||||
BaseInsert(),
|
||||
implode(",", insert_chunks)
|
||||
Strings::Implode(",", insert_chunks)
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user