diff options
| author | Robert Adam <dev@robert-adam.de> | 2020-08-02 17:56:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-02 17:56:57 +0300 |
| commit | d2d5dc2cff854c864e4ec507ceb77a31963825da (patch) | |
| tree | 3a4e3cc913bbc3ae88cc01aa1a791d245273890d | |
| parent | dbb486e5ab91fcb34eed32940967aa38319b6e90 (diff) | |
| parent | 1c81b0adb9806e8f5a4aca7fbb91a701cacd1d90 (diff) | |
Merge pull request #4370: FIX(server): Reorder old table drops based on constraints
This fixes the second case of PostgreSQL migration failure in #4292
Not tested with a players table, and tested only on PostgreSQL though the changes should make the drops work better on any database.
Additionally the changes were left minimal to not introduce new issues, rather than reordering the whole section to the most logical order.
| -rw-r--r-- | src/murmur/ServerDB.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index ac5be92ee..460db00cb 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -673,14 +673,14 @@ ServerDB::ServerDB() { SQLQUERY("DROP TABLE IF EXISTS `%1slog%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1config%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1channel_info%2`"); - SQLQUERY("DROP TABLE IF EXISTS `%1channels%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1user_info%2`"); - SQLQUERY("DROP TABLE IF EXISTS `%1users%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1players%2`"); - SQLQUERY("DROP TABLE IF EXISTS `%1groups%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1group_members%2`"); + SQLQUERY("DROP TABLE IF EXISTS `%1groups%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1acl%2`"); + SQLQUERY("DROP TABLE IF EXISTS `%1users%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1channel_links%2`"); + SQLQUERY("DROP TABLE IF EXISTS `%1channels%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1bans%2`"); SQLQUERY("DROP TABLE IF EXISTS `%1servers%2`"); |