From 83aa193eed7eb9448e7453740a402745fb681e39 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 16 May 2011 15:56:27 +0000 Subject: [PATCH] 2011-05-16 Sergio Martin * pandoradb_data.sql pandoradb.sql pandoradb.data.postgreSQL.sql pandoradb.data.oracle.sql: Fixed default values into tusuario_perfil and tgrupo git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/pandoradb.data.oracle.sql | 18 +++++++++--------- pandora_console/pandoradb.data.postgreSQL.sql | 18 +++++++++--------- pandora_console/pandoradb.sql | 2 +- pandora_console/pandoradb_data.sql | 18 +++++++++--------- 5 files changed, 36 insertions(+), 28 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index bdbd121268..2341ea04f4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2011-05-16 Sergio Martin + + * pandoradb_data.sql + pandoradb.sql + pandoradb.data.postgreSQL.sql + pandoradb.data.oracle.sql: Fixed default values into tusuario_perfil + and tgrupo + 2011-05-16 Juan Manuel Ramon * pandoradb.oracle.sql: Removed PK from id_agente_modulo field of diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index bc04c29568..9597ff4544 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -129,14 +129,14 @@ END;; -- BEGIN LOCK TABLE tgrupo IN EXCLUSIVE MODE; -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (2,'Servers','server_database',0,0,0,''); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (4,'Firewalls','firewall',0,0,0,''); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (8,'Databases','database_gear',0,0,0,''); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (9,'Network','transmit',0,0,0,''); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (10,'Unknown','world',0,0,0,''); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (11,'Workstations','computer',0,0,0,''); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (12,'Applications','applications',0,0,0,''); -INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (13,'Web','world',0,0,0,''); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (2,'Servers','server_database',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (4,'Firewalls','firewall',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (8,'Databases','database_gear',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (9,'Network','transmit',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (10,'Unknown','world',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (11,'Workstations','computer',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (12,'Applications','applications',0,0,0,'',0); +INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled, custom_id) VALUES (13,'Web','world',0,0,0,'',0); COMMIT; END;; @@ -278,7 +278,7 @@ END;; -- BEGIN LOCK TABLE tusuario_perfil IN EXCLUSIVE MODE; -INSERT INTO tusuario_perfil VALUES (1,'admin',5,0,'admin'); +INSERT INTO tusuario_perfil VALUES (1,'admin',5,0,'admin',0); COMMIT; END;; diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 364c7ed2a5..11cb2bc7a4 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -113,14 +113,14 @@ BEGIN WORK; LOCK TABLE "tgrupo"; INSERT INTO "tgrupo" ("id_grupo", "nombre", "icon", "parent", "propagate", "disabled", "custom_id") VALUES -(2,'Servers','server_database',0,0,0,''), -(4,'Firewalls','firewall',0,0,0,''), -(8,'Databases','database_gear',0,0,0,''), -(9,'Network','transmit',0,0,0,''), -(10,'Unknown','world',0,0,0,''), -(11,'Workstations','computer',0,0,0,''), -(12,'Applications','applications',0,0,0,''), -(13,'Web','world',0,0,0,''); +(2,'Servers','server_database',0,0,0,'',0), +(4,'Firewalls','firewall',0,0,0,'',0), +(8,'Databases','database_gear',0,0,0,'',0), +(9,'Network','transmit',0,0,0,'',0), +(10,'Unknown','world',0,0,0,'',0), +(11,'Workstations','computer',0,0,0,'',0), +(12,'Applications','applications',0,0,0,'',0), +(13,'Web','world',0,0,0,'',0); COMMIT WORK; SELECT setval('tgrupo_id_grupo_seq', (SELECT (SELECT MAX(id_grupo) FROM tgrupo))); @@ -252,7 +252,7 @@ INSERT INTO "tusuario" ("id_user", "fullname", "firstname", "lastname", "middlen -- -- Dumping data for table "tusuario_perfil" -- -INSERT INTO "tusuario_perfil" VALUES (1,'admin',5,0,'admin'); +INSERT INTO "tusuario_perfil" VALUES (1,'admin',5,0,'admin',0); SELECT setval('tusuario_perfil_id_up_seq', (SELECT (SELECT MAX(id_up) FROM tusuario_perfil))); -- diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index e949c9a98d..3c6a3cb51d 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -440,7 +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, + `id_skin` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id_grupo`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 489a746450..428082dc53 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -111,14 +111,14 @@ UNLOCK TABLES; LOCK TABLES `tgrupo` WRITE; INSERT INTO `tgrupo` VALUES -(2,'Servers','server_database',0,0,0,''), -(4,'Firewalls','firewall',0,0,0,''), -(8,'Databases','database_gear',0,0,0,''), -(9,'Network','transmit',0,0,0,''), -(10,'Unknown','world',0,0,0,''), -(11,'Workstations','computer',0,0,0,''), -(12,'Applications','applications',0,0,0,''), -(13,'Web','world',0,0,0,''); +(2,'Servers','server_database',0,0,0,'',0), +(4,'Firewalls','firewall',0,0,0,'',0), +(8,'Databases','database_gear',0,0,0,'',0), +(9,'Network','transmit',0,0,0,'',0), +(10,'Unknown','world',0,0,0,'',0), +(11,'Workstations','computer',0,0,0,'',0), +(12,'Applications','applications',0,0,0,'',0), +(13,'Web','world',0,0,0,'',0); UNLOCK TABLES; @@ -256,7 +256,7 @@ INSERT INTO `tusuario` (`id_user`, `fullname`, `firstname`, `lastname`, `middlen -- Dumping data for table `tusuario_perfil` -- -INSERT INTO `tusuario_perfil` VALUES (1,'admin',5,0,'admin'); +INSERT INTO `tusuario_perfil` VALUES (1,'admin',5,0,'admin',0); -- -- Dumping data for table `tperfil`