From 2da1e57dc180d15a8a7f69ff7925485fff2d2ad1 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 30 Oct 2017 16:30:51 +0100 Subject: [PATCH] Change pandora migrate and add mr8 changes - #654 Conflicts: pandora_console/extras/mr/8.sql --- pandora_console/extras/mr/8.sql | 6 ++++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/8.sql b/pandora_console/extras/mr/8.sql index 977f7989fd..591574e07b 100644 --- a/pandora_console/extras/mr/8.sql +++ b/pandora_console/extras/mr/8.sql @@ -1,3 +1,9 @@ START TRANSACTION; ALTER TABLE tusuario ADD COLUMN `time_autorefresh` int(5) unsigned NOT NULL default '30'; +ALTER TABLE treport_content ADD COLUMN lapse_calc tinyint(1) default '0'; +ALTER TABLE treport_content ADD COLUMN lapse int(11) default '300'; +ALTER TABLE treport_content ADD COLUMN visual_format tinyint(1) default '0'; +ALTER TABLE treport_content_template ADD COLUMN lapse_calc tinyint(1) default '0'; +ALTER TABLE treport_content_template ADD COLUMN lapse int(11) default '300'; +ALTER TABLE treport_content_template ADD COLUMN visual_format tinyint(1) default '0'; COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index d24b80c8b5..a7f25b24b9 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -727,7 +727,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` ( `historical_db` tinyint(1) UNSIGNED NOT NULL default 0, `lapse_calc` tinyint(1) UNSIGNED NOT NULL default '0', `lapse` int(11) UNSIGNED NOT NULL default '300', - `visual_format` UNSIGNED NOT NULL tinyint(1) default '0', + `visual_format` tinyint(1) UNSIGNED NOT NULL default '0', PRIMARY KEY(`id_rc`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8;