From 56b961ac3b997215c453487629cfff336cc49da9 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Thu, 7 Jul 2022 10:51:27 +0000
Subject: [PATCH] fix linear order of migrations for 4.4 and 4.5, fixes #1256

Closes #1256

Merge request studip/studip!773
---
 ...red.php => 1.262_consultations_option_exclude_expired.php} | 0
 ...n_events.php => 1.263_fix_missing_consultation_events.php} | 0
 ...urses.php => 1.264_step_00332_mvv_overlapping_courses.php} | 0
 ...origin_config.php => 1.265_jsonapi_cors_origin_config.php} | 0
 ...ituteplaning.php => 1.266_step_00338_instituteplaning.php} | 0
 ...play.php => 1.267_config_for_download_counter_display.php} | 0
 ....php => 1.268_add_enable_free_access_for_courses_only.php} | 0
 ...itional_mvv_tables.php => 1.269_additional_mvv_tables.php} | 0
 ...scription.php => 1.270_tic8458_add_upload_description.php} | 0
 ...ment_migration.php => 1.271_room_management_migration.php} | 0
 ...l_field.php => 1.272_resize_auth_user_md5_email_field.php} | 0
 ...ted_userdomains.php => 1.273_unrestricted_userdomains.php} | 0
 ...{1.262_blubbermessenger.php => 1.274_blubbermessenger.php} | 0
 ...bbermessenger_keys.php => 1.275_blubbermessenger_keys.php} | 0
 ...messenger_search.php => 1.276_blubbermessenger_search.php} | 0
 ...bbermessenger_flat.php => 1.277_blubbermessenger_flat.php} | 0
 ...s_config.php => 1.278_jsonapi_dangerous_routes_config.php} | 0
 ...hp => 1.283_change_schedule_color_with_category_index.php} | 0
 ...dule_coloring.php => 1.284_fixes_on_schedule_coloring.php} | 0
 .../{1.283_add_filetypes.php => 1.285_add_filetypes.php}      | 0
 lib/migrations/DBSchemaVersion.php                            | 4 ++--
 21 files changed, 2 insertions(+), 2 deletions(-)
 rename db/migrations/{1.266_consultations_option_exclude_expired.php => 1.262_consultations_option_exclude_expired.php} (100%)
 rename db/migrations/{1.269_fix_missing_consultation_events.php => 1.263_fix_missing_consultation_events.php} (100%)
 rename db/migrations/{1.270_step_00332_mvv_overlapping_courses.php => 1.264_step_00332_mvv_overlapping_courses.php} (100%)
 rename db/migrations/{1.271_jsonapi_cors_origin_config.php => 1.265_jsonapi_cors_origin_config.php} (100%)
 rename db/migrations/{1.272_step_00338_instituteplaning.php => 1.266_step_00338_instituteplaning.php} (100%)
 rename db/migrations/{1.273_config_for_download_counter_display.php => 1.267_config_for_download_counter_display.php} (100%)
 rename db/migrations/{1.274_add_enable_free_access_for_courses_only.php => 1.268_add_enable_free_access_for_courses_only.php} (100%)
 rename db/migrations/{1.275_additional_mvv_tables.php => 1.269_additional_mvv_tables.php} (100%)
 rename db/migrations/{1.276_tic8458_add_upload_description.php => 1.270_tic8458_add_upload_description.php} (100%)
 rename db/migrations/{1.277_room_management_migration.php => 1.271_room_management_migration.php} (100%)
 rename db/migrations/{1.278_resize_auth_user_md5_email_field.php => 1.272_resize_auth_user_md5_email_field.php} (100%)
 rename db/migrations/{1.268_unrestricted_userdomains.php => 1.273_unrestricted_userdomains.php} (100%)
 rename db/migrations/{1.262_blubbermessenger.php => 1.274_blubbermessenger.php} (100%)
 rename db/migrations/{1.263_blubbermessenger_keys.php => 1.275_blubbermessenger_keys.php} (100%)
 rename db/migrations/{1.264_blubbermessenger_search.php => 1.276_blubbermessenger_search.php} (100%)
 rename db/migrations/{1.265_blubbermessenger_flat.php => 1.277_blubbermessenger_flat.php} (100%)
 rename db/migrations/{1.267_jsonapi_dangerous_routes_config.php => 1.278_jsonapi_dangerous_routes_config.php} (100%)
 rename db/migrations/{1.284_change_schedule_color_with_category_index.php => 1.283_change_schedule_color_with_category_index.php} (100%)
 rename db/migrations/{1.285_fixes_on_schedule_coloring.php => 1.284_fixes_on_schedule_coloring.php} (100%)
 rename db/migrations/{1.283_add_filetypes.php => 1.285_add_filetypes.php} (100%)

diff --git a/db/migrations/1.266_consultations_option_exclude_expired.php b/db/migrations/1.262_consultations_option_exclude_expired.php
similarity index 100%
rename from db/migrations/1.266_consultations_option_exclude_expired.php
rename to db/migrations/1.262_consultations_option_exclude_expired.php
diff --git a/db/migrations/1.269_fix_missing_consultation_events.php b/db/migrations/1.263_fix_missing_consultation_events.php
similarity index 100%
rename from db/migrations/1.269_fix_missing_consultation_events.php
rename to db/migrations/1.263_fix_missing_consultation_events.php
diff --git a/db/migrations/1.270_step_00332_mvv_overlapping_courses.php b/db/migrations/1.264_step_00332_mvv_overlapping_courses.php
similarity index 100%
rename from db/migrations/1.270_step_00332_mvv_overlapping_courses.php
rename to db/migrations/1.264_step_00332_mvv_overlapping_courses.php
diff --git a/db/migrations/1.271_jsonapi_cors_origin_config.php b/db/migrations/1.265_jsonapi_cors_origin_config.php
similarity index 100%
rename from db/migrations/1.271_jsonapi_cors_origin_config.php
rename to db/migrations/1.265_jsonapi_cors_origin_config.php
diff --git a/db/migrations/1.272_step_00338_instituteplaning.php b/db/migrations/1.266_step_00338_instituteplaning.php
similarity index 100%
rename from db/migrations/1.272_step_00338_instituteplaning.php
rename to db/migrations/1.266_step_00338_instituteplaning.php
diff --git a/db/migrations/1.273_config_for_download_counter_display.php b/db/migrations/1.267_config_for_download_counter_display.php
similarity index 100%
rename from db/migrations/1.273_config_for_download_counter_display.php
rename to db/migrations/1.267_config_for_download_counter_display.php
diff --git a/db/migrations/1.274_add_enable_free_access_for_courses_only.php b/db/migrations/1.268_add_enable_free_access_for_courses_only.php
similarity index 100%
rename from db/migrations/1.274_add_enable_free_access_for_courses_only.php
rename to db/migrations/1.268_add_enable_free_access_for_courses_only.php
diff --git a/db/migrations/1.275_additional_mvv_tables.php b/db/migrations/1.269_additional_mvv_tables.php
similarity index 100%
rename from db/migrations/1.275_additional_mvv_tables.php
rename to db/migrations/1.269_additional_mvv_tables.php
diff --git a/db/migrations/1.276_tic8458_add_upload_description.php b/db/migrations/1.270_tic8458_add_upload_description.php
similarity index 100%
rename from db/migrations/1.276_tic8458_add_upload_description.php
rename to db/migrations/1.270_tic8458_add_upload_description.php
diff --git a/db/migrations/1.277_room_management_migration.php b/db/migrations/1.271_room_management_migration.php
similarity index 100%
rename from db/migrations/1.277_room_management_migration.php
rename to db/migrations/1.271_room_management_migration.php
diff --git a/db/migrations/1.278_resize_auth_user_md5_email_field.php b/db/migrations/1.272_resize_auth_user_md5_email_field.php
similarity index 100%
rename from db/migrations/1.278_resize_auth_user_md5_email_field.php
rename to db/migrations/1.272_resize_auth_user_md5_email_field.php
diff --git a/db/migrations/1.268_unrestricted_userdomains.php b/db/migrations/1.273_unrestricted_userdomains.php
similarity index 100%
rename from db/migrations/1.268_unrestricted_userdomains.php
rename to db/migrations/1.273_unrestricted_userdomains.php
diff --git a/db/migrations/1.262_blubbermessenger.php b/db/migrations/1.274_blubbermessenger.php
similarity index 100%
rename from db/migrations/1.262_blubbermessenger.php
rename to db/migrations/1.274_blubbermessenger.php
diff --git a/db/migrations/1.263_blubbermessenger_keys.php b/db/migrations/1.275_blubbermessenger_keys.php
similarity index 100%
rename from db/migrations/1.263_blubbermessenger_keys.php
rename to db/migrations/1.275_blubbermessenger_keys.php
diff --git a/db/migrations/1.264_blubbermessenger_search.php b/db/migrations/1.276_blubbermessenger_search.php
similarity index 100%
rename from db/migrations/1.264_blubbermessenger_search.php
rename to db/migrations/1.276_blubbermessenger_search.php
diff --git a/db/migrations/1.265_blubbermessenger_flat.php b/db/migrations/1.277_blubbermessenger_flat.php
similarity index 100%
rename from db/migrations/1.265_blubbermessenger_flat.php
rename to db/migrations/1.277_blubbermessenger_flat.php
diff --git a/db/migrations/1.267_jsonapi_dangerous_routes_config.php b/db/migrations/1.278_jsonapi_dangerous_routes_config.php
similarity index 100%
rename from db/migrations/1.267_jsonapi_dangerous_routes_config.php
rename to db/migrations/1.278_jsonapi_dangerous_routes_config.php
diff --git a/db/migrations/1.284_change_schedule_color_with_category_index.php b/db/migrations/1.283_change_schedule_color_with_category_index.php
similarity index 100%
rename from db/migrations/1.284_change_schedule_color_with_category_index.php
rename to db/migrations/1.283_change_schedule_color_with_category_index.php
diff --git a/db/migrations/1.285_fixes_on_schedule_coloring.php b/db/migrations/1.284_fixes_on_schedule_coloring.php
similarity index 100%
rename from db/migrations/1.285_fixes_on_schedule_coloring.php
rename to db/migrations/1.284_fixes_on_schedule_coloring.php
diff --git a/db/migrations/1.283_add_filetypes.php b/db/migrations/1.285_add_filetypes.php
similarity index 100%
rename from db/migrations/1.283_add_filetypes.php
rename to db/migrations/1.285_add_filetypes.php
diff --git a/lib/migrations/DBSchemaVersion.php b/lib/migrations/DBSchemaVersion.php
index 0a14558b592..846a544cae8 100644
--- a/lib/migrations/DBSchemaVersion.php
+++ b/lib/migrations/DBSchemaVersion.php
@@ -166,9 +166,9 @@ class DBSchemaVersion implements SchemaVersion
         $result = $db->query("SHOW TABLES LIKE 'schema_versions'");
 
         if ($result && $result->rowCount() > 0) {
-            $base_version = 269;    // 4.4
+            $base_version = 263;    // 4.4
             $schema_mapping = [
-                20200307 => 285,    // 4.5
+                20200307 => 284,    // 4.5
                 20200522 => 290,    // 4.6
                 20210511 => 327     // 5.0
             ];
-- 
GitLab