diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1d808ceef3..3e4a72b89b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-10-16 Junichi Satoh + + * extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql, + extras/pandoradb_migrate_4.1_to_5.0.mysql.sql, + extras/pandoradb_migrate_4.1_to_5.0.oracle.sql, + extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql: Removed duplicated + queries. + 2013-10-15 Ramon Novoa * godmode/agentes/module_manager_editor.php: Fixed the module macro diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index 6eb89bcf67..e1411eeb04 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -485,17 +485,6 @@ ALTER TABLE tusuario_perfil ADD (tags CLOB NOT NULL default ''); ALTER TABLE ttag ADD (email CLOB NULL); ALTER TABLE ttag ADD (phone CLOB NULL); --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field6 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field7 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field8 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field9 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field10 CLOB NOT NULL default ''); - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- --------------------------------------------------------------------- diff --git a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql index 24a094ab8e..cb474f7767 100644 --- a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.mysql.sql @@ -451,17 +451,6 @@ ALTER TABLE `tusuario_perfil` ADD COLUMN `tags` TEXT NOT NULL; ALTER TABLE `ttag` ADD COLUMN `email` text NULL; ALTER TABLE `ttag` ADD COLUMN `phone` text NULL; --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE `talert_snmp` ADD COLUMN `al_field4` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field5` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field6` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field7` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field8` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field9` text; -ALTER TABLE `talert_snmp` ADD COLUMN `al_field10` text; - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- --------------------------------------------------------------------- @@ -1157,3 +1146,4 @@ ALTER TABLE `tnetwork_component` CHANGE COLUMN `name` `name` TEXT NOT NULL; -- --------------------------------------------------------------------- DELETE FROM `tlanguage` WHERE id_language IN ('ast', 'eu', 'bn', 'bg', 'ca', 'da', 'et', 'fi', 'gl', 'he', 'hi', 'hu', 'ko', 'ms', 'mr', 'nb', 'ro', 'sl', 'sv', 'te', 'uk', 'vi'); + diff --git a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql index 331536bd46..d19046ccaf 100644 --- a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.oracle.sql @@ -483,17 +483,6 @@ ALTER TABLE tusuario_perfil ADD (tags CLOB NOT NULL default ''); ALTER TABLE ttag ADD (email CLOB NULL); ALTER TABLE ttag ADD (phone CLOB NULL); --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field5 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field6 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field7 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field8 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field9 CLOB NOT NULL default ''); -ALTER TABLE talert_snmp ADD COLUMN (al_field10 CLOB NOT NULL default ''); - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- --------------------------------------------------------------------- diff --git a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql index 7c0b87cbcb..b2e1d0db7a 100644 --- a/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql @@ -469,17 +469,6 @@ ALTER TABLE "tusuario_perfil" ADD COLUMN "tags" text default ''; ALTER TABLE "ttag" ADD COLUMN "email" TEXT NULL; ALTER TABLE "ttag" ADD COLUMN "phone" TEXT NULL; --- --------------------------------------------------------------------- --- Add more fields in snmp alerts (05/03/13) --- --------------------------------------------------------------------- -ALTER TABLE "talert_snmp" ADD COLUMN "al_field4" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field5" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field6" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field7" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field8" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field9" TEXT; -ALTER TABLE "talert_snmp" ADD COLUMN "al_field10" TEXT; - -- --------------------------------------------------------------------- -- Add metaconsole fields to user table (17/04/13) -- ---------------------------------------------------------------------