From 380c275d54f51dcb404f120512a71eb4ee01b0d5 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Mon, 4 Apr 2011 09:26:42 -0700 Subject: [PATCH] bug 9290: fixed default to be 0 bug 9289: dropped domain column --- setup/db/db/schema-21to22-cleanup.sql | 1 + setup/db/db/schema-21to22.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/db/db/schema-21to22-cleanup.sql b/setup/db/db/schema-21to22-cleanup.sql index 045caec3879..a595fa09e85 100644 --- a/setup/db/db/schema-21to22-cleanup.sql +++ b/setup/db/db/schema-21to22-cleanup.sql @@ -62,6 +62,7 @@ ALTER TABLE `cloud`.`domain_router` DROP COLUMN `vlan_id`; ALTER TABLE `cloud`.`domain_router` DROP COLUMN `domain_id`; ALTER TABLE `cloud`.`domain_router` DROP COLUMN `account_id`; ALTER TABLE `cloud`.`domain_router` DROP COLUMN `dhcp_ip_address`; +ALTER TABLE `cloud`.`domain_router` DROP COLUMN `domain`; ALTER TABLE `cloud`.`console_proxy` DROP FOREIGN KEY `fk_console_proxy__vlan_id`; ALTER TABLE `cloud`.`console_proxy` DROP INDEX `i_console_proxy__vlan_id`; diff --git a/setup/db/db/schema-21to22.sql b/setup/db/db/schema-21to22.sql index cb34fe53dbd..d15112c8753 100755 --- a/setup/db/db/schema-21to22.sql +++ b/setup/db/db/schema-21to22.sql @@ -339,7 +339,7 @@ CREATE TABLE `cloud`.`user_vm_details` ( ALTER TABLE `cloud`.`domain_router` MODIFY COLUMN `guest_netmask` varchar(15); ALTER TABLE `cloud`.`domain_router` MODIFY COLUMN `guest_ip_address` varchar(15); -ALTER TABLE `cloud`.`domain_router` ADD COLUMN `network_id` bigint unsigned NOT NULL; +ALTER TABLE `cloud`.`domain_router` ADD COLUMN `network_id` bigint unsigned NOT NULL DEFAULT 0; CREATE TABLE `cloud`.`upload` ( `id` bigint unsigned NOT NULL auto_increment,