gCubeSystem
/
accounting-postgresql-utilities
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed sql

This commit is contained in:
Luca Frosini 2021-04-15 14:56:02 +02:00
parent 1532ec9a27
commit a4c0e1e5f0
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/resources/StorageStatusRecordTable.sql
View File

@ -1,5 +1,5 @@
-- CREATE TYPE operation_result AS ENUM ('SUCCESS', 'FAILED');
-- CREATE TYPE data_type AS ENUM ('STORAGE', 'TREE', 'GEO', 'DATABASE', 'LOCAL', 'OTHER');
-- CREATE TYPE data_type AS ENUM ('STORAGE', 'TREE', 'GEO', 'DATABASE', 'LOCAL', 'OTHER', 'JUPYTER', 'KUBERNETES');
CREATE TABLE "storagestatusrecord"(
id UUID NOT NULL PRIMARY KEY,
consumer_id TEXT NOT NULL,
@ -9,12 +9,16 @@ CREATE TABLE "storagestatusrecord"(
data_type data_type NOT NULL,
data_volume NUMERIC NOT NULL,
data_count NUMERIC NOT NULL,
data_service_class TEXT NOT NULL,
data_service_name TEXT NOT NULL,
data_service_id TEXT NOT NULL,
provider_id TEXT NOT NULL,
provider_uri TEXT DEFAULT 'data.d4science.org',
operation_count INTEGER NOT NULL DEFAULT 1,
aggregated BOOLEAN NOT NULL DEFAULT true,
start_time TIMESTAMP WITH TIME ZONE NOT NULL,
end_time TIMESTAMP WITH TIME ZONE NOT NULL
end_time TIMESTAMP WITH TIME ZONE NOT NULL,
-- Deprecated and to be removed
provider_id DEFAULT 'data.d4science.org',
data_service_id TEXT DEFAULT 'NOT_NEEDED',
data_service_class TEXT DEFAULT 'NOT_NEEDED',
data_service_name TEXT DEFAULT 'NOT_NEEDED'
);

11
src/main/resources/StorageUsageRecordTable.sql
View File

@ -1,6 +1,6 @@
-- CREATE TYPE operation_result AS ENUM ('SUCCESS', 'FAILED');
CREATE TYPE operation_type AS ENUM ('CREATE', 'READ', 'UPDATE', 'DELETE');
CREATE TYPE data_type AS ENUM ('STORAGE', 'TREE', 'GEO', 'DATABASE', 'LOCAL', 'OTHER');
CREATE TYPE data_type AS ENUM ('STORAGE', 'TREE', 'GEO', 'DATABASE', 'LOCAL', 'OTHER', 'JUPYTER', 'KUBERNETES');
CREATE TABLE "storageusagerecord"(
id UUID NOT NULL PRIMARY KEY,
consumer_id TEXT NOT NULL,
@ -8,8 +8,6 @@ CREATE TABLE "storageusagerecord"(
scope TEXT NOT NULL,
operation_result operation_result NOT NULL,
resource_owner TEXT NOT NULL,
resource_scope TEXT NOT NULL,
resource_uri TEXT NOT NULL,
provider_uri TEXT NOT NULL,
operation_type operation_type NOT NULL,
data_type data_type NOT NULL,
@ -17,5 +15,10 @@ CREATE TABLE "storageusagerecord"(
operation_count INTEGER NOT NULL DEFAULT 1,
aggregated BOOLEAN NOT NULL DEFAULT true,
start_time TIMESTAMP WITH TIME ZONE NOT NULL,
end_time TIMESTAMP WITH TIME ZONE NOT NULL
end_time TIMESTAMP WITH TIME ZONE NOT NULL,
-- Deprecated and to be removed
resource_scope TEXT DEFAULT 'NOT_NEEDED',
resource_uri TEXT DEFAULT 'NOT_NEEDED'
);

11
src/test/resources/modify.sql → src/test/resources/changes.sql
View File

@ -13,4 +13,13 @@ alter table storage_status_record alter column data_service_class set default 'N
alter table storage_status_record alter column data_service_name drop not null;
alter table storage_status_record alter column data_service_name set default 'NOT_NEEDED';
#update storage_status_record set data_service_id='NOT_NEEDED', data_service_class='NOT_NEEDED', data_service_name='NOT_NEEDED';
#update storage_status_record set data_service_id='NOT_NEEDED', data_service_class='NOT_NEEDED', data_service_name='NOT_NEEDED';
alter table storage_status_record ADD COLUMN provider_uri TEXT DEFAULT 'data.d4science.org';
UPDATE storage_status_record SET provider_uri='data.d4science.org', provider_id='data.d4science.org';
ALTER TYPE data_type ADD VALUE 'JUPYTER';
ALTER TYPE data_type ADD VALUE 'KUBERNETES';