From 2d36697db8072a5b90750418e8137470011340a9 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Diaz Date: Wed, 7 Oct 2015 14:01:49 +0200 Subject: [PATCH] Fixed module relationships. Ticket#2766 --- pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql | 1 + pandora_console/pandoradb.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql index 2adcedae80..4b474911c5 100644 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql @@ -163,6 +163,7 @@ DROP TABLE `tgis_map_has_tgis_map_connection`; ALTER TABLE `tmodule_relationship` --ADD COLUMN `id_rt` int(10) unsigned NOT NULL DEFAULT 0, ADD FOREIGN KEY (`id_rt`) REFERENCES trecon_task(`id_rt`) ON DELETE CASCADE; + ALTER TABLE tmodule_relationship MODIFY `id_rt` int(10) unsigned NULL default NULL; -- --------------------------------------------------------------------- -- Table `tevent_filter` diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 868a66d491..e025938192 100755 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -697,7 +697,7 @@ CREATE TABLE IF NOT EXISTS `trecon_task` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tmodule_relationship` ( `id` int(10) unsigned NOT NULL auto_increment, - `id_rt` int(10) unsigned NOT NULL DEFAULT 0, + `id_rt` int(10) unsigned DEFAULT NULL, `module_a` int(10) unsigned NOT NULL, `module_b` int(10) unsigned NOT NULL, `disable_update` tinyint(1) unsigned NOT NULL default '0',