Explicitly pass database pointers to repository methods

This commit is contained in:
Akkadius
2021-02-05 23:00:27 -06:00
parent 7fe0bbacd4
commit e8ab176d4a
167 changed files with 2738 additions and 1938 deletions
+17 -12
View File
@@ -387,10 +387,11 @@ public:
}
static Zone FindOne(
Database& db,
int zone_id
)
{
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE id = {} LIMIT 1",
BaseSelect(),
@@ -501,10 +502,11 @@ public:
}
static int DeleteOne(
Database& db,
int zone_id
)
{
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"DELETE FROM {} WHERE {} = {}",
TableName(),
@@ -517,6 +519,7 @@ public:
}
static int UpdateOne(
Database& db,
Zone zone_entry
)
{
@@ -615,7 +618,7 @@ public:
update_values.push_back(columns[89] + " = '" + EscapeString(zone_entry.content_flags_disabled) + "'");
update_values.push_back(columns[90] + " = " + std::to_string(zone_entry.underworld_teleport_index));
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
@@ -629,6 +632,7 @@ public:
}
static Zone InsertOne(
Database& db,
Zone zone_entry
)
{
@@ -744,6 +748,7 @@ public:
}
static int InsertMany(
Database& db,
std::vector<Zone> zone_entries
)
{
@@ -848,7 +853,7 @@ public:
std::vector<std::string> insert_values;
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES {}",
BaseInsert(),
@@ -859,11 +864,11 @@ public:
return (results.Success() ? results.RowsAffected() : 0);
}
static std::vector<Zone> All()
static std::vector<Zone> All(Database& db)
{
std::vector<Zone> all_entries;
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"{}",
BaseSelect()
@@ -973,11 +978,11 @@ public:
return all_entries;
}
static std::vector<Zone> GetWhere(std::string where_filter)
static std::vector<Zone> GetWhere(Database& db, std::string where_filter)
{
std::vector<Zone> all_entries;
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE {}",
BaseSelect(),
@@ -1088,9 +1093,9 @@ public:
return all_entries;
}
static int DeleteWhere(std::string where_filter)
static int DeleteWhere(Database& db, std::string where_filter)
{
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"DELETE FROM {} WHERE {}",
TableName(),
@@ -1101,9 +1106,9 @@ public:
return (results.Success() ? results.RowsAffected() : 0);
}
static int Truncate()
static int Truncate(Database& db)
{
auto results = content_db.QueryDatabase(
auto results = db.QueryDatabase(
fmt::format(
"TRUNCATE TABLE {}",
TableName()