From fb331a0bbc42325bd4837a8365e7beaa260984e0 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 2 Sep 2024 13:43:00 +0000
Subject: corrected migration number for StEP 3745, re #3745

Merge request studip/studip!3355
---
 ...folder_upload_by_students_in_courses_config.php | 34 --------------------
 ...folder_upload_by_students_in_courses_config.php | 37 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 34 deletions(-)
 delete mode 100644 db/migrations/5.9.1_add_prevent_root_folder_upload_by_students_in_courses_config.php
 create mode 100644 db/migrations/6.0.14_add_prevent_root_folder_upload_by_students_in_courses_config.php

diff --git a/db/migrations/5.9.1_add_prevent_root_folder_upload_by_students_in_courses_config.php b/db/migrations/5.9.1_add_prevent_root_folder_upload_by_students_in_courses_config.php
deleted file mode 100644
index 83377ce..0000000
--- a/db/migrations/5.9.1_add_prevent_root_folder_upload_by_students_in_courses_config.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-
-class AddPreventRootFolderUploadByStudentsInCoursesConfig extends Migration
-{
-    public function description()
-    {
-        return 'Adds the PREVENT_ROOT_FOLDER_UPLOADS_BY_STUDENTS_IN_COURSES configuration.';
-    }
-
-    protected function up()
-    {
-        DBManager::get()->exec(
-            "INSERT IGNORE INTO `config`
-            (`field`, `value`, `type`, `range`, `section`,
-            `mkdate`, `chdate`,
-            `description`)
-            VALUES
-            ('PREVENT_ROOT_FOLDER_UPLOADS_BY_STUDENTS_IN_COURSES', '0', 'boolean', 'global', 'files',
-            UNIX_TIMESTAMP(), UNIX_TIMESTAMP(),
-            'Studierende können im Dateibereich einer Veranstaltung auf der Ebene des Hauptordners keine Dateien hochladen.')"
-        );
-    }
-
-    protected function down()
-    {
-        DBManager::get()->exec(
-            "DELETE `config`, `config_values`
-             FROM `config`
-             LEFT JOIN `config_values` USING (`field`)
-             WHERE `field` = 'PREVENT_ROOT_FOLDER_UPLOADS_BY_STUDENTS_IN_COURSES'"
-        );
-    }
-}
diff --git a/db/migrations/6.0.14_add_prevent_root_folder_upload_by_students_in_courses_config.php b/db/migrations/6.0.14_add_prevent_root_folder_upload_by_students_in_courses_config.php
new file mode 100644
index 0000000..d21c9ad
--- /dev/null
+++ b/db/migrations/6.0.14_add_prevent_root_folder_upload_by_students_in_courses_config.php
@@ -0,0 +1,37 @@
+<?php
+
+
+class AddPreventRootFolderUploadByStudentsInCoursesConfig extends Migration
+{
+    public function description()
+    {
+        return 'Adds the PREVENT_ROOT_FOLDER_UPLOADS_BY_STUDENTS_IN_COURSES configuration.';
+    }
+
+    protected function up()
+    {
+        DBManager::get()->exec(
+            "INSERT IGNORE INTO `config`
+            (`field`, `value`, `type`, `range`, `section`,
+            `mkdate`, `chdate`,
+            `description`)
+            VALUES
+            ('PREVENT_ROOT_FOLDER_UPLOADS_BY_STUDENTS_IN_COURSES', '0', 'boolean', 'global', 'files',
+            UNIX_TIMESTAMP(), UNIX_TIMESTAMP(),
+            'Studierende können im Dateibereich einer Veranstaltung auf der Ebene des Hauptordners keine Dateien hochladen.')"
+        );
+        //This migration initially had the number 5.9.1 when it went into the main branch.
+        //To fix this error, the migration branch must be deleted:
+        DBManager::get()->exec("DELETE FROM `schema_version` WHERE `branch` = '5.9'");
+    }
+
+    protected function down()
+    {
+        DBManager::get()->exec(
+            "DELETE `config`, `config_values`
+             FROM `config`
+             LEFT JOIN `config_values` USING (`field`)
+             WHERE `field` = 'PREVENT_ROOT_FOLDER_UPLOADS_BY_STUDENTS_IN_COURSES'"
+        );
+    }
+}
-- 
cgit v1.0