From 952a8533921709b65483764199c9bd7cdc3bc3b3 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 14 Aug 2015 13:12:29 +0530 Subject: [PATCH] CLOUDSTACK-8696: Port Rajani's regions fix to 451to452 sql upgrade path Upgrade paths from 4.5.1 exists to both 4.5.2, and 4.6.0. Since 4.5.2 and 4.6.0 are not release, and the bug affects 4.5 branch; this patch aims to port that fix from master to both 4.5/master branches. Ported from commit b6a7804 Signed-off-by: Rohit Yadav --- setup/db/db/schema-451to452.sql | 4 ++++ setup/db/db/schema-452to460.sql | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setup/db/db/schema-451to452.sql b/setup/db/db/schema-451to452.sql index 5c89008a83e..d0aeabf3d1b 100644 --- a/setup/db/db/schema-451to452.sql +++ b/setup/db/db/schema-451to452.sql @@ -33,3 +33,7 @@ CREATE TABLE `cloud`.`saml_token` ( PRIMARY KEY (`id`), CONSTRAINT `fk_saml_token__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +SET foreign_key_checks = 0; +ALTER TABLE `cloud`.`region` MODIFY `id` int unsigned UNIQUE NOT NULL; +SET foreign_key_checks = 1; diff --git a/setup/db/db/schema-452to460.sql b/setup/db/db/schema-452to460.sql index 9009ba418ed..e013b2bf85c 100644 --- a/setup/db/db/schema-452to460.sql +++ b/setup/db/db/schema-452to460.sql @@ -399,6 +399,3 @@ CREATE TABLE `cloud`.`external_bigswitch_bcf_devices` ( CONSTRAINT `fk_external_bigswitch_bcf_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -SET foreign_key_checks = 0; -ALTER TABLE `cloud`.`region` MODIFY `id` int unsigned UNIQUE NOT NULL; -SET foreign_key_checks = 1;