fix(install): prevent fatal error in migration

btry · btry · commit b0b15710f1ee · 2023-05-26T16:21:13.000+02:00
diff --git a/install/install.php b/install/install.php
@@ -143,6 +143,7 @@ public function upgrade(Migration $migration, $args = []): bool {
          }
       }
 
+      $this->migration = $migration;
       $oldVersion = Config::getConfigurationValue('formcreator', 'previous_version');
       // Force fix of signed columns to reduce upgrade errors frequency
       // This assumes that all modified columns exist in the database
@@ -185,7 +186,6 @@ public function upgrade(Migration $migration, $args = []): bool {
          }
       }
 
-      $this->migration = $migration;
       if (isset($args['force-upgrade']) && $args['force-upgrade'] === true) {
          // Might return false
          $fromSchemaVersion = array_search(PLUGIN_FORMCREATOR_SCHEMA_VERSION, $this->upgradeSteps);
@@ -1024,5 +1024,7 @@ protected function migrateFkToUnsignedInt() {
          }
          $this->migration->changeField($table, 'id', 'id', 'int ' . DBConnection::getDefaultPrimaryKeySignOption() . ' not null auto_increment');
       }
+
+      $this->migration->executeMigration();
    }
 }

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ public function upgrade(Migration $migration, $args = []): bool {`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ $this->migration = $migration;`
`146`	`147`	`$oldVersion = Config::getConfigurationValue('formcreator', 'previous_version');`
`147`	`148`	`// Force fix of signed columns to reduce upgrade errors frequency`
`148`	`149`	`// This assumes that all modified columns exist in the database`
`@@ -185,7 +186,6 @@ public function upgrade(Migration $migration, $args = []): bool {`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`
`188`		`- $this->migration = $migration;`
`189`	`189`	`if (isset($args['force-upgrade']) && $args['force-upgrade'] === true) {`
`190`	`190`	`// Might return false`
`191`	`191`	`$fromSchemaVersion = array_search(PLUGIN_FORMCREATOR_SCHEMA_VERSION, $this->upgradeSteps);`
`@@ -1024,5 +1024,7 @@ protected function migrateFkToUnsignedInt() {`
`1024`	`1024`	`}`
`1025`	`1025`	`$this->migration->changeField($table, 'id', 'id', 'int ' . DBConnection::getDefaultPrimaryKeySignOption() . ' not null auto_increment');`
`1026`	`1026`	`}`
	`1027`	`+`
	`1028`	`+ $this->migration->executeMigration();`
`1027`	`1029`	`}`
`1028`	`1030`	`}`