Merge branch 'release/3.3.5'

OGSteam · Apr 18, 2019 · 6da0b87 · 6da0b87
2 parents 58dab55 + 0df6bbf
commit 6da0b87
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/install/schemas/ogspy_structure.sql b/install/schemas/ogspy_structure.sql
@@ -41,7 +41,7 @@ DROP TABLE IF EXISTS ogspy_parsedRCRound;
 DROP TABLE IF EXISTS ogspy_round_attack;
 DROP TABLE IF EXISTS ogspy_round_defense;
 DROP TABLE IF EXISTS ogspy_game_player;
-DROP TABLE IF EXISTS ogspy_game_player;
+DROP TABLE IF EXISTS ogspy_game_ally;
 
 --
 -- Structure de la table `ogspy_config`

diff --git a/install/upgrade_to_latest.php b/install/upgrade_to_latest.php
@@ -249,7 +249,9 @@
         $requests[] = "ALTER TABLE `" . TABLE_RANK_ALLY_MILITARY_DESTRUCT . "` ADD `points_per_member` BIGINT AFTER `points`";
         $requests[] = "ALTER TABLE `" . TABLE_RANK_ALLY_HONOR . "` ADD `points_per_member` BIGINT AFTER `points`";
 
-
+        if (!defined('TABLE_GAME_ALLY')) {
+            define("TABLE_GAME_ALLY", $table_prefix . "game_ally");
+        }
         $requests[] = "CREATE TABLE IF NOT EXISTS `" . TABLE_GAME_ALLY . "` ( " .
             "`ally_id` int(6) NOT NULL ," .
             "`ally` varchar(65) NOT NULL, " .
@@ -259,6 +261,10 @@
             "PRIMARY KEY (`ally_id`) " .
             ") ENGINE=InnoDB DEFAULT CHARSET=utf8 ";
 
+        if (!defined('TABLE_GAME_PLAYER')) {
+            define("TABLE_GAME_PLAYER", $table_prefix . "game_player");
+        }
+
         $requests[] = "CREATE TABLE IF NOT EXISTS `" . TABLE_GAME_PLAYER . "` ( " .
             "`player_id` int(6) NOT NULL ," .
             "`player` varchar(65) NOT NULL, " .
@@ -273,7 +279,9 @@
 
         $requests[] = "DROP TABLE `" . TABLE_GCM_USERS . "`";
 
-
+        if (!defined('TABLE_USER_TOKEN')) {
+            define("TABLE_USER_TOKEN", $table_prefix . "user_tokens");
+        }
         $requests[] = "CREATE TABLE IF NOT EXISTS `".TABLE_USER_TOKEN."` (
             `id` INT NOT NULL AUTO_INCREMENT,
             `user_id` INT NOT NULL,