From 136f8de2f0489b0f7e3bb571860242053b956198 Mon Sep 17 00:00:00 2001 From: Leonid Bossis Date: Fri, 23 Jun 2023 12:34:14 -0400 Subject: [PATCH] added more sql scripts and a shell script to load all data --- schema/load_all.sh | 12 ++++++++++++ schema/load_archive.sql | 6 ++++-- schema/load_results.sql | 6 ++++++ schema/load_scans.sql | 12 ++++++++++++ schema/schema.sql | 2 ++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100755 schema/load_all.sh diff --git a/schema/load_all.sh b/schema/load_all.sh new file mode 100755 index 0000000..865f273 --- /dev/null +++ b/schema/load_all.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +set +e + +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/schema.sql +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/load_offerings.sql +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/load_brewscans.sql +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/load_pncscans.sql +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/load_gitscans.sql +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/load_results.sql +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/load_scans.sql +psql -U $POSTGRESQL_USER -h localhost -p $POSTGRESQL_PORT -a -f $HOME/tmp/osh/covscanrest/schema/load_archive.sql diff --git a/schema/load_archive.sql b/schema/load_archive.sql index 9bf16b1..b0cff9e 100644 --- a/schema/load_archive.sql +++ b/schema/load_archive.sql @@ -14,5 +14,7 @@ CREATE TABLE IF NOT EXISTS osh.archive( FOREIGN KEY (results) REFERENCES osh.results(results_id) ); -INSERT INTO osh.archive (scan_id,offering_id,event_id,is_managed_service,component_list) - VALUES(1,'product-id-1','event-id-1',true,' '); +INSERT INTO osh.archive (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(1,'ansible-automation-platform','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',1,'COMPLETED'); +INSERT INTO osh.archive (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(2,'eclipse-vertx','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',2,'COMPLETED'); diff --git a/schema/load_results.sql b/schema/load_results.sql index 167635c..5354a43 100644 --- a/schema/load_results.sql +++ b/schema/load_results.sql @@ -7,3 +7,9 @@ CREATE TABLE IF NOT EXISTS osh.results( PRIMARY KEY (results_id) ); +INSERT INTO osh.results (results_id,datetime,state,logs) + VALUES(1,'2023-06-22 16:04:04.816453',true,bytea('/home/lbossis/osh/postgres/logs/bulk-load.log.hex')); +INSERT INTO osh.results (results_id,datetime,state,logs) + VALUES(2,'2023-06-22 16:04:04.816453',true,bytea('/home/lbossis/osh/postgres/logs/inp.log.hex')); +INSERT INTO osh.results (results_id,datetime,state,logs) + VALUES(3,'2023-06-22 16:04:04.816453',true,bytea('/home/lbossis/osh/postgres/logs/bulk-load.log')); diff --git a/schema/load_scans.sql b/schema/load_scans.sql index 501eec2..98f7d79 100644 --- a/schema/load_scans.sql +++ b/schema/load_scans.sql @@ -14,3 +14,15 @@ CREATE TABLE IF NOT EXISTS osh.scans( FOREIGN KEY (results) REFERENCES osh.results(results_id) ); +INSERT INTO osh.scans (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(1,'ansible-automation-platform','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',1,'PENDING'); +INSERT INTO osh.scans (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(2,'ansible-automation-platform','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',1,'IN PROGRESS'); +INSERT INTO osh.scans (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(3,'ansible-automation-platform','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',1,'COMPLETED'); +INSERT INTO osh.scans (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(4,'eclipse-vertx','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',2,'PENDING'); +INSERT INTO osh.scans (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(5,'eclipse-vertx','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',2,'IN PROGRESS'); +INSERT INTO osh.scans (scan_id,offering_id,event_id,is_managed_service,component_list,datetime,owner,results,status) + VALUES(6,'eclipse-vertx','event-id-1',true,'publisher','2023-06-22 16:04:04.816453','RedHat',2,'COMPLETED'); diff --git a/schema/schema.sql b/schema/schema.sql index c62487a..3ed36b3 100644 --- a/schema/schema.sql +++ b/schema/schema.sql @@ -2,6 +2,8 @@ CREATE SCHEMA osh; GRANT USAGE ON SCHEMA osh TO postgres; +SET SEARCH_PATH TO osh; + CREATE TABLE IF NOT EXISTS osh.offerings( offering_id VARCHAR(100), description VARCHAR(200),