41-42 db upgrade - added `cloud` db reference to the upgrade statements for remote access vpn
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23136768 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23136768 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23136768 Branch: refs/heads/affinity_groups Commit: 231367685789ff6e521879d25365d6ec65a1f076 Parents: 6110e00 Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Tue Apr 2 11:03:25 2013 -0700 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Tue Apr 2 11:11:18 2013 -0700 ---------------------------------------------------------------------- setup/db/db/schema-410to420-cleanup.sql | 8 ++++---- setup/db/db/schema-410to420.sql | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23136768/setup/db/db/schema-410to420-cleanup.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420-cleanup.sql b/setup/db/db/schema-410to420-cleanup.sql index 187076f..b65717f 100644 --- a/setup/db/db/schema-410to420-cleanup.sql +++ b/setup/db/db/schema-410to420-cleanup.sql @@ -20,9 +20,9 @@ --; #have to drop the foreign key in order to delete primary key; will re-insert the foreign key later -ALTER TABLE remote_access_vpn DROP foreign key `fk_remote_access_vpn__vpn_server_addr_id`; -ALTER TABLE remote_access_vpn DROP primary key; -ALTER TABLE remote_access_vpn ADD primary key (`id`); -ALTER TABLE remote_access_vpn ADD CONSTRAINT `fk_remote_access_vpn__vpn_server_addr_id` FOREIGN KEY (`vpn_server_addr_id`) REFERENCES `user_ip_address` (`id`); +ALTER TABLE `cloud`.`remote_access_vpn` DROP foreign key `fk_remote_access_vpn__vpn_server_addr_id`; +ALTER TABLE `cloud`.`remote_access_vpn` DROP primary key; +ALTER TABLE `cloud`.`remote_access_vpn` ADD primary key (`id`); +ALTER TABLE `cloud`.`remote_access_vpn` ADD CONSTRAINT `fk_remote_access_vpn__vpn_server_addr_id` FOREIGN KEY (`vpn_server_addr_id`) REFERENCES `user_ip_address` (`id`); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23136768/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 3dee7ae..ab9df05 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -391,8 +391,8 @@ CREATE VIEW `cloud`.`account_view` AS and async_job.instance_type = 'Account' and async_job.job_status = 0; -ALTER TABLE remote_access_vpn ADD COLUMN `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id'; -ALTER TABLE remote_access_vpn ADD COLUMN `uuid` varchar(40) UNIQUE; +ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id'; +ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `uuid` varchar(40) UNIQUE; -- START: support for LXC