Correcting version tag for file type questions (#709)

* Correcting version tag for file type questions.

* New code checker requirement.

Author: mchurchward

classes/privacy/provider.php

@@ -31,8 +31,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class provider implements
-    \core_privacy\local\request\core_userlist_provider,
     \core_privacy\local\metadata\provider,
+    \core_privacy\local\request\core_userlist_provider,
     \core_privacy\local\request\plugin\provider {
     /**
      * Returns meta data about this system.

db/upgrade.php

@@ -1029,13 +1029,41 @@ function xmldb_questionnaire_upgrade($oldversion = 0) {
         upgrade_mod_savepoint(true, 2022121601.01, 'questionnaire');
     }
 
-    if ($oldversion < 2023101500) {
+    if ($oldversion < 2025041400.02) {
+        $table = new xmldb_table('questionnaire_question');
+        $index = new xmldb_index('quest_question_sididx', XMLDB_INDEX_NOTUNIQUE, ['surveyid', 'deleted']);
+        if ($dbman->index_exists($table, $index)) {
+            $dbman->drop_index($table, $index);
+        }
+        $field = new xmldb_field('deleted', XMLDB_TYPE_CHAR, '10', XMLDB_UNSIGNED, null, null, null, 'required');
+        if ($dbman->field_exists($table, $field)) {
+            $dbman->change_field_type($table, $field);
+        }
+        unset($field);
+
+        $field = new xmldb_field('deleted', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null, 'required');
+        if ($dbman->field_exists($table, $field)) {
+            // Instead of updating all 'deleted' = 'y' to a timestamp (which could be slow on large tables),
+            // simply delete those records, as they were not restorable before this upgrade.
+            $DB->delete_records('questionnaire_question', ['deleted' => 'y']);
+            // Optionally, clear 'deleted' = 'n' to null if required by new logic.
+            $DB->set_field('questionnaire_question', 'deleted', null, ['deleted' => 'n']);
+            $dbman->change_field_type($table, $field);
+        }
+        unset($field);
+        // Questionnaire savepoint reached.
+        upgrade_mod_savepoint(true, 2025041400.02, 'questionnaire');
+    }
+
+    if ($oldversion < 2025041400.03) {
         $questiontype = new stdClass();
         $questiontype->typeid = 12;
         $questiontype->type = 'File';
         $questiontype->has_choices = 'n';
         $questiontype->response_table = 'response_file';
-        $id = $DB->insert_record('questionnaire_question_type', $questiontype);
+        if (!$DB->record_exists('questionnaire_question_type', ['typeid' => 12])) {
+            $id = $DB->insert_record('questionnaire_question_type', $questiontype);
+        }
 
         // Define table questionnaire_response_file to be created.
         $table = new xmldb_table('questionnaire_response_file');
@@ -1059,33 +1087,7 @@ function xmldb_questionnaire_upgrade($oldversion = 0) {
         }
 
         // Questionnaire savepoint reached.
-        upgrade_mod_savepoint(true, 2023101500, 'questionnaire');
-    }
-
-    if ($oldversion < 2025041400.02) {
-        $table = new xmldb_table('questionnaire_question');
-        $index = new xmldb_index('quest_question_sididx', XMLDB_INDEX_NOTUNIQUE, ['surveyid', 'deleted']);
-        if ($dbman->index_exists($table, $index)) {
-            $dbman->drop_index($table, $index);
-        }
-        $field = new xmldb_field('deleted', XMLDB_TYPE_CHAR, '10', XMLDB_UNSIGNED, null, null, null, 'required');
-        if ($dbman->field_exists($table, $field)) {
-            $dbman->change_field_type($table, $field);
-        }
-        unset($field);
-
-        $field = new xmldb_field('deleted', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null, 'required');
-        if ($dbman->field_exists($table, $field)) {
-            // Instead of updating all 'deleted' = 'y' to a timestamp (which could be slow on large tables),
-            // simply delete those records, as they were not restorable before this upgrade.
-            $DB->delete_records('questionnaire_question', ['deleted' => 'y']);
-            // Optionally, clear 'deleted' = 'n' to null if required by new logic.
-            $DB->set_field('questionnaire_question', 'deleted', null, ['deleted' => 'n']);
-            $dbman->change_field_type($table, $field);
-        }
-        unset($field);
-        // Questionnaire savepoint reached.
-        upgrade_mod_savepoint(true, 2025041400.02, 'questionnaire');
+        upgrade_mod_savepoint(true, 2025041400.03, 'questionnaire');
     }
 
     return true;

version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2025041400.02;
+$plugin->version   = 2025041400.03;
 $plugin->requires  = 2025041400.00; // Moodle 5.0 and up.
 
 $plugin->component = 'mod_questionnaire';