CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges

yadvr · yadvr · commit 5f8a2ee9be49 · 2013-02-22T19:15:01.000+05:30
Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
@@ -1049,7 +1049,6 @@ CREATE TABLE  `cloud`.`vm_template` (
   `source_template_id` bigint unsigned COMMENT 'Id of the original template, if this template is created from snapshot',
   `template_tag` varchar(255) COMMENT 'template tag',
   `sort_key` int(32) NOT NULL default 0 COMMENT 'sort key used for customising sort method',
-  `image_data_store_id` bigint unsigned,
   PRIMARY KEY  (`id`),
   INDEX `i_vm_template__removed`(`removed`),
   CONSTRAINT `uc_vm_template__uuid` UNIQUE (`uuid`)
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
@@ -75,6 +75,7 @@ CREATE TABLE `cloud`.`image_data_store` (
   CONSTRAINT `fk_tags__image_data_store_provider_id` FOREIGN KEY(`image_provider_id`) REFERENCES `data_store_provider`(`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+ALTER TABLE `cloud`.`vm_template` ADD COLUMN `image_data_store_id` bigint unsigned;
 
 ALTER TABLE `cloud`.`service_offering` ADD COLUMN `is_volatile` tinyint(1) unsigned NOT NULL DEFAULT 0  COMMENT 'true if the vm needs to be volatile, i.e., on every reboot of vm from API root disk is discarded and creates a new root disk';
 
