mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-01 10:11:37 +00:00
[Repository] Add null integer column support, instance_list notes migration, regenerate repositories (#3969)
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
* Any modifications to base repositories are to be made by the generator only
|
||||
*
|
||||
* @generator ./utils/scripts/generators/repository-generator.pl
|
||||
* @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
|
||||
* @docs https://docs.eqemu.io/developer/repositories
|
||||
*/
|
||||
|
||||
#ifndef EQEMU_BASE_LOGIN_ACCOUNTS_REPOSITORY_H
|
||||
@@ -136,8 +136,9 @@ public:
|
||||
{
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} WHERE id = {} LIMIT 1",
|
||||
"{} WHERE {} = {} LIMIT 1",
|
||||
BaseSelect(),
|
||||
PrimaryKey(),
|
||||
login_accounts_id
|
||||
)
|
||||
);
|
||||
@@ -146,7 +147,7 @@ public:
|
||||
if (results.RowCount() == 1) {
|
||||
LoginAccounts e{};
|
||||
|
||||
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
|
||||
e.account_name = row[1] ? row[1] : "";
|
||||
e.account_password = row[2] ? row[2] : "";
|
||||
e.account_email = row[3] ? row[3] : "";
|
||||
@@ -298,7 +299,7 @@ public:
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
LoginAccounts e{};
|
||||
|
||||
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
|
||||
e.account_name = row[1] ? row[1] : "";
|
||||
e.account_password = row[2] ? row[2] : "";
|
||||
e.account_email = row[3] ? row[3] : "";
|
||||
@@ -331,7 +332,7 @@ public:
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
LoginAccounts e{};
|
||||
|
||||
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
|
||||
e.account_name = row[1] ? row[1] : "";
|
||||
e.account_password = row[2] ? row[2] : "";
|
||||
e.account_email = row[3] ? row[3] : "";
|
||||
@@ -398,6 +399,78 @@ public:
|
||||
return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
|
||||
}
|
||||
|
||||
static std::string BaseReplace()
|
||||
{
|
||||
return fmt::format(
|
||||
"REPLACE INTO {} ({}) ",
|
||||
TableName(),
|
||||
ColumnsRaw()
|
||||
);
|
||||
}
|
||||
|
||||
static int ReplaceOne(
|
||||
Database& db,
|
||||
const LoginAccounts &e
|
||||
)
|
||||
{
|
||||
std::vector<std::string> v;
|
||||
|
||||
v.push_back(std::to_string(e.id));
|
||||
v.push_back("'" + Strings::Escape(e.account_name) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.account_password) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.account_email) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.source_loginserver) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.last_ip_address) + "'");
|
||||
v.push_back("FROM_UNIXTIME(" + (e.last_login_date > 0 ? std::to_string(e.last_login_date) : "null") + ")");
|
||||
v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
|
||||
v.push_back("FROM_UNIXTIME(" + (e.updated_at > 0 ? std::to_string(e.updated_at) : "null") + ")");
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES ({})",
|
||||
BaseReplace(),
|
||||
Strings::Implode(",", v)
|
||||
)
|
||||
);
|
||||
|
||||
return (results.Success() ? results.RowsAffected() : 0);
|
||||
}
|
||||
|
||||
static int ReplaceMany(
|
||||
Database& db,
|
||||
const std::vector<LoginAccounts> &entries
|
||||
)
|
||||
{
|
||||
std::vector<std::string> insert_chunks;
|
||||
|
||||
for (auto &e: entries) {
|
||||
std::vector<std::string> v;
|
||||
|
||||
v.push_back(std::to_string(e.id));
|
||||
v.push_back("'" + Strings::Escape(e.account_name) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.account_password) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.account_email) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.source_loginserver) + "'");
|
||||
v.push_back("'" + Strings::Escape(e.last_ip_address) + "'");
|
||||
v.push_back("FROM_UNIXTIME(" + (e.last_login_date > 0 ? std::to_string(e.last_login_date) : "null") + ")");
|
||||
v.push_back("FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
|
||||
v.push_back("FROM_UNIXTIME(" + (e.updated_at > 0 ? std::to_string(e.updated_at) : "null") + ")");
|
||||
|
||||
insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
|
||||
}
|
||||
|
||||
std::vector<std::string> v;
|
||||
|
||||
auto results = db.QueryDatabase(
|
||||
fmt::format(
|
||||
"{} VALUES {}",
|
||||
BaseReplace(),
|
||||
Strings::Implode(",", insert_chunks)
|
||||
)
|
||||
);
|
||||
|
||||
return (results.Success() ? results.RowsAffected() : 0);
|
||||
}
|
||||
};
|
||||
|
||||
#endif //EQEMU_BASE_LOGIN_ACCOUNTS_REPOSITORY_H
|
||||
|
||||
Reference in New Issue
Block a user