fix(install): prevent useless warnings

Author: btry

install/install.php

@@ -139,8 +139,8 @@ public function upgrade(Migration $migration, $args = []): bool {
       }
 
       // Check schema of tables before upgrading
+      $oldVersion = Config::getConfigurationValue('formcreator', 'previous_version');
       if (!isset($args['skip-db-check'])) {
-         $oldVersion = Config::getConfigurationValue('formcreator', 'previous_version');
          if ($oldVersion !== null) {
             $checkResult = true;
             if (version_compare($oldVersion, '2.13.0') >= 0) {
@@ -219,15 +219,17 @@ public function upgrade(Migration $migration, $args = []): bool {
          PluginFormcreatorIssue::cronSyncIssues($task);
       }
 
+      $lazyCheck = false;
+      // $lazyCheck = (version_compare($oldVersion, '2.13.0') < 0);
       // Check schema of tables after upgrade
       $checkResult = $this->checkSchema(
          PLUGIN_FORMCREATOR_VERSION,
          false,
-         false,
-         false,
-         false,
-         false,
-         false
+         $lazyCheck,
+         $lazyCheck,
+         $lazyCheck,
+         $lazyCheck,
+         $lazyCheck
       );
       if (!$checkResult) {
          $message = sprintf(

install/mysql/plugin_formcreator_2.13.0_empty.sql

@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_answers` (
 CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_categories` (
   `id`                               int unsigned NOT NULL AUTO_INCREMENT,
   `name`                             varchar(255) NOT NULL DEFAULT '',
-  `comment`                          text,
+  `comment`                          mediumtext,
   `completename`                     varchar(255) DEFAULT NULL,
   `plugin_formcreator_categories_id` int unsigned NOT NULL DEFAULT '0',
   `level`                            int(11) NOT NULL DEFAULT '1',
@@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_formanswers` (
   `groups_id_validator`         int unsigned NOT NULL DEFAULT '0' COMMENT 'Group in charge of validation',
   `request_date`                timestamp    NULL,
   `status`                      int(11)      NOT NULL DEFAULT '101',
-  `comment`                     text,
+  `comment`                     mediumtext,
   PRIMARY KEY (`id`),
   INDEX `plugin_formcreator_forms_id` (`plugin_formcreator_forms_id`),
   INDEX `entities_id_is_recursive` (`entities_id`, `is_recursive`),
@@ -329,7 +329,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questiondependencies` (
 CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questionregexes` (
   `id`                                int unsigned  NOT NULL AUTO_INCREMENT,
   `plugin_formcreator_questions_id`   int unsigned  NOT NULL DEFAULT '0',
-  `regex`                             text          DEFAULT NULL,
+  `regex`                             mediumtext    DEFAULT NULL,
   `fieldname`                         varchar(255)  DEFAULT NULL,
   `uuid`                              varchar(255)  DEFAULT NULL,
   PRIMARY KEY (`id`),

install/upgrade_to_2.13.php

@@ -38,6 +38,7 @@ class PluginFormcreatorUpgradeTo2_13 {
    public function upgrade(Migration $migration) {
       $this->migration = $migration;
       $this->fixTables();
+      $this->updateShortText();
       $this->migrateEntityConfig();
       $this->addDefaultFormListMode();
       $this->addDashboardVisibility();
@@ -160,13 +161,30 @@ public function fixTables(): void {
       $this->migration->migrationOneTable($table);
 
       $table = 'glpi_plugin_formcreator_questiondependencies';
-      $this->migration->changeField($table, 'plugin_formcreator_questions_id', 'plugin_formcreator_questions_id', $unsignedIntType);
-      $this->migration->changeField($table, 'plugin_formcreator_questions_id_2', 'plugin_formcreator_questions_id_2', $unsignedIntType);
-      $this->migration->migrationOneTable($table);
+      if ($DB->tableExists($table)) {
+         // Table may be created at the very end when upgrading from < 2.12
+         $this->migration->changeField($table, 'plugin_formcreator_questions_id', 'plugin_formcreator_questions_id', $unsignedIntType);
+         $this->migration->changeField($table, 'plugin_formcreator_questions_id_2', 'plugin_formcreator_questions_id_2', $unsignedIntType);
+         $this->migration->migrationOneTable($table);
+      }
 
       $table = 'glpi_plugin_formcreator_forms_languages';
-      $this->migration->changeField($table, 'plugin_formcreator_forms_id', 'plugin_formcreator_forms_id', $unsignedIntType);
-      $this->migration->migrationOneTable($table);
+      if ($DB->tableExists($table)) {
+         // Table may be created at the very end when upgrading from < 2.12
+         $this->migration->changeField($table, 'plugin_formcreator_forms_id', 'plugin_formcreator_forms_id', $unsignedIntType);
+         $this->migration->migrationOneTable($table);
+      }
+   }
+
+   public function updateShortText() {
+      $table = 'glpi_plugin_formcreator_categories';
+      $this->migration->changeField($table, 'comment', 'comment', 'mediumtext');
+
+      $table = 'glpi_plugin_formcreator_formanswers';
+      $this->migration->changeField($table, 'comment', 'comment', 'mediumtext');
+
+      $table = 'glpi_plugin_formcreator_questionregexes';
+      $this->migration->changeField($table, 'regex', 'regex', 'mediumtext');
    }
 
    public function addEntityOption() {
@@ -399,6 +417,9 @@ protected function migrateFkToUnsignedInt() {
       ];
 
       foreach ($tables as $table => $fields) {
+         if (!$DB->tableExists($table)) {
+            continue;
+         }
          foreach ($fields as $field) {
             if ($field == 'id') {
                $type = 'autoincrement';

tests/script-functions.sh

@@ -59,7 +59,10 @@ 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
+   # Upgrading from < 2.6 will create a MyISAM table, then re-run innoDB migration
+   php ../../bin/console glpi:migration:myisam_to_innodb --no-interaction --config-dir=../../$TEST_GLPI_CONFIG_DIR
    php ../../bin/console glpi:migration:unsigned_keys    --no-interaction --config-dir=../../$TEST_GLPI_CONFIG_DIR
+   php ../../bin/console glpi:migration:utf8mb4          --no-interaction --config-dir=../../$TEST_GLPI_CONFIG_DIR
 }
 
 # Plugin test