From e1d233453f2c1b934b3e5a42faf941647186627c Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Wed, 25 Mar 2020 13:05:56 +0100
Subject: [PATCH] Update database files
---
pandora_console/extras/mr/37.sql | 11 +++++++++--
.../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 12 ++++++++++--
pandora_console/pandoradb.sql | 14 +++++++++++++-
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/pandora_console/extras/mr/37.sql b/pandora_console/extras/mr/37.sql
index 0536682485..840f6994c7 100644
--- a/pandora_console/extras/mr/37.sql
+++ b/pandora_console/extras/mr/37.sql
@@ -3,7 +3,6 @@ START TRANSACTION;
ALTER TABLE trecon_task MODIFY COLUMN `id_network_profile` TEXT;
ALTER TABLE `trecon_task` CHANGE COLUMN `create_incident` `direct_report` TINYINT(1) UNSIGNED DEFAULT 0;
UPDATE `trecon_task` SET `direct_report` = 1;
-ALTER TABLE `tnetwork_profile` ADD COLUMN `pen` TEXT;
CREATE TABLE `tdiscovery_tmp_agents` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -33,6 +32,14 @@ CREATE TABLE `tdiscovery_tmp_connections` (
REFERENCES `tdiscovery_tmp_agents` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-ALTE
+CREATE TABLE `tpen` (
+ `id_np` int(10) unsigned NOT NULL,
+ `pen` int(10) unsigned NOT NULL,
+ `manufacturer` TEXT NOT NULL,
+ `description` TEXT NULL,
+ PRIMARY KEY (`id_np`,`pen`),
+ CONSTRAINT `fk_np_id` FOREIGN KEY (`id_np`)
+ REFERENCES `tnetwork_profile` (`id_np`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
COMMIT;
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 0b9011fbde..a0b563e04c 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
@@ -1473,9 +1473,17 @@ ALTER TABLE `tnetwork_component` ADD COLUMN `ff_type` tinyint(1) unsigned defaul
ALTER TABLE `tnetwork_component` MODIFY COLUMN `ff_type` tinyint(1) unsigned NULL DEFAULT '0';
-- ----------------------------------------------------------------------
--- Table `tnetwork_profile`
+-- Table `tpen`
-- ----------------------------------------------------------------------
-ALTER TABLE `tnetwork_profile` ADD COLUMN `pen` TEXT;
+CREATE TABLE IF NOT EXISTS `tpen` (
+ `id_np` int(10) unsigned NOT NULL,
+ `pen` int(10) unsigned NOT NULL,
+ `manufacturer` TEXT NOT NULL,
+ `description` TEXT NULL,
+ PRIMARY KEY (`id_np`,`pen`),
+ CONSTRAINT `fk_np_id` 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 b12a83e1d7..d40787c74a 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -942,7 +942,6 @@ CREATE TABLE IF NOT EXISTS `tnetwork_profile` (
`id_np` int(10) unsigned NOT NULL auto_increment,
`name` varchar(100) NOT NULL default '',
`description` varchar(250) default '',
- `pen` text default '',
PRIMARY KEY (`id_np`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -955,6 +954,19 @@ CREATE TABLE IF NOT EXISTS `tnetwork_profile_component` (
KEY `id_np` (`id_np`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- ----------------------------------------------------------------------
+-- Table `tpen`
+-- ----------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `tpen` (
+ `id_np` int(10) unsigned NOT NULL,
+ `pen` int(10) unsigned NOT NULL,
+ `manufacturer` TEXT NOT NULL,
+ `description` TEXT NULL,
+ PRIMARY KEY (`id_np`,`pen`),
+ CONSTRAINT `fk_np_id` FOREIGN KEY (`id_np`)
+ REFERENCES `tnetwork_profile` (`id_np`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
-- ----------------------------------------------------------------------
-- Table `tnota`
-- ----------------------------------------------------------------------