From 923c8ee0b83ea8be0738a2097ebf29d3899ec0e2 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 21 Jan 2019 18:43:35 +0100 Subject: [PATCH] Revert "Added tnetwork_matrix data structure" This reverts commit 5328a0e23984a35e565953c1a130d19c503e5343 [formerly aa49de6c04a3c7a612ce7041393fe521e23e281d]. Former-commit-id: 2c762f04c289c46670aab7ed7844ff3880e8d39a --- .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 14 -------------- pandora_console/pandoradb.sql | 16 +--------------- 2 files changed, 1 insertion(+), 29 deletions(-) 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 d0d17dfb18..5dc7cd70c4 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 @@ -1868,17 +1868,3 @@ CREATE TABLE IF NOT EXISTS `tgis_map_layer_groups` ( FOREIGN KEY (`group_id`) REFERENCES `tgrupo` (`id_grupo`) ON DELETE CASCADE, FOREIGN KEY (`agent_id`) REFERENCES `tagente` (`id_agente`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- ----------------------------------------------------- --- Table `tnetwork_matrix` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `tnetwork_matrix` ( - `id` int(10) unsigned NOT NULL auto_increment, - `source` varchar(60) default '', - `destination` varchar(60) default '', - `utimestamp` bigint(20) default 0, - `bytes` int(18) unsigned default 0, - `pkts` int(18) unsigned default 0, - PRIMARY KEY (`id`), - UNIQUE (`source`, `destination`, `utimestamp`) -) ENGINE = InnoDB DEFAULT CHARSET=utf8 ; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 42d7ea487c..7f8197540b 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -3377,18 +3377,4 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields_filter` ( `recursion` int(1) unsigned default '0', `group_search` int(10) unsigned default '0', PRIMARY KEY(`id`) -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- ----------------------------------------------------- --- Table `tnetwork_matrix` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `tnetwork_matrix` ( - `id` int(10) unsigned NOT NULL auto_increment, - `source` varchar(60) default '', - `destination` varchar(60) default '', - `utimestamp` bigint(20) default 0, - `bytes` int(18) unsigned default 0, - `pkts` int(18) unsigned default 0, - PRIMARY KEY (`id`), - UNIQUE (`source`, `destination`, `utimestamp`) -) ENGINE = InnoDB DEFAULT CHARSET=utf8 ; \ No newline at end of file +) ENGINE = InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file