Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

utils/scripts/eqemu_server.pl

@@ -52,6 +52,10 @@ if (-e "eqemu_server_skip_update.txt") {
     $skip_self_update_check = 1;
 }
 
+if (-e "eqemu_server_skip_maps_update.txt") {
+    $skip_self_maps_update_check = 1;
+}
+
 #::: Check for script self update
 check_xml_to_json_conversion() if $ARGV[0] eq "convert_xml";
 do_self_update_check_routine() if !$skip_self_update_check;
@@ -460,7 +464,7 @@ sub do_installer_routines {
         get_remote_file($install_repository_request_url . "libmysql.dll", "libmysql.dll", 1);
     }
 
-    map_files_fetch_bulk();
+    map_files_fetch_bulk() if !$skip_self_maps_update_check;
     opcodes_fetch();
     plugins_fetch();
     quest_files_fetch();
@@ -533,7 +537,10 @@ sub check_for_world_bootup_database_update {
 
     if ($binary_database_version == $local_database_version && $ARGV[0] eq "ran_from_world") {
         print "[Update] Database up to date...\n";
-        exit;
+        if (trim($db_version[2]) == 0) {
+            print "[Update] Continuing bootup\n";
+            exit;
+        }
     }
     else {
         #::: We ran world - Database needs to update, lets backup and run updates and continue world bootup
@@ -1705,26 +1712,22 @@ sub fetch_server_dlls {
 
 sub fetch_peq_db_full {
     print "[Install] Downloading latest PEQ Database... Please wait...\n";
-    get_remote_file("http://edit.projecteq.net/weekly/peq_beta.zip", "updates_staged/peq_beta.zip", 1);
+    get_remote_file("http://db.projecteq.net/api/v1/dump/latest", "updates_staged/peq-latest.zip", 1);
     print "[Install] Downloaded latest PEQ Database... Extracting...\n";
-    unzip('updates_staged/peq_beta.zip', 'updates_staged/peq_db/');
-    my $start_dir = "updates_staged/peq_db";
+    unzip('updates_staged/peq-latest.zip', 'updates_staged/peq_db/');
+    my $start_dir = "updates_staged/peq_db/peq-dump";
     find(
         sub { push @files, $File::Find::name unless -d; },
         $start_dir
     );
     for my $file (@files) {
         $destination_file = $file;
-        $destination_file =~ s/updates_staged\/peq_db\///g;
-        if ($file =~ /peqbeta|player_tables/i) {
+        $destination_file =~ s/updates_staged\/peq_db\/peq-dump\///g;
+        if ($file =~ /create_tables_content|create_tables_login|create_tables_player|create_tables_queryserv|create_tables_state|create_tables_system/i) {
             print "[Install] DB :: Installing :: " . $destination_file . "\n";
             get_mysql_result_from_file($file);
         }
     }
-
-    #::: PEQ DB baseline version
-    print get_mysql_result("DELETE FROM db_version");
-    print get_mysql_result("INSERT INTO `db_version` (`version`) VALUES (9130);");
 }
 
 sub map_files_fetch_bulk {

utils/sql/git/bots/bots_db_update_manifest.txt

@@ -25,6 +25,7 @@
 9024|2019_06_27_bots_pet_get_lost.sql|SELECT `bot_command` FROM `bot_command_settings` WHERE `bot_command` LIKE 'petgetlost'|empty|
 9025|2019_08_26_bots_owner_option_spawn_message.sql|SELECT * FROM db_version WHERE bots_version >= 9025|empty|
 9026|2019_09_09_bots_owner_options_rework.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'option_type'|empty|
+9027|2020_03_30_bots_view_update.sql|SELECT * FROM db_version WHERE bots_version >= 9027|empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not

utils/sql/git/bots/required/2020_03_30_bots_view_update.sql

@@ -0,0 +1,24 @@
+DROP VIEW IF EXISTS `vw_bot_character_mobs`;
+
+-- Views
+CREATE VIEW `vw_bot_character_mobs` AS
+SELECT
+_utf8'C' AS mob_type,
+c.`id`,
+c.`name`,
+c.`class`,
+c.`level`,
+c.`last_login`,
+c.`zone_id`,
+c.`deleted_at`
+FROM `character_data` AS c
+UNION ALL
+SELECT _utf8'B' AS mob_type,
+b.`bot_id` AS id,
+b.`name`,
+b.`class`,
+b.`level`,
+b.`last_spawn` AS last_login,
+b.`zone_id`,
+NULL AS `deleted_at`
+FROM `bot_data` AS b;

utils/sql/git/required/2020_03_09_convert_myisam_to_innodb.sql

@@ -1,7 +1,3 @@
-ALTER TABLE `aa_actions` ENGINE=InnoDB;
-ALTER TABLE `aa_effects` ENGINE=InnoDB;
-ALTER TABLE `aa_required_level_cost` ENGINE=InnoDB;
-ALTER TABLE `aa_timers` ENGINE=InnoDB;
 ALTER TABLE `account_flags` ENGINE=InnoDB;
 ALTER TABLE `account_ip` ENGINE=InnoDB;
 ALTER TABLE `account` ENGINE=InnoDB;