diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5c042d3b9d..2e98de844e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2011-05-13 Sergio Martin + + * pandoradb.sql + pandoradb.postgreSQL.sql + pandoradb.oracle.sql + extras/pandoradb_migrate_v3.2_to_v4.0.sql: Moved some alter tables + from Enterprise side + 2011-05-13 Sergio Martin * include/styles/pandora.css: Added new input button styles diff --git a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql index 5758d91099..38a1b485e0 100644 --- a/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql +++ b/pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql @@ -22,6 +22,7 @@ -- Table `tgrupo` -- ----------------------------------------------------- ALTER TABLE `tgrupo` MODIFY `nombre` text; +ALTER TABLE `tgrupo` ADD COLUMN `id_skin` int(10) unsigned NOT NULL; -- ----------------------------------------------------- -- Table `tnetwork_component` @@ -58,6 +59,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_item` ( -- ----------------------------------------------------- ALTER TABLE `tusuario` ADD COLUMN `block_size` int(4) NOT NULL DEFAULT 20; ALTER TABLE `tusuario` ADD COLUMN `flash_chart` int(4) NOT NULL DEFAULT 1; +ALTER TABLE `tusuario` ADD COLUMN `id_skin` int(10) unsigned NOT NULL; -- ----------------------------------------------------- -- Table `talert_actions` @@ -88,6 +90,19 @@ ALTER TABLE `tsesion` CHANGE `ID_sesion` `id_sesion` bigint(20) unsigned NOT NUL ALTER TABLE `tsesion` CHANGE `ID_usuario` `id_usuario` varchar(60) NOT NULL default '0'; ALTER TABLE `tsesion` CHANGE `IP_origen` `ip_origen` varchar(100) NOT NULL default ''; +-- ----------------------------------------------------- +-- Table `ttrap` +-- ----------------------------------------------------- +ALTER TABLE ttrap ADD `text` varchar(255) default ''; +ALTER TABLE ttrap ADD `description` varchar(255) default ''; +ALTER TABLE ttrap ADD `severity` tinyint(4) unsigned NOT NULL default '2'; + +-- ----------------------------------------------------- +-- Table `tusuario_perfil` +-- ----------------------------------------------------- + +ALTER TABLE tusuario_perfil ADD `id_policy` int(10) unsigned NOT NULL default 0; + -- ----------------------------------------------------- -- Change the value "0000-00-00 00:00:00" that Pandora use as zero or null date value -- for the value "01-01-1970 00:00:00". diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index c3c07f95e0..e914eae307 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -504,7 +504,8 @@ CREATE TABLE tgrupo ( parent NUMBER(10, 0) default 0 NOT NULL, propagate NUMBER(5, 0) default 0, disabled NUMBER(5, 0) default 0, - custom_id VARCHAR2(255) default '' + custom_id VARCHAR2(255) default '', + id_skin NUMBER(10, 0) DEFAULT 0 NOT NULL ); CREATE SEQUENCE tgrupo_s INCREMENT BY 1 START WITH 1; @@ -798,7 +799,10 @@ CREATE TABLE ttrap ( status NUMBER(5, 0) default 0 NOT NULL, id_usuario VARCHAR2(150) default '', timestamp TIMESTAMP default NULL, - priority NUMBER(5, 0) default 2 NOT NULL + priority NUMBER(5, 0) default 2 NOT NULL, + text VARCHAR2(255) default '', + description VARCHAR2(255) default '', + severity NUMBER(10, 0) default 2 NOT NULL ); CREATE SEQUENCE ttrap_s INCREMENT BY 1 START WITH 1; @@ -821,7 +825,8 @@ CREATE TABLE tusuario ( language VARCHAR2(10) default NULL, timezone VARCHAR2(50) default '', block_size NUMBER(10, 0) default 20 NOT NULL, - flash_chart NUMBER(10, 0) default 1 NOT NULL + flash_chart NUMBER(10, 0) default 1 NOT NULL, + id_skin NUMBER(10, 0) DEFAULT 0 NOT NULL ); CREATE TABLE tusuario_perfil ( @@ -829,7 +834,8 @@ CREATE TABLE tusuario_perfil ( id_usuario VARCHAR2(100) default '', id_perfil NUMBER(10, 0) default 0 NOT NULL, id_grupo NUMBER(10, 0) default 0 NOT NULL, - assigned_by VARCHAR2(100) default '' + assigned_by VARCHAR2(100) default '', + id_policy NUMBER(10, 0) DEFAULT 0 NOT NULL ); CREATE SEQUENCE tusuario_perfil_s INCREMENT BY 1 START WITH 1; diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 29b2d0f24d..972820af6f 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -404,7 +404,8 @@ CREATE TABLE "tgrupo" ( "parent" INTEGER NOT NULL default 0, "propagate" SMALLINT default 0, "disabled" SMALLINT default 0, - "custom_id" varchar(255) default '' + "custom_id" varchar(255) default '', + "id_skin" INTEGER NOT NULL DEFAULT 0 ); CREATE TABLE "tincidencia" ( @@ -646,7 +647,10 @@ CREATE TABLE "ttrap" ( "status" SMALLINT NOT NULL default 0, "id_usuario" varchar(150) default '', "timestamp" TIMESTAMP without time zone default '1970-01-01 00:00:00', - "priority" INTEGER NOT NULL default 2 + "priority" INTEGER NOT NULL default 2, + "text" varchar(255) default '', + "description" varchar(255) default '', + "severity" INTEGER NOT NULL default 2 ); CREATE TABLE "tusuario" ( @@ -665,7 +669,8 @@ CREATE TABLE "tusuario" ( "language" varchar(10) default NULL, "timezone" varchar(50) default '', "block_size" INTEGER NOT NULL default 20, - "flash_chart" INTEGER NOT NULL default 1 + "flash_chart" INTEGER NOT NULL default 1, + "id_skin" INTEGER NOT NULL DEFAULT 0 ); CREATE TABLE "tusuario_perfil" ( @@ -673,7 +678,8 @@ CREATE TABLE "tusuario_perfil" ( "id_usuario" varchar(100) NOT NULL default '', "id_perfil" INTEGER NOT NULL default 0, "id_grupo" INTEGER NOT NULL default 0, - "assigned_by" varchar(100) NOT NULL default '' + "assigned_by" varchar(100) NOT NULL default '', + "id_policy" INTEGER DEFAULT 0 NOT NULL ); CREATE TABLE "tnews" ( diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 3428a06777..e949c9a98d 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -440,6 +440,7 @@ CREATE TABLE IF NOT EXISTS `tgrupo` ( `propagate` tinyint(1) unsigned NOT NULL default '0', `disabled` tinyint(3) unsigned NOT NULL default '0', `custom_id` varchar(255) default '', + `id_skin` int(10) unsigned NOT NULL, PRIMARY KEY (`id_grupo`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -706,6 +707,9 @@ CREATE TABLE IF NOT EXISTS `ttrap` ( `id_usuario` varchar(150) default '', `timestamp` datetime NOT NULL default '1970-01-01 00:00:00', `priority` tinyint(4) unsigned NOT NULL default '2', + `text` varchar(255) default '', + `description` varchar(255) default '', + `severity` tinyint(4) unsigned NOT NULL default '2', PRIMARY KEY (`id_trap`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -726,6 +730,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( `timezone` varchar(50) default '', `block_size` int(4) NOT NULL DEFAULT 20, `flash_chart` int(4) NOT NULL DEFAULT 1, + `id_skin` int(10) unsigned NOT NULL, UNIQUE KEY `id_user` (`id_user`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -735,6 +740,7 @@ CREATE TABLE IF NOT EXISTS `tusuario_perfil` ( `id_perfil` int(10) unsigned NOT NULL default '0', `id_grupo` int(10) NOT NULL default '0', `assigned_by` varchar(100) NOT NULL default '', + `id_policy` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id_up`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;