From c9486b7f022fb35867396d11e2a20ad29bedf15a Mon Sep 17 00:00:00 2001 From: Thierry Bugier Date: Fri, 4 Feb 2022 15:19:19 +0100 Subject: [PATCH] fix(install): delegate to GLPI the conversion of most foreign keys --- install/upgrade_to_2.13.php | 63 ------------------------------------- tests/script-functions.sh | 1 + 2 files changed, 1 insertion(+), 63 deletions(-) diff --git a/install/upgrade_to_2.13.php b/install/upgrade_to_2.13.php index 298e699f3..fa92349c3 100644 --- a/install/upgrade_to_2.13.php +++ b/install/upgrade_to_2.13.php @@ -165,59 +165,25 @@ protected function migrateFkToUnsignedInt() { $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', @@ -228,10 +194,7 @@ protected function migrateFkToUnsignedInt() { 'ola_question_ttr', ], 'glpi_plugin_formcreator_targettickets' => [ - 'id', - 'plugin_formcreator_forms_id', 'type_question', - 'tickettemplates_id', 'due_date_question', 'urgency_question', 'destination_entity_value', @@ -244,41 +207,15 @@ protected function migrateFkToUnsignedInt() { 'ola_question_ttr', ], '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) { diff --git a/tests/script-functions.sh b/tests/script-functions.sh index 7bd6c73cc..8ee9416ab 100644 --- a/tests/script-functions.sh +++ b/tests/script-functions.sh @@ -56,6 +56,7 @@ plugin_test_upgrade() { mysql -h$DB_HOST -u$DB_USER -p$DB_PASSWD $OLD_DB_NAME < tests/plugin_formcreator_empty_2.5.0.sql php ../../bin/console glpi:migration:myisam_to_innodb --no-interaction --config-dir=../../$TEST_GLPI_CONFIG_DIR php ../../bin/console glpi:plugin:install formcreator --username=glpi --config-dir=../../$TEST_GLPI_CONFIG_DIR + php ../../bin/console glpi:migration:unsigned_keys --no-interaction --config-dir=../../$TEST_GLPI_CONFIG_DIR } # Plugin test