From e7fd3b7b46e32e77234df678a8c4660ac44250b7 Mon Sep 17 00:00:00 2001 From: Sonia Zorba <sonia.zorba@inaf.it> Date: Fri, 26 Mar 2021 13:08:15 +0100 Subject: [PATCH] Added demo script and TAP_SCHEMA fixes --- .gitlab-ci.yml | 2 +- README.md | 28 ++++++++++++++++++++++++++++ call-tap.sh | 15 +++++++++++++++ database/04-vollt-fix.sql | 2 ++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 README.md create mode 100755 call-tap.sh create mode 100644 database/04-vollt-fix.sql diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 101f532..0b192d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ build_db: refs: - master changes: - - database + - database/* script: - cd database - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}" diff --git a/README.md b/README.md new file mode 100644 index 0000000..77c3ead --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +## Setup + + docker-compose pull + docker-compose up -d + +If you experience issues with the pull command use this setting in `/etc/docker/daemon.json`: + + { + "insecure-registries" : [ "git.ia2.inaf.it:5050" ] + } + +## Demo + + ./call-tap.sh badtoken + +Only free records (2 rows) + + ./call-tap.sh token1 + +Free records + records associated with group1 and group2 (6 rows) + + ./call-tap.sh token2 + +Free records + records associated with group2 (4 rows) + +## Shutdown + + docker-compose down diff --git a/call-tap.sh b/call-tap.sh new file mode 100755 index 0000000..f2583a0 --- /dev/null +++ b/call-tap.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ "$#" -ne 1 ]; then + echo "Usage: $0 <token>" + exit 1 +fi + +curl -s -XPOST \ + -H "Authorization: Bearer $1" \ + -F 'REQUEST=doQuery' \ + -F 'LANG=ADQL' \ + -F 'FORMAT=text/csv' \ + -F 'PHASE=RUN' \ + -F "QUERY=SELECT * from demo.private_rows;" \ + http://localhost:8080/tap/sync diff --git a/database/04-vollt-fix.sql b/database/04-vollt-fix.sql new file mode 100644 index 0000000..3f01fc6 --- /dev/null +++ b/database/04-vollt-fix.sql @@ -0,0 +1,2 @@ +update "TAP_SCHEMA".columns set arraysize = replace(arraysize, '*', '') where arraysize like '%*%'; +update "TAP_SCHEMA".columns set arraysize = NULL where arraysize = ''; -- GitLab