From 4a41920ab6198e445e4a7bf74ad9a9c12d995fed Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 28 Apr 2011 13:26:35 -0700 Subject: [PATCH] 1) Don't drop netapp tables during the upgrade. 2) SecurityGroups DB upgrade - drop constraints before chaning the name for the network_group table --- setup/db/db/schema-21to22.sql | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup/db/db/schema-21to22.sql b/setup/db/db/schema-21to22.sql index f85222ae3ed..a3fc3152bec 100755 --- a/setup/db/db/schema-21to22.sql +++ b/setup/db/db/schema-21to22.sql @@ -410,8 +410,12 @@ CREATE TABLE `cloud`.`vpn_users` ( ALTER TABLE `cloud`.`storage_pool` ADD COLUMN `status` varchar(32); --drop network group related constraints/indexes; -ALTER TABLE `cloud`.`network_group` drop foreign key `fk_network_group__domain_id`; -alter table `cloud`.`network_group` drop index `i_network_group_name`; +ALTER TABLE `cloud`.`network_group` DROP foreign key `fk_network_group__domain_id`; +ALTER TABLE `cloud`.`network_group` DROP INDEX `fk_network_group__domain_id`; +ALTER TABLE `cloud`.`network_group` DROP foreign key `fk_network_group___account_id`; +ALTER TABLE `cloud`.`network_group` DROP INDEX `fk_network_group___account_id`;; + +ALTER TABLE `cloud`.`network_group` drop index `i_network_group_name`; ALTER TABLE `cloud`.`network_ingress_rule` drop foreign key `fk_network_ingress_rule___network_group_id`; ALTER TABLE `cloud`.`network_ingress_rule` drop foreign key `fk_network_ingress_rule___allowed_network_id`;