pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 03:11:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Hotfix] Remove expansion field from account for those who have it (#2357)

Browse Source
This commit is contained in:
Chris Miles 2022-08-01 15:07:36 -05:00 committed by GitHub
parent 7c27c4350d
commit 5ec18709a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
common/repositories/base/base_account_repository.h
View File

@ -38,7 +38,6 @@ public:
int rulesflag; int rulesflag;
time_t suspendeduntil; time_t suspendeduntil;
int time_creation; int time_creation;
int expansion;
std::string ban_reason; std::string ban_reason;
std::string suspend_reason; std::string suspend_reason;
std::string crc_eqgame; std::string crc_eqgame;
@ -73,7 +72,6 @@ public:
"rulesflag", "rulesflag",
"suspendeduntil", "suspendeduntil",
"time_creation", "time_creation",
"expansion",
"ban_reason", "ban_reason",
"suspend_reason", "suspend_reason",
"crc_eqgame", "crc_eqgame",
@ -104,7 +102,6 @@ public:
"rulesflag", "rulesflag",
"UNIX_TIMESTAMP(suspendeduntil)", "UNIX_TIMESTAMP(suspendeduntil)",
"time_creation", "time_creation",
"expansion",
"ban_reason", "ban_reason",
"suspend_reason", "suspend_reason",
"crc_eqgame", "crc_eqgame",
@ -169,7 +166,6 @@ public:
entry.rulesflag = 0; entry.rulesflag = 0;
entry.suspendeduntil = 0; entry.suspendeduntil = 0;
entry.time_creation = 0; entry.time_creation = 0;
entry.expansion = 0;
entry.ban_reason = ""; entry.ban_reason = "";
entry.suspend_reason = ""; entry.suspend_reason = "";
entry.crc_eqgame = ""; entry.crc_eqgame = "";
@ -229,12 +225,11 @@ public:
entry.rulesflag = atoi(row[16]); entry.rulesflag = atoi(row[16]);
entry.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10); entry.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
entry.time_creation = atoi(row[18]); entry.time_creation = atoi(row[18]);
entry.expansion = atoi(row[19]); entry.ban_reason = row[19] ? row[19] : "";
entry.ban_reason = row[20] ? row[20] : ""; entry.suspend_reason = row[20] ? row[20] : "";
entry.suspend_reason = row[21] ? row[21] : ""; entry.crc_eqgame = row[21] ? row[21] : "";
entry.crc_eqgame = row[22] ? row[22] : ""; entry.crc_skillcaps = row[22] ? row[22] : "";
entry.crc_skillcaps = row[23] ? row[23] : ""; entry.crc_basedata = row[23] ? row[23] : "";
entry.crc_basedata = row[24] ? row[24] : "";
return entry; return entry;
} }
@ -286,12 +281,11 @@ public:
update_values.push_back(columns[16] + " = " + std::to_string(account_entry.rulesflag)); update_values.push_back(columns[16] + " = " + std::to_string(account_entry.rulesflag));
update_values.push_back(columns[17] + " = FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")"); update_values.push_back(columns[17] + " = FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")");
update_values.push_back(columns[18] + " = " + std::to_string(account_entry.time_creation)); update_values.push_back(columns[18] + " = " + std::to_string(account_entry.time_creation));
update_values.push_back(columns[19] + " = " + std::to_string(account_entry.expansion)); update_values.push_back(columns[19] + " = '" + Strings::Escape(account_entry.ban_reason) + "'");
update_values.push_back(columns[20] + " = '" + Strings::Escape(account_entry.ban_reason) + "'"); update_values.push_back(columns[20] + " = '" + Strings::Escape(account_entry.suspend_reason) + "'");
update_values.push_back(columns[21] + " = '" + Strings::Escape(account_entry.suspend_reason) + "'"); update_values.push_back(columns[21] + " = '" + Strings::Escape(account_entry.crc_eqgame) + "'");
update_values.push_back(columns[22] + " = '" + Strings::Escape(account_entry.crc_eqgame) + "'"); update_values.push_back(columns[22] + " = '" + Strings::Escape(account_entry.crc_skillcaps) + "'");
update_values.push_back(columns[23] + " = '" + Strings::Escape(account_entry.crc_skillcaps) + "'"); update_values.push_back(columns[23] + " = '" + Strings::Escape(account_entry.crc_basedata) + "'");
update_values.push_back(columns[24] + " = '" + Strings::Escape(account_entry.crc_basedata) + "'");
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -332,7 +326,6 @@ public:
insert_values.push_back(std::to_string(account_entry.rulesflag)); insert_values.push_back(std::to_string(account_entry.rulesflag));
insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")");
insert_values.push_back(std::to_string(account_entry.time_creation)); insert_values.push_back(std::to_string(account_entry.time_creation));
insert_values.push_back(std::to_string(account_entry.expansion));
insert_values.push_back("'" + Strings::Escape(account_entry.ban_reason) + "'"); insert_values.push_back("'" + Strings::Escape(account_entry.ban_reason) + "'");
insert_values.push_back("'" + Strings::Escape(account_entry.suspend_reason) + "'"); insert_values.push_back("'" + Strings::Escape(account_entry.suspend_reason) + "'");
insert_values.push_back("'" + Strings::Escape(account_entry.crc_eqgame) + "'"); insert_values.push_back("'" + Strings::Escape(account_entry.crc_eqgame) + "'");
@ -386,7 +379,6 @@ public:
insert_values.push_back(std::to_string(account_entry.rulesflag)); insert_values.push_back(std::to_string(account_entry.rulesflag));
insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")"); insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")");
insert_values.push_back(std::to_string(account_entry.time_creation)); insert_values.push_back(std::to_string(account_entry.time_creation));
insert_values.push_back(std::to_string(account_entry.expansion));
insert_values.push_back("'" + Strings::Escape(account_entry.ban_reason) + "'"); insert_values.push_back("'" + Strings::Escape(account_entry.ban_reason) + "'");
insert_values.push_back("'" + Strings::Escape(account_entry.suspend_reason) + "'"); insert_values.push_back("'" + Strings::Escape(account_entry.suspend_reason) + "'");
insert_values.push_back("'" + Strings::Escape(account_entry.crc_eqgame) + "'"); insert_values.push_back("'" + Strings::Escape(account_entry.crc_eqgame) + "'");
@ -444,12 +436,11 @@ public:
entry.rulesflag = atoi(row[16]); entry.rulesflag = atoi(row[16]);
entry.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10); entry.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
entry.time_creation = atoi(row[18]); entry.time_creation = atoi(row[18]);
entry.expansion = atoi(row[19]); entry.ban_reason = row[19] ? row[19] : "";
entry.ban_reason = row[20] ? row[20] : ""; entry.suspend_reason = row[20] ? row[20] : "";
entry.suspend_reason = row[21] ? row[21] : ""; entry.crc_eqgame = row[21] ? row[21] : "";
entry.crc_eqgame = row[22] ? row[22] : ""; entry.crc_skillcaps = row[22] ? row[22] : "";
entry.crc_skillcaps = row[23] ? row[23] : ""; entry.crc_basedata = row[23] ? row[23] : "";
entry.crc_basedata = row[24] ? row[24] : "";
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -493,12 +484,11 @@ public:
entry.rulesflag = atoi(row[16]); entry.rulesflag = atoi(row[16]);
entry.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10); entry.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
entry.time_creation = atoi(row[18]); entry.time_creation = atoi(row[18]);
entry.expansion = atoi(row[19]); entry.ban_reason = row[19] ? row[19] : "";
entry.ban_reason = row[20] ? row[20] : ""; entry.suspend_reason = row[20] ? row[20] : "";
entry.suspend_reason = row[21] ? row[21] : ""; entry.crc_eqgame = row[21] ? row[21] : "";
entry.crc_eqgame = row[22] ? row[22] : ""; entry.crc_skillcaps = row[22] ? row[22] : "";
entry.crc_skillcaps = row[23] ? row[23] : ""; entry.crc_basedata = row[23] ? row[23] : "";
entry.crc_basedata = row[24] ? row[24] : "";
all_entries.push_back(entry); all_entries.push_back(entry);
} }

2
common/version.h
View File

@ -34,7 +34,7 @@
* Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/ */
#define CURRENT_BINARY_DATABASE_VERSION 9196 #define CURRENT_BINARY_DATABASE_VERSION 9197
#ifdef BOTS #ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9029 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9029

1
utils/sql/db_update_manifest.txt
View File

@ -450,6 +450,7 @@
9194|2022_07_23_dz_switch_id.sql|SHOW COLUMNS FROM `doors` LIKE 'dz_switch_id'|empty| 9194|2022_07_23_dz_switch_id.sql|SHOW COLUMNS FROM `doors` LIKE 'dz_switch_id'|empty|
9195|2022_07_23_dz_templates.sql|SHOW TABLES like 'dynamic_zone_templates'|empty| 9195|2022_07_23_dz_templates.sql|SHOW TABLES like 'dynamic_zone_templates'|empty|
9196|2022_07_30_merchantlist_temp.sql|SHOW COLUMNS FROM `merchantlist_temp` LIKE 'zone_id'|empty| 9196|2022_07_30_merchantlist_temp.sql|SHOW COLUMNS FROM `merchantlist_temp` LIKE 'zone_id'|empty|
9197|2022_08_01_drop_expansion_account.sql|SHOW COLUMNS FROM `account` LIKE 'expansion'|notempty|
# Upgrade conditions: # Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not # This won't be needed after this system is implemented, but it is used database that are not

1
utils/sql/git/required/2022_08_01_drop_expansion_account.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `account` DROP `expansion`;