You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2014/02/10 19:34:24 UTC
git commit: updated refs/heads/4.3-forward to aff2286
Updated Branches:
refs/heads/4.3-forward 675414feb -> aff22869c
CLOUDSTACK-6068: set display flag to true in service/disk_offering_details tables
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aff22869
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aff22869
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aff22869
Branch: refs/heads/4.3-forward
Commit: aff22869cc18bcfb0845af2624fdd2afeabb3787
Parents: 675414f
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Feb 10 10:21:34 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Feb 10 10:21:34 2014 -0800
----------------------------------------------------------------------
setup/db/db/schema-421to430.sql | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aff22869/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 43e94db..dc6131d 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -173,7 +173,7 @@ CREATE VIEW `cloud`.`disk_offering_view` AS
DROP VIEW IF EXISTS `cloud`.`service_offering_view`;
CREATE VIEW `cloud`.`service_offering_view` AS
- select
+ select
service_offering.id,
disk_offering.uuid,
disk_offering.name,
@@ -212,10 +212,10 @@ CREATE VIEW `cloud`.`service_offering_view` AS
`cloud`.`domain` ON disk_offering.domain_id = domain.id
where
disk_offering.state='Active';
-
+
DROP VIEW IF EXISTS `cloud`.`template_view`;
CREATE VIEW `cloud`.`template_view` AS
- select
+ select
vm_template.id,
vm_template.uuid,
vm_template.unique_name,
@@ -257,7 +257,7 @@ CREATE VIEW `cloud`.`template_view` AS
domain.path domain_path,
projects.id project_id,
projects.uuid project_uuid,
- projects.name project_name,
+ projects.name project_name,
data_center.id data_center_id,
data_center.uuid data_center_uuid,
data_center.name data_center_name,
@@ -287,23 +287,23 @@ CREATE VIEW `cloud`.`template_view` AS
from
`cloud`.`vm_template`
inner join
- `cloud`.`guest_os` ON guest_os.id = vm_template.guest_os_id
+ `cloud`.`guest_os` ON guest_os.id = vm_template.guest_os_id
inner join
`cloud`.`account` ON account.id = vm_template.account_id
inner join
`cloud`.`domain` ON domain.id = account.domain_id
left join
- `cloud`.`projects` ON projects.project_account_id = account.id
+ `cloud`.`projects` ON projects.project_account_id = account.id
left join
- `cloud`.`vm_template_details` ON vm_template_details.template_id = vm_template.id
+ `cloud`.`vm_template_details` ON vm_template_details.template_id = vm_template.id
left join
- `cloud`.`vm_template` source_template ON source_template.id = vm_template.source_template_id
+ `cloud`.`vm_template` source_template ON source_template.id = vm_template.source_template_id
left join
`cloud`.`template_store_ref` ON template_store_ref.template_id = vm_template.id and template_store_ref.store_role = 'Image'
left join
- `cloud`.`image_store` ON image_store.removed is NULL AND template_store_ref.store_id is not NULL AND image_store.id = template_store_ref.store_id
+ `cloud`.`image_store` ON image_store.removed is NULL AND template_store_ref.store_id is not NULL AND image_store.id = template_store_ref.store_id
left join
- `cloud`.`template_zone_ref` ON template_zone_ref.template_id = vm_template.id AND template_store_ref.store_id is NULL AND template_zone_ref.removed is null
+ `cloud`.`template_zone_ref` ON template_zone_ref.template_id = vm_template.id AND template_store_ref.store_id is NULL AND template_zone_ref.removed is null
left join
`cloud`.`data_center` ON (image_store.data_center_id = data_center.id OR template_zone_ref.zone_id = data_center.id)
left join
@@ -420,7 +420,7 @@ CREATE VIEW `cloud`.`volume_view` AS
`cloud`.`async_job` ON async_job.instance_id = volumes.id
and async_job.instance_type = 'Volume'
and async_job.job_status = 0;
-
+
DROP VIEW IF EXISTS `cloud`.`storage_pool_view`;
CREATE VIEW `cloud`.`storage_pool_view` AS
select
@@ -1093,3 +1093,9 @@ CREATE VIEW `cloud`.`user_vm_view` AS
INSERT IGNORE INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('NetworkManager', 'DEFAULT', 'management-server', 'network.router.EnableServiceMonitoring', 'true', 'service monitoring in router enable/disable option, default true', 'true') ON DUPLICATE KEY UPDATE category='NetworkManager';
+
+ALTER TABLE `cloud`.`service_offering_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user';
+UPDATE `cloud`.`service_offering_details` set `display`=1 where id> 0;
+
+ALTER TABLE `cloud`.`disk_offering_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user';
+UPDATE `cloud`.`disk_offering_details` set `display`=1 where id> 0;