From 8f0066dc89e725f2581c963db7e5c7b52e448f91 Mon Sep 17 00:00:00 2001 From: vgilc Date: Fri, 27 Jan 2012 13:52:49 +0000 Subject: [PATCH] 2012-01-27 Vanessa Gil * extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Fixed error adding delete cascade in tplanned_dowtime_agents. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ .../extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql | 2 ++ .../extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql | 3 +++ .../extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql | 2 ++ 4 files changed, 14 insertions(+) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fdb506990d..b043005202 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-01-27 Vanessa Gil + + * extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql + extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql + extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Fixed error adding delete + cascade in tplanned_dowtime_agents. + 2012-01-27 Vanessa Gil * pandoradb.sql diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql index 396b860acf..6b88c04c89 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql @@ -88,6 +88,8 @@ ALTER TABLE `talert_templates` ADD COLUMN `special_day` tinyint(1) DEFAULT '0'; -- ----------------------------------------------------- -- Table `tplanned_downtime_agents` -- ----------------------------------------------------- +DELETE FROM tplanned_downtime_agents +WHERE id_downtime NOT IN (SELECT id FROM tplanned_downtime); ALTER TABLE tplanned_downtime_agents ADD FOREIGN KEY(`id_downtime`) REFERENCES tplanned_downtime(`id`) diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql index 9a6cae8564..75c8929940 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql @@ -93,6 +93,9 @@ alter table talert_templates add (special_day NUMBER(5,0) default 0); -- Table `tplanned_downtime_agents` -- ----------------------------------------------------- +DELETE FROM tplanned_downtime_agents +WHERE id_downtime NOT IN (SELECT id FROM tplanned_downtime); + alter table tplanned_downtime_agents add constraint tplanned_downtimes_foreign_key foreign key (id_downtime) diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql index 5e9a7830a9..138cf20655 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql @@ -78,6 +78,8 @@ ALTER TABLE "talert_templates" ADD COLUMN "special_day" SMALLINT default 0; -- ----------------------------------------------------- -- Table `tplanned_downtime_agents` -- ----------------------------------------------------- +DELETE FROM "tplanned_downtime_agents" +WHERE "id_downtime" NOT IN (SELECT "id" FROM "tplanned_downtime"); ALTER TABLE "tplanned_downtime_agents" ADD CONSTRAINT downtime_foreign