fix(install): database schema inconsistencies between instal and upgrade

Author: btry

RoboFilePlugin.php

@@ -38,7 +38,8 @@ class RoboFilePlugin extends \Robo\Tasks
       '/vendor/',
       '/node_modules/',
       '/lib/',
-      '/development/'
+      '/development/',
+      '/output/',
    ];
    protected $csfiles  = ['./'];
 

install/mysql/plugin_formcreator_empty.sql

@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_entityconfigs` (
 
 CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
   `entities_id` int(11) NOT NULL DEFAULT '0',
   `is_recursive` tinyint(1) NOT NULL DEFAULT '0',
   `access_rights` tinyint(1) NOT NULL DEFAULT '1',
@@ -64,8 +64,8 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_formanswers` (
   `is_recursive` tinyint(1) NOT NULL DEFAULT '0',
   `plugin_formcreator_forms_id` int(11) NOT NULL,
   `requester_id` int(11) DEFAULT NULL,
-  `users_id_validator` int(11) DEFAULT NULL,
-  `groups_id_validator` int(11) DEFAULT NULL,
+  `users_id_validator` int(11) NOT NULL DEFAULT '0',
+  `groups_id_validator` int(11) NOT NULL DEFAULT '0',
   `request_date` datetime NOT NULL,
   `status` enum('waiting','refused','accepted') NOT NULL DEFAULT 'waiting',
   `comment` text,
@@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms_validators` (
 
 CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questions` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
   `plugin_formcreator_sections_id` int(11) NOT NULL,
   `fieldtype` varchar(30) NOT NULL DEFAULT 'text',
   `required` tinyint(1) NOT NULL DEFAULT '0',
@@ -129,7 +129,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questions_conditions` (
 
 CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_sections` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL DEFAULT '',
   `plugin_formcreator_forms_id` int(11) NOT NULL,
   `order` int(11) NOT NULL DEFAULT '0',
   `uuid` varchar(255) DEFAULT NULL,
@@ -153,7 +153,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targetchanges` (
   `urgency_rule` enum('none','specific','answer') NOT NULL DEFAULT 'none',
   `urgency_question` int(11) NOT NULL DEFAULT '0',
   `validation_followup` tinyint(1) NOT NULL DEFAULT '1',
-  `destination_entity` enum('current','requester','requester_dynamic_first','requester_dynamic_last','form','validator','specific','user','entity') NOT NULL DEFAULT 'requester',
+  `destination_entity` enum('current','requester','requester_dynamic_first','requester_dynamic_last','form','validator','specific','user','entity') NOT NULL DEFAULT 'current',
   `destination_entity_value` int(11) DEFAULT NULL,
   `tag_type` enum('none','questions','specifics','questions_and_specific','questions_or_specific') NOT NULL DEFAULT 'none',
   `tag_questions` varchar(255) NOT NULL,
@@ -198,8 +198,6 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targettickets` (
   `due_date_period` enum('minute','hour','day','month') DEFAULT NULL,
   `urgency_rule` enum('none','specific','answer') NOT NULL DEFAULT 'none',
   `urgency_question` int(11) NOT NULL DEFAULT '0',
-  `location_rule` enum('none','specific','answer') NOT NULL DEFAULT 'none',
-  `location_question` int(11) NOT NULL DEFAULT '0',
   `validation_followup` tinyint(1) NOT NULL DEFAULT '1',
   `destination_entity` enum('current','requester','requester_dynamic_first','requester_dynamic_last','form','validator','specific','user','entity') NOT NULL DEFAULT 'current',
   `destination_entity_value` int(11) DEFAULT NULL,
@@ -208,6 +206,9 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_targettickets` (
   `tag_specifics` varchar(255) NOT NULL,
   `category_rule` enum('none','specific','answer') NOT NULL DEFAULT 'none',
   `category_question` int(11) NOT NULL DEFAULT '0',
+  `uuid` varchar(255) DEFAULT NULL,
+  `location_rule` enum('none','specific','answer') NOT NULL DEFAULT 'none',
+  `location_question` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   INDEX `tickettemplates_id` (`tickettemplates_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

install/upgrade_to_2.6.php

@@ -123,6 +123,8 @@ public function upgrade(Migration $migration) {
       // Fix bad foreign key
       $table = 'glpi_plugin_formcreator_answers';
       $migration->changeField($table, 'plugin_formcreator_question_id', 'plugin_formcreator_questions_id', 'integer');
+      $migration->dropKey($table, 'plugin_formcreator_question_id');
+      $migration->addKey($table, 'plugin_formcreator_questions_id', 'plugin_formcreator_questions_id');
 
       $table = 'glpi_plugin_formcreator_items_targettickets';
       if (!$DB->tableExists($table)) {

tests/src/CommonTestCase.php

@@ -405,6 +405,7 @@ protected function _checkTargetTicket($targetticket = []) {
          'category_question',
          '_actors',
          '_ticket_relations',
+         'uuid',
       ];
       $this->array($targetticket)->notHasKeys([
          'id',

tests/suite-uninstall/Config.php

@@ -99,5 +99,4 @@ public function testUninstallPlugin() {
       // - NotificationTemplateTranslation
       // - Notification_NotificationTemplate
    }
-
 }