Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(install): create tables before filling them
Browse files Browse the repository at this point in the history
Signed-off-by: Thierry Bugier <tbugier@teclib.com>
btry committed Dec 10, 2018
1 parent 167c43f commit 9bf7c6b
Showing 2 changed files with 27 additions and 2 deletions.
6 changes: 4 additions & 2 deletions install/install.php
Original file line number Diff line number Diff line change
@@ -92,6 +92,10 @@ public function install(Migration $migration) {
*/
public function upgrade(Migration $migration) {
$this->migration = $migration;

// if the schema contains new tables
$this->installSchema();

if (isset($_SESSION['plugin_formcreator']['cli']) && $_SESSION['plugin_formcreator']['cli'] == 'force-upgrade') {
// Might return false
$fromSchemaVersion = array_search(PLUGIN_FORMCREATOR_SCHEMA_VERSION, $this->upgradeSteps);
@@ -105,8 +109,6 @@ public function upgrade(Migration $migration) {
}

$this->migration->executeMigration();
// if the schema contains new tables
$this->installSchema();
$this->configureExistingEntities();
$this->createRequestType();
$this->createDefaultDisplayPreferences();
23 changes: 23 additions & 0 deletions install/upgrade_to_2.7.php
Original file line number Diff line number Diff line change
@@ -116,6 +116,17 @@ public function upgrade(Migration $migration) {
// Migrate regex question parameters
$table = 'glpi_plugin_formcreator_questions';
if ($DB->fieldExists($table, 'regex')) {
$DB->query(
"CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questionregexes` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`plugin_formcreator_questions_id` int(11) NOT NULL,
`regex` text DEFAULT NULL,
`fieldname` varchar(255) DEFAULT NULL,
`uuid` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`),
INDEX `plugin_formcreator_questions_id` (`plugin_formcreator_questions_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"
);
$request = [
'FROM' => $table,
'WHERE' => ['fieldtype' => ['float', 'integer', 'text', 'textarea']]
@@ -134,6 +145,18 @@ public function upgrade(Migration $migration) {
// Migrate range question parameters
$table = 'glpi_plugin_formcreator_questions';
if ($DB->fieldExists($table, 'range_min')) {
$DB->query(
"CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_questionranges` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`plugin_formcreator_questions_id` int(11) NOT NULL,
`range_min` varchar(255) DEFAULT NULL,
`range_max` varchar(255) DEFAULT NULL,
`fieldname` varchar(255) DEFAULT NULL,
`uuid` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`),
INDEX `plugin_formcreator_questions_id` (`plugin_formcreator_questions_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"
);
$request = [
'FROM' => $table,
'WHERE' => ['fieldtype' => ['float', 'integer', 'checkboxes', 'multiselect', 'text']]

0 comments on commit 9bf7c6b

Please sign in to comment.