From a3500f252dd70fa60bf6f6a0028d4865c9ef7342 Mon Sep 17 00:00:00 2001 From: Jorrit Schaap <schaap@astron.nl> Date: Tue, 15 Mar 2016 13:55:18 +0000 Subject: [PATCH] Task #8570: added virtual_instrument.resource_view and resource_allocation.resource_claim_extended_view --- .../sql/create_database.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql index e19485b1fc1..e4e4d8f6eca 100644 --- a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql +++ b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql @@ -16,6 +16,7 @@ CREATE SCHEMA resource_allocation; BEGIN; -- This is insanity, but works, order needs to be the reverse of the CREATE TABLE statements +DROP VIEW IF EXISTS virtual_instrument.resource_view CASCADE; DROP VIEW IF EXISTS resource_allocation.task_view CASCADE; DROP VIEW IF EXISTS resource_allocation.resource_claim_view CASCADE; DROP TABLE IF EXISTS resource_allocation.config CASCADE; @@ -249,4 +250,23 @@ COMMENT ON VIEW resource_allocation.resource_claim_view IS 'plain view on resource_claim table, including resource_claim_status.name'; +CREATE OR REPLACE VIEW virtual_instrument.resource_view AS + SELECT r.id, r.name, r.type_id, rt.name as type_name + FROM virtual_instrument.resource r + JOIN virtual_instrument.resource_type rt ON rt.id = r.type_id; +ALTER TABLE virtual_instrument.resource_view + OWNER TO resourceassignment; +COMMENT ON VIEW virtual_instrument.resource_view + IS 'plain view on resource table including task_type.name'; + + +CREATE OR REPLACE VIEW resource_allocation.resource_claim_extended_view AS + SELECT rcv.*, rv.* + FROM resource_allocation.resource_claim_view rcv + JOIN virtual_instrument.resource_view rv ON rcv.resource_id = rv.id; +ALTER TABLE resource_allocation.resource_claim_extended_view + OWNER TO resourceassignment; +COMMENT ON VIEW resource_allocation.resource_claim_extended_view + IS 'extended view on resource_claim table, including resource_claim_status.name and the resource itself'; + COMMIT; -- GitLab