feat: convert foreign keys to unsigned integers

pluginsGLPI · Feb 14, 2022 · 4af002a · 4af002a
1 parent fb267cf
commit 4af002a
Show file tree

Hide file tree

Showing 10 changed files with 318 additions and 156 deletions.
diff --git a/front/targetticket.form.php b/front/targetticket.form.php
@@ -55,7 +55,7 @@
    if (!$targetTicket->canUpdateItem()) {
       Session::addMessageAfterRedirect(__('No right to update this item.', 'formcreator'), false, ERROR);
    } else {
-      $actor_value = $_POST['actor_value_' . $_POST['actor_type']] ?? null;
+      $actor_value = $_POST['actor_value_' . $_POST['actor_type']] ?? 0;
       $use_notification = ($_POST['use_notification'] == 0) ? 0 : 1;
       $targetTicket_actor = new PluginFormcreatorTarget_Actor();
       $targetTicket_actor->add([

diff --git a/inc/abstracttarget.class.php b/inc/abstracttarget.class.php
@@ -1595,7 +1595,7 @@ protected function setTargetDueDate($data, PluginFormcreatorFormAnswer $formansw
       global $DB;
 
       $answer  = new PluginFormcreatorAnswer();
-      if ($this->fields['due_date_question'] !== null) {
+      if ($this->fields['due_date_question'] != 0) {
          $request = [
             'FROM' => $answer::getTable(),
             'WHERE' => [

diff --git a/inc/target_actor.class.php b/inc/target_actor.class.php
@@ -98,7 +98,7 @@ public function prepareInputForAdd($input) {
          return false;
       }
 
-      $input['actor_value'] = $input['actor_value_' . $input['actor_type']] ?? null;
+      $input['actor_value'] = $input['actor_value_' . $input['actor_type']] ?? 0;
 
       if (isset($input['use_notification'])) {
          $input['use_notification'] = ($input['use_notification'] == 0) ? 0 : 1;

diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
@@ -523,7 +523,7 @@ public function prepareInputForUpdate($input) {
                   unset($input['_destination_entity_value_entity']);
                   break;
                default :
-                  $input['destination_entity_value'] = 'NULL';
+                  $input['destination_entity_value'] = 0;
                   break;
             }
          }

diff --git a/inc/targetproblem.class.php b/inc/targetproblem.class.php
@@ -269,7 +269,7 @@ public function prepareInputForUpdate($input) {
                   unset($input['_destination_entity_value_entity']);
                   break;
                default :
-                  $input['destination_entity_value'] = 'NULL';
+                  $input['destination_entity_value'] = 0;
                   break;
             }
          }

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -556,7 +556,7 @@ public function prepareInputForUpdate($input) {
                   $input['destination_entity_value'] = $input['_destination_entity_value_entity'];
                   break;
                default :
-                  $input['destination_entity_value'] = 'NULL';
+                  $input['destination_entity_value'] = 0;
                   break;
             }
          }

diff --git a/install/mysql/plugin_formcreator_empty.sql b/install/mysql/plugin_formcreator_empty.sql
diff --git a/install/upgrade_to_2.13.php b/install/upgrade_to_2.13.php
@@ -37,10 +37,11 @@ class PluginFormcreatorUpgradeTo2_13 {
     */
    public function upgrade(Migration $migration) {
       $this->migration = $migration;
+      $this->migrateFkToUnsignedInt();
       $this->addFormAnswerTitle();
       $this->defaultValuesForTargets();
       $this->migrateItemtypeInQuestion();
-      $this->fixInconsistency();
+      // $this->fixInconsistency();
       $this->addTargetValidationSetting();
       $this->addFormVisibility();
       $this->addDashboardVisibility();
@@ -140,4 +141,165 @@ protected function addDashboardVisibility() {
 
       $this->migration->addPostQuery("UPDATE glpi_plugin_formcreator_entityconfigs SET `is_dashboard_visible`=1 WHERE `id`=0");
    }
+
+   protected function migrateFkToUnsignedInt() {
+      global $DB;
+
+      $table = 'glpi_plugin_formcreator_formanswers';
+      $DB->queryOrDie("UPDATE `$table`, SET `requester_id` = 0 WHERE `requester_id` IS NULL");
+
+      $table = 'glpi_plugin_formcreator_targetchanges';
+      $DB->queryOrDie("UPDATE `$table`, SET `due_date_question` = 0 WHERE `due_date_question` IS NULL");
+      $DB->queryOrDie("UPDATE `$table`, SET `destination_entity_value` = 0 WHERE `destination_entity_value` IS NULL");
+
+      $table = 'glpi_plugin_formcreator_targettickets';
+      $DB->queryOrDie("UPDATE `$table`, SET `due_date_question` = 0 WHERE `due_date_question` IS NULL");
+      $DB->queryOrDie("UPDATE `$table`, SET `destination_entity_value` = 0 WHERE `destination_entity_value` IS NULL");
+
+      $table = 'glpi_plugin_formcreator_targetproblems';
+      $DB->queryOrDie("UPDATE `$table`, SET `destination_entity_value` = 0 WHERE `destination_entity_value` IS NULL");
+
+      $table = 'glpi_plugin_formcreator_targets_actors';
+      $DB->queryOrDie("UPDATE `$table`, SET `actor_value` = 0 WHERE `actor_value` IS NULL");
+
+      $tables = [
+         'glpi_plugin_formcreator_answers' => [
+            'id',
+            'plugin_formcreator_formanswers_id',
+            'plugin_formcreator_questions_id',
+         ],
+         'glpi_plugin_formcreator_categories' => [
+            'id',
+            'plugin_formcreator_categories_id',
+            'knowbaseitemcategories_id',
+         ],
+         'glpi_plugin_formcreator_entityconfigs' => [
+            'plugin_formcreator_categories_id',
+         ],
+         'glpi_plugin_formcreator_forms' => [
+            'id',
+            'entities_id',
+            'plugin_formcreator_categories_id',
+         ],
+         'glpi_plugin_formcreator_formanswers' => [
+            'id',
+            'entities_id',
+            'plugin_formcreator_forms_id',
+            'requester_id',
+            'users_id_validator',
+            'groups_id_validator',
+         ],
+         'glpi_plugin_formcreator_forms_profiles' => [
+            'id',
+            'plugin_formcreator_forms_id',
+            'profiles_id',
+         ],
+         'glpi_plugin_formcreator_forms_validators' => [
+            'id',
+            'plugin_formcreator_forms_id',
+            'items_id',
+         ],
+         'glpi_plugin_formcreator_questions' => [
+            'id',
+            'plugin_formcreator_sections_id',
+         ],
+         'glpi_plugin_formcreator_conditions' => [
+            'id',
+            'items_id',
+            'plugin_formcreator_questions_id',
+         ],
+         'glpi_plugin_formcreator_sections' => [
+            'id',
+            'plugin_formcreator_forms_id',
+         ],
+         'glpi_plugin_formcreator_targetchanges' => [
+            'id',
+            'plugin_formcreator_forms_id',
+            'changetemplates_id',
+            'due_date_question',
+            'urgency_question',
+            'destination_entity_value',
+            'category_question',
+            'sla_question_tto',
+            'sla_question_ttr',
+            'ola_question_tto',
+            'ola_question_ttr',
+         ],
+         'glpi_plugin_formcreator_targettickets' => [
+            'id',
+            'plugin_formcreator_forms_id',
+            'type_question',
+            'tickettemplates_id',
+            'due_date_question',
+            'urgency_question',
+            'destination_entity_value',
+            'category_question',
+            'associate_question',
+            'location_question',
+            'sla_question_tto',
+            'sla_question_ttr',
+            'ola_question_tto',
+            'ola_question_ttr',
+         ],
+         'glpi_plugin_formcreator_targetproblems' => [
+            'id',
+            'plugin_formcreator_forms_id',
+            'problemtemplates_id',
+            'urgency_question',
+            'destination_entity_value',
+            'category_question',
+         ],
+         'glpi_plugin_formcreator_targets_actors' => [
+            'id',
+            'items_id',
+            'actor_value',
+         ],
+         'glpi_plugin_formcreator_issues' => [
+            'id',
+            'items_id',
+            'entities_id',
+            'requester_id',
+            'users_id_validator',
+            'groups_id_validator',
+            'users_id_recipient',
+         ],
+         'glpi_plugin_formcreator_items_targettickets' => [
+            'id',
+            'plugin_formcreator_targettickets_id',
+            'items_id',
+         ],
+         'glpi_plugin_formcreator_questiondependencies' => [
+            'id',
+            'plugin_formcreator_questions_id',
+            'plugin_formcreator_questions_id_2',
+         ],
+         'glpi_plugin_formcreator_questionregexes' => [
+            'id',
+            'plugin_formcreator_questions_id',
+         ],
+         'glpi_plugin_formcreator_questionranges' => [
+            'id',
+            'plugin_formcreator_questions_id',
+         ],
+         'glpi_plugin_formcreator_forms_languages' => [
+            'id',
+            'plugin_formcreator_forms_id',
+         ],
+      ];
+
+      foreach ($tables as $table => $fields) {
+         foreach ($fields as $field) {
+            if ($field == 'id') {
+               $type = 'autoincrement';
+            } else {
+               $type = "INT " . DBConnection::getDefaultPrimaryKeySignOption() . " NOT NULL DEFAULT 0";
+            }
+            $this->migration->changeField($table, $field, $field, $type);
+         }
+      }
+
+      // Exception for ID key of glpi_plugin_formcreator_entityconfigs : it is not an autoincrement
+      $table = 'glpi_plugin_formcreator_entityconfigs';
+      $this->migration->changeField($table, 'id', 'id', 'int ' . DBConnection::getDefaultPrimaryKeySignOption() . ' not null');
+   }
 }
diff --git a/tests/3-unit/PluginFormcreatorTargetChange.php b/tests/3-unit/PluginFormcreatorTargetChange.php
@@ -500,7 +500,7 @@ public function testImport() {
          'urgency_question' => '0',
          'validation_followup' => '1',
          'destination_entity' => '0',
-         'destination_entity_value' => null,
+         'destination_entity_value' => '0',
          'tag_type' => \PluginFormcreatorTargetChange::TAG_TYPE_NONE,
          'tag_questions' => '0',
          'tag_specifics' => '',

diff --git a/tests/3-unit/PluginFormcreatorTargetTicket.php b/tests/3-unit/PluginFormcreatorTargetTicket.php
@@ -702,7 +702,7 @@ public function testImport() {
          'location_question' => '0',
          'validation_followup' => '1',
          'destination_entity' => '0',
-         'destination_entity_value' => null,
+         'destination_entity_value' => 0,
          'tag_type' => \PluginFormcreatorTargetTicket::TAG_TYPE_NONE,
          'tag_questions' => '0',
          'tag_specifics' => '',