From 1512dc3bc852a58435992e3b21086cc24d1f40ba Mon Sep 17 00:00:00 2001 From: Adriaan Renting <renting@astron.nl> Date: Mon, 23 Nov 2015 15:35:25 +0000 Subject: [PATCH] Task #8481: Added session table --- .../ResourceAllocationDatabase/sql/create_database.sql | 2 ++ .../ResourceAllocationDatabase/sql/fill_database.sql | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql index 14947feb58a..cf74d4d8849 100644 --- a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql +++ b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql @@ -7,6 +7,8 @@ -- LC_COLLATE = 'en_US.UTF-8' -- LC_CTYPE = 'en_US.UTF-8' -- CONNECTION LIMIT = -1; + +-- psql resourceassignment -U resourceassignment -f create_database.sql -W CREATE SCHEMA virtual_instrument; CREATE SCHEMA resource_monitoring; CREATE SCHEMA resource_allocation; diff --git a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql index 1382a584799..dcd7798f2c1 100644 --- a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql +++ b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql @@ -1,4 +1,5 @@ -- resourceassignment password for testing on mcu005 is the same as the password on the president's luggage +6 +-- psql resourceassignment -U resourceassignment -f fill_database.sql -W BEGIN; INSERT INTO virtual_instrument.unit VALUES (0, 'station'),(1, 'bytes'); INSERT INTO virtual_instrument.resource_type VALUES (0, 'station', 0),(1, 'storage', 1); @@ -20,5 +21,5 @@ INSERT INTO resource_allocation.resource_claim VALUES (0, 0, 0, '2015-11-05 12:0 INSERT INTO resource_monitoring.resource_capacity VALUES (0, 0, 1, 1), (1, 1, 1,1 ), (2, 2, 15000, 100000); INSERT INTO resource_monitoring.resource_availability VALUES (0, 0, TRUE), (1, 1, TRUE), (2, 2, TRUE); INSERT INTO resource_monitoring.resource_group_availability VALUES (0, 0, TRUE), (1, 1, TRUE); -INSERT INTO resource_monitoring.config VALUES (0, 'max_fill_percentage_cep4', '85.00'), (1, 'claim_timeout', '172800'); +INSERT INTO resource_allocation.config VALUES (0, 'max_fill_percentage_cep4', '85.00'), (1, 'claim_timeout', '172800'); COMMIT; -- GitLab