diff --git a/pandora_console/extras/mr/37.sql b/pandora_console/extras/mr/37.sql index aad1cd6f61..fedc4b477e 100644 --- a/pandora_console/extras/mr/37.sql +++ b/pandora_console/extras/mr/37.sql @@ -46,19 +46,18 @@ CREATE TABLE `tpen` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- ---------------------------------------------------------------------- --- New table `tnetwork_profile_pen` +-- Table `tnetwork_profile_pen` -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` ( `pen` int(10) unsigned NOT NULL, `id_np` int(10) unsigned NOT NULL, PRIMARY KEY (`pen`), CONSTRAINT `fk_network_profile_pen_pen` FOREIGN KEY (`pen`) - REFERENCES `tpen` (`pen`) ON DELETE CASCADE ON UPDATE CASCADE + REFERENCES `tpen` (`pen`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fk_network_profile_pen_id_np` FOREIGN KEY (`id_np`) REFERENCES `tnetwork_profile` (`id_np`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - ALTER TABLE `twidget_dashboard` ADD COLUMN `position` TEXT NOT NULL default ''; ALTER TABLE `tagente_estado` ADD COLUMN `last_status_change` bigint(20) NOT NULL default '0'; 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 92ef97325f..f3a3f612a1 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 @@ -1476,19 +1476,6 @@ ALTER TABLE tnetwork_component ADD COLUMN `dynamic_two_tailed` tinyint(1) unsign ALTER TABLE `tnetwork_component` ADD COLUMN `ff_type` tinyint(1) unsigned default '0'; ALTER TABLE `tnetwork_component` MODIFY COLUMN `ff_type` tinyint(1) unsigned NULL DEFAULT '0'; --- ---------------------------------------------------------------------- --- Table `tnetwork_profile_pen` --- ---------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` ( - `pen` int(10) unsigned NOT NULL, - `id_np` int(10) unsigned NOT NULL, - PRIMARY KEY (`pen`), - CONSTRAINT `fk_network_profile_pen_pen` FOREIGN KEY (`pen`) - REFERENCES `tpen` (`pen`) ON DELETE CASCADE ON UPDATE CASCADE - CONSTRAINT `fk_network_profile_pen_id_np` FOREIGN KEY (`id_np`) - REFERENCES `tnetwork_profile` (`id_np`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -- ---------------------------------------------------------------------- -- Table `tpen` -- ---------------------------------------------------------------------- @@ -1499,6 +1486,19 @@ CREATE TABLE IF NOT EXISTS `tpen` ( PRIMARY KEY (`pen`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- ---------------------------------------------------------------------- +-- Table `tnetwork_profile_pen` +-- ---------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` ( + `pen` int(10) unsigned NOT NULL, + `id_np` int(10) unsigned NOT NULL, + PRIMARY KEY (`pen`), + CONSTRAINT `fk_network_profile_pen_pen` FOREIGN KEY (`pen`) + REFERENCES `tpen` (`pen`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk_network_profile_pen_id_np` FOREIGN KEY (`id_np`) + REFERENCES `tnetwork_profile` (`id_np`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + -- --------------------------------------------------------------------- -- Table `tagente` -- --------------------------------------------------------------------- diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 8013735d17..fa8f8d3043 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -953,19 +953,6 @@ CREATE TABLE IF NOT EXISTS `tnetwork_profile_component` ( KEY `id_np` (`id_np`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- ---------------------------------------------------------------------- --- Table `tnetwork_profile_pen` --- ---------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` ( - `pen` int(10) unsigned NOT NULL, - `id_np` int(10) unsigned NOT NULL, - PRIMARY KEY (`pen`), - CONSTRAINT `fk_network_profile_pen_pen` FOREIGN KEY (`pen`) - REFERENCES `tpen` (`pen`) ON DELETE CASCADE ON UPDATE CASCADE - CONSTRAINT `fk_network_profile_pen_id_np` FOREIGN KEY (`id_np`) - REFERENCES `tnetwork_profile` (`id_np`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -- ---------------------------------------------------------------------- -- Table `tpen` -- ---------------------------------------------------------------------- @@ -976,6 +963,19 @@ CREATE TABLE IF NOT EXISTS `tpen` ( PRIMARY KEY (`pen`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- ---------------------------------------------------------------------- +-- Table `tnetwork_profile_pen` +-- ---------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` ( + `pen` int(10) unsigned NOT NULL, + `id_np` int(10) unsigned NOT NULL, + PRIMARY KEY (`pen`), + CONSTRAINT `fk_network_profile_pen_pen` FOREIGN KEY (`pen`) + REFERENCES `tpen` (`pen`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk_network_profile_pen_id_np` FOREIGN KEY (`id_np`) + REFERENCES `tnetwork_profile` (`id_np`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + -- ---------------------------------------------------------------------- -- Table `tnota` -- ----------------------------------------------------------------------