From dd162339dc682791462e095de643e7d401d310fc Mon Sep 17 00:00:00 2001 From: alena Date: Tue, 5 Apr 2011 11:17:49 -0700 Subject: [PATCH 1/2] bug 9325: DB upgrade - added missing constraints to ssh_keypair table status 9325: resolved fixed --- setup/db/db/schema-21to22.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup/db/db/schema-21to22.sql b/setup/db/db/schema-21to22.sql index 9ace7664bb0..be2f11ddccd 100755 --- a/setup/db/db/schema-21to22.sql +++ b/setup/db/db/schema-21to22.sql @@ -951,3 +951,6 @@ ALTER TABLE `cloud`.`instance_group` ADD CONSTRAINT `fk_instance_group__account_ ALTER TABLE `cloud`.`instance_group_vm_map` ADD CONSTRAINT `fk_instance_group_vm_map___group_id` FOREIGN KEY `fk_instance_group_vm_map___group_id` (`group_id`) REFERENCES `instance_group` (`id`) ON DELETE CASCADE; ALTER TABLE `cloud`.`instance_group_vm_map` ADD CONSTRAINT `fk_instance_group_vm_map___instance_id` FOREIGN KEY `fk_instance_group_vm_map___instance_id` (`instance_id`) REFERENCES `user_vm` (`id`) ON DELETE CASCADE; ALTER TABLE `cloud`.`domain` MODIFY COLUMN `path` varchar(255) UNIQUE NOT NULL; + +ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT `fk_ssh_keypairs__account_id` FOREIGN KEY `fk_ssh_keypair__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE; +ALTER TABLE `cloud`.`ssh_keypairs` ADD CONSTRAINT `fk_ssh_keypairs__domain_id` FOREIGN KEY `fk_ssh_keypair__domain_id` (`domain_id`) REFERENCES `domain` (`id`) ON DELETE CASCADE; From 8ebe8db39a439e3f3f37afbd2df45dc5fbd7bd5c Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Tue, 5 Apr 2011 12:01:03 -0700 Subject: [PATCH 2/2] bug 9326: put unique back into create-schema.sql --- setup/db/create-schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 0a14f7a1df7..87745ec31d3 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -1181,7 +1181,7 @@ CREATE TABLE `cloud`.`vpn_users` ( CREATE TABLE `cloud`.`storage_pool` ( `id` bigint unsigned UNIQUE NOT NULL, `name` varchar(255) COMMENT 'should be NOT NULL', - `uuid` varchar(255), + `uuid` varchar(255) UNIQUE, `pool_type` varchar(32) NOT NULL, `port` int unsigned NOT NULL, `data_center_id` bigint unsigned NOT NULL,