diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index f3c33b643bf85812ccefe632938805aece99ad21..0f675e47eb507fa1d2c6691f6e7708d4ffc414fd 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -114,7 +114,7 @@ services:
init: true
restart: "no"
container_name: dbrepo-auth-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0
environment:
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
@@ -135,7 +135,7 @@ services:
restart: "no"
container_name: dbrepo-metadata-service
hostname: metadata-service
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
@@ -198,7 +198,7 @@ services:
restart: "no"
container_name: dbrepo-analyse-service
hostname: analyse-service
- image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.7.0
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -253,7 +253,7 @@ services:
restart: "no"
container_name: dbrepo-search-db
hostname: search-db
- image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.7.0
healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s
@@ -277,7 +277,7 @@ services:
restart: "no"
container_name: dbrepo-search-service
hostname: search-service
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.7.0
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -301,7 +301,7 @@ services:
restart: "no"
container_name: dbrepo-ui
hostname: ui
- image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.7.0
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}"
@@ -381,7 +381,7 @@ services:
init: true
container_name: dbrepo-search-service-init
hostname: search-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.7.0
environment:
LOG_LEVEL: ${LOG_LEVEL:-info}
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
@@ -438,7 +438,7 @@ services:
restart: "no"
container_name: dbrepo-dashboard-service
hostname: dashboard-service
- image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.7.0
ports:
- "3000:3000"
volumes:
@@ -465,7 +465,7 @@ services:
init: true
container_name: dbrepo-storage-service-init
hostname: storage-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.7.0
environment:
S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin}
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -511,7 +511,7 @@ services:
restart: "no"
container_name: dbrepo-data-service
hostname: data-service
- image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.0
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
diff --git a/.docs/.openapi/api.base.yaml b/.docs/.openapi/api.base.yaml
index f0420d1412b6c86f3397593aa001abe31fcb7840..abadb218e7fa3b74a11caea3b01d3f73f2fa988a 100644
--- a/.docs/.openapi/api.base.yaml
+++ b/.docs/.openapi/api.base.yaml
@@ -11,7 +11,7 @@ components:
type: http
externalDocs:
description: Project Website
- url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/
+ url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/
info:
contact:
email: andreas.rauber@tuwien.ac.at
@@ -24,7 +24,7 @@ info:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0
title: DBRepo REST API
- version: 1.6.5
+ version: 1.7.0
openapi: 3.1.0
servers:
- description: Test Instance
diff --git a/.docs/.openapi/api.yaml b/.docs/.openapi/api.yaml
index c5d75bca5ae848f542e636fe91d656195e2dc6b2..c23937c6e72cdc9a8b8956b34aeeec63bfd15ce2 100644
--- a/.docs/.openapi/api.yaml
+++ b/.docs/.openapi/api.yaml
@@ -16,7 +16,7 @@ info:
name: Apache 2.0
url: 'https://www.apache.org/licenses/LICENSE-2.0'
title: DBRepo REST API
- version: 1.6.2
+ version: 1.7.2
servers:
- description: Test Instance
url: 'https://test.dbrepo.tuwien.ac.at'
@@ -24,7 +24,7 @@ servers:
url: 'http://localhost'
externalDocs:
description: Project Website
- url: 'https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/'
+ url: 'https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/'
paths:
/api/analyse/datatypes:
get:
diff --git a/.docs/changelog.md b/.docs/changelog.md
index 1db165e41e91de37023f8ce5b669ce6ecfbf4db6..7914aeb06a5fdaeb999cf030ca2f59066ccfd2dd 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -2,9 +2,15 @@
author: Martin Weise
---
+## v1.7.0 (????)
+
+### What's Changed
+
+TBD
+
## v1.6.5 (2025-02-18)
-[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.6.5)
+[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.7.0)
### What's Changed
diff --git a/.docs/index.md b/.docs/index.md
index f4c159d7bcfc3693a8e742a3b6b2a82e1250b240..aa9c6e7693f3758fadcddbe05cd5904c5e92b7da 100644
--- a/.docs/index.md
+++ b/.docs/index.md
@@ -14,7 +14,7 @@ author: Martin Weise
-Documentation for version: [v1.6.5](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.7.0](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is a repository for data in databases that are used from the beginning until the end of a research
project supporting data evolution, -citation and -versioning. It implements the query store of the
diff --git a/.docs/installation.md b/.docs/installation.md
index 1c6db304ccf3d760c44e56b7d49aef49d76330ff..272c62d53281b68af8db66ddcfaa0a3bdac3fa4f 100644
--- a/.docs/installation.md
+++ b/.docs/installation.md
@@ -11,7 +11,7 @@ author: Martin Weise
If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with:
```shell
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.6/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.7/install.sh | bash
```
!!! bug "Default installation security disclaimer"
@@ -38,7 +38,7 @@ SSL/TLS certificate is recommended. Follow the [secure installation](#secure-ins
Execute the installation script to download only the environment and save it to `dist`.
```shell
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.6/install.sh | DOWNLOAD_ONLY=1 bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.7/install.sh | DOWNLOAD_ONLY=1 bash
```
### Static Configuration
@@ -82,7 +82,7 @@ the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`.
Update the client secret of the `dbrepo-client`:
```bash
-curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.6/.scripts/reg-client-secret.sh" | bash
+curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.7/.scripts/reg-client-secret.sh" | bash
```
Also, update the JWT key according to the
diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md
index e2aa101097df87728a250cc96a8fd17004f839e5..9413c784dfcccf6e14f527495243e33162922f23 100644
--- a/.docs/kubernetes.md
+++ b/.docs/kubernetes.md
@@ -6,7 +6,7 @@ author: Martin Weise
To install DBRepo in your existing cluster, download the
sample [
-`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.6/helm/dbrepo/values.yaml)
+`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.7/helm/dbrepo/values.yaml)
for your deployment and update the variables, especially `hostname`.
```shell
@@ -14,7 +14,7 @@ helm upgrade --install dbrepo \
-n dbrepo \
"oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
--values ./values.yaml \
- --version "1.6.5" \
+ --version "1.7.0" \
--create-namespace \
--cleanup-on-fail
```
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 166f504e42ec3e9b328944da3a61d7835e1477cf..88dc52ebd0b3f73c4cf7e3e3aa931f864bfe48ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,9 @@ variables:
NODE_VERSION: "18"
SONARQUBE_VERSION: "10.0"
BUN_VERSION: "1.1.40"
- DOC_VERSION: "1.6"
- APP_VERSION: "1.6.5"
- CHART_VERSION: "1.6.5"
+ DOC_VERSION: "1.7"
+ APP_VERSION: "1.7.0"
+ CHART_VERSION: "1.7.0"
CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
diff --git a/.gitlab/agents/dev/values.yaml b/.gitlab/agents/dev/values.yaml
index 5841a5e97bd5d9f9ddde4d13a2b74623a91cf4fb..50a1615d0ed948905a9963cdbcdc70e83e220eee 100644
--- a/.gitlab/agents/dev/values.yaml
+++ b/.gitlab/agents/dev/values.yaml
@@ -28,7 +28,7 @@ authservice:
secret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG
setupJob:
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.7.0
persistence:
enabled: true
@@ -71,12 +71,12 @@ searchdb:
analyseservice:
enabled: true
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.7.0
metadataservice:
enabled: true
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0
admin:
email: noreply@example.com
deletedRecord: permanent
@@ -92,7 +92,7 @@ metadataservice:
dataservice:
enabled: true
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.0
rabbitmq:
consumer:
username: admin
@@ -106,16 +106,16 @@ dataservice:
searchservice:
enabled: true
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.7.0
init:
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.7.0
storageservice:
enabled: true
init:
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.7.0
uploadservice:
enabled: true
@@ -132,7 +132,7 @@ metricdb:
ui:
enabled: true
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.3
+ name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.7.0
public:
api:
client: https://s155.datalab.tuwien.ac.at
diff --git a/Makefile b/Makefile
index e84c4f80a83a72c864c8a3f85060ef08b9c48f66..e8f2553784f38ea5e656d776e34043886ed1ed4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: all
-APP_VERSION ?= 1.6.5
-CHART_VERSION ?= 1.6.5
+APP_VERSION ?= 1.7.0
+CHART_VERSION ?= 1.7.0
REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
.PHONY: all
diff --git a/README.md b/README.md
index 628da3f3f3335717b5b4e0962a6ff45d36fed420..901d24dd06dd2863da84c5622f9aa8b157462171 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ If you have [Docker](https://docs.docker.com/engine/install/) already installed
with:
```bash
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.6/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.7/install.sh | bash
```
## Documentation
diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile
index 06b6434be71e054367e1ef521a3dae8e9401e360..6b144eec80011a340dbbaabc0c3bce5894e3c654 100644
--- a/dbrepo-analyse-service/Pipfile
+++ b/dbrepo-analyse-service/Pipfile
@@ -21,7 +21,7 @@ numpy = "*"
pandas = "*"
minio = "*"
pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.5.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.7.0.tar.gz"}
opensearch-py = "*"
[dev-packages]
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index 96591a28b95119b0725038b3c2fa66e883d5ba7e..a585c490977c27fbf12d31f6e8b663770523e50c 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "1013ec1b081d79912b7ec0878b4824cb4f885a96fec148ae728d746de601b493"
+ "sha256": "0af9d522f713554dd7996401992cffddf372ade320c11d7950bdcd5888aa1a03"
},
"pipfile-spec": 6,
"requires": {
@@ -180,20 +180,20 @@
},
"boto3": {
"hashes": [
- "sha256:39957eabdce009353d72d131046489fbbfa15891865d5f069f1e8bfa414e6b81",
- "sha256:768c8a4d4a6227fe2258105efa086f1424cba5ca915a5eb2305b2cd979306ad1"
+ "sha256:006800604c34382873521b20890b758eea7109d699696ece932131259d0a4658",
+ "sha256:d59642672b1f35f55f47b317693241ce53333816f47c9e72fcc8fd0e9adc6a87"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==1.36.22"
+ "version": "==1.36.23"
},
"botocore": {
"hashes": [
- "sha256:59520247d5a479731724f97c995d5a1c2aae3b303b324f39d99efcfad1d3019e",
- "sha256:75d6b34acb0686ee4d54ff6eb285e78ccfe318407428769d1e3e13351714d890"
+ "sha256:886730e79495a2e153842725ebdf85185c8277cdf255b3b5879cd097ddc7fcc3",
+ "sha256:9feaa2d876f487e718a5fd80a35fa401042b518c0c75117d3e1ea39a567439e7"
],
"markers": "python_version >= '3.8'",
- "version": "==1.36.22"
+ "version": "==1.36.23"
},
"certifi": {
"hashes": [
@@ -421,9 +421,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:e2312f0d3cff34934578a16b01d646d8309e3a3d1bb4cbda9f984acf97824e00"
+ "sha256:b555d9cbbbc07f1bd8f449b7bb38b2f7221f86b897bff08dd7c34933befae865"
],
- "path": "./lib/dbrepo-1.6.5.tar.gz"
+ "path": "./lib/dbrepo-1.7.0.tar.gz"
},
"events": {
"hashes": [
@@ -847,11 +847,11 @@
},
"mistune": {
"hashes": [
- "sha256:02106ac2aa4f66e769debbfa028509a275069dcffce0dfa578edd7b991ee700a",
- "sha256:e0740d635f515119f7d1feb6f9b192ee60f0cc649f80a8f944f905706a21654c"
+ "sha256:4b47731332315cdca99e0ded46fc0004001c1299ff773dfb48fbe1fd226de319",
+ "sha256:733bf018ba007e8b5f2d3a9eb624034f6ee26c4ea769a98ec533ee111d504dff"
],
"markers": "python_version >= '3.8'",
- "version": "==3.1.1"
+ "version": "==3.1.2"
},
"multidict": {
"hashes": [
@@ -1621,7 +1621,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.9'",
+ "markers": "python_version >= '3.10'",
"version": "==2.3.0"
},
"werkzeug": {
@@ -2246,7 +2246,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.9'",
+ "markers": "python_version >= '3.10'",
"version": "==2.3.0"
},
"wrapt": {
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.5-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.6.5-py3-none-any.whl
deleted file mode 100644
index 2a5cda78c55f725af708e7ff1d7f4b281586613d..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.5-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.5.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.5.tar.gz
deleted file mode 100644
index 5117abc68daa9a4e776392855c6022c8d20d5d31..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.5.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl
deleted file mode 100644
index b4ceb85027aa4164b602f876080c0f8979534b0e..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0.tar.gz
deleted file mode 100644
index e8de842c2945231eb547737851eb6269ee5ba84e..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.7.0-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.7.0-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..42c0e32ce8e4f895afa9e105ecdcb3d508ba2257
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.7.0-py3-none-any.whl differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.7.0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.7.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8ecf0661cfdd270b33d7fe4e8bdce444569e995c
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.7.0.tar.gz differ
diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar
index f370c8825750a431296ef68c3d482a2e4eee9389..a9437e2cc19fae55c40e5ab0ddf772e20f11ab81 100644
Binary files a/dbrepo-auth-service/listeners/target/create-event-listener.jar and b/dbrepo-auth-service/listeners/target/create-event-listener.jar differ
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index 3f049bd040829373491e3991f7443f31f08c5299..697e9ece1b5e0fda90a8a10ddfcb551736c8f109 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<name>dbrepo-data-service</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<description>Service that manages the data</description>
@@ -23,7 +23,7 @@
<module>report</module>
</modules>
- <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/</url>
+ <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/</url>
<developers>
<developer>
<name>Martin Weise</name>
diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml
index 6270990971c7d35275152c3c27dc07d8543f276c..1aa138f611c7fa5ec2fc4f6dc98beb8a177f24b5 100644
--- a/dbrepo-data-service/querystore/pom.xml
+++ b/dbrepo-data-service/querystore/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-data-service-querystore</artifactId>
<name>dbrepo-data-service-querystore</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies/>
diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml
index b78405d9de1c4b93dcaa5fac40f505797cd9209f..98536501d3beb70b5c05f632e673a401b03ae2cd 100644
--- a/dbrepo-data-service/report/pom.xml
+++ b/dbrepo-data-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>report</artifactId>
<name>dbrepo-data-service-report</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<description>
This module is only intended for the pipeline coverage report. See the detailed report in the
respective modules
diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml
index 4ac7c352a08ddab420e340d13726ed3be9d7a3d1..434c423ef056566305e2d72db984781e7b1429fc 100644
--- a/dbrepo-data-service/rest-service/pom.xml
+++ b/dbrepo-data-service/rest-service/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>rest-service</artifactId>
<name>dbrepo-data-service-rest-service</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>services</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml
index 3b1ea7b0e925cc60074d23407d8be6b1eba5abbb..5252e6a3d30439671d085b9ac2d6bca81bf462c0 100644
--- a/dbrepo-data-service/services/pom.xml
+++ b/dbrepo-data-service/services/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>services</artifactId>
<name>dbrepo-data-service-services</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service-querystore</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-db/1_setup-schema.sql b/dbrepo-metadata-db/1_setup-schema.sql
index 4a580853c46b75cea248370813ca285e0cc32d2a..2ac584f1388394ca624bf3d7150391d443f601df 100644
--- a/dbrepo-metadata-db/1_setup-schema.sql
+++ b/dbrepo-metadata-db/1_setup-schema.sql
@@ -2,550 +2,494 @@ BEGIN;
CREATE TABLE IF NOT EXISTS `mdb_users`
(
- id varchar(36) not null,
- keycloak_id varchar(36) not null,
- username varchar(255) not null,
- firstname varchar(255),
- lastname varchar(255),
- orcid varchar(255),
- affiliation varchar(255),
- is_internal boolean not null default false,
- mariadb_password varchar(255) not null,
- theme varchar(255) not null default ('light'),
- language varchar(3) not null default ('en'),
- primary key (id),
- unique (keycloak_id),
- unique (username)
+ id UUID NOT NULL DEFAULT uuid(),
+ keycloak_id UUID NOT NULL DEFAULT UUID(),
+ username VARCHAR(255) NOT NULL,
+ firstname VARCHAR(255),
+ lastname VARCHAR(255),
+ orcid VARCHAR(255),
+ affiliation VARCHAR(255),
+ is_internal BOOLEAN NOT NULL DEFAULT FALSE,
+ mariadb_password VARCHAR(255) NOT NULL,
+ theme VARCHAR(255) NOT NULL DEFAULT ('light'),
+ language VARCHAR(3) NOT NULL DEFAULT ('en'),
+ PRIMARY KEY (id),
+ UNIQUE (keycloak_id),
+ UNIQUE (username)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_images`
(
- id varchar(36) not null,
- registry varchar(255) not null default 'docker.io',
- name varchar(255) not null,
- version varchar(255) not null,
- default_port int not null,
- dialect varchar(255) not null,
- driver_class varchar(255) not null,
- jdbc_method varchar(255) not null,
- is_default boolean not null default false,
- created timestamp not null default now(),
- last_modified timestamp,
- primary key (id),
- unique (name, version),
- unique (is_default)
+ id UUID NOT NULL DEFAULT UUID(),
+ registry VARCHAR(255) NOT NULL DEFAULT 'docker.io',
+ name VARCHAR(255) NOT NULL,
+ version VARCHAR(255) NOT NULL,
+ DEFAULT_port INT NOT NULL,
+ dialect VARCHAR(255) NOT NULL,
+ driver_class VARCHAR(255) NOT NULL,
+ jdbc_method VARCHAR(255) NOT NULL,
+ is_DEFAULT BOOLEAN NOT NULL DEFAULT FALSE,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ last_modified TIMESTAMP,
+ PRIMARY KEY (id),
+ UNIQUE (name, version),
+ UNIQUE (is_DEFAULT)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_containers`
(
- id varchar(36) not null,
- internal_name varchar(255) not null,
- name varchar(255) not null,
- host varchar(255) not null,
- port int not null default 3306,
- ui_host varchar(255) not null default host,
- ui_port int not null default port,
- ui_additional_flags text,
- sidecar_host varchar(255),
- sidecar_port int,
- image_id bigint not null,
- created timestamp not null default now(),
- last_modified timestamp,
- privileged_username varchar(255) not null,
- privileged_password varchar(255) not null,
- quota int not null default 50,
- primary key (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_data`
-(
- id varchar(36) not null,
- PROVENANCE text,
- FileEncoding text,
- FileType varchar(100),
- Version text,
- Seperator text,
- primary key (ID)
+ id UUID NOT NULL DEFAULT UUID(),
+ internal_name VARCHAR(255) NOT NULL,
+ name VARCHAR(255) NOT NULL,
+ host VARCHAR(255) NOT NULL,
+ port INT NOT NULL DEFAULT 3306,
+ ui_host VARCHAR(255) NOT NULL DEFAULT host,
+ ui_port INT NOT NULL DEFAULT port,
+ ui_additional_flags TEXT,
+ sidecar_host VARCHAR(255),
+ sidecar_port INT,
+ image_id UUID NOT NULL DEFAULT UUID(),
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ last_modified TIMESTAMP,
+ privileged_username VARCHAR(255) NOT NULL,
+ privileged_password VARCHAR(255) NOT NULL,
+ quota INT NOT NULL DEFAULT 50,
+ PRIMARY KEY (id),
+ FOREIGN KEY (image_id) REFERENCES mdb_images (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_licenses`
(
- identifier varchar(255) not null,
- uri text not null,
- description text not null,
- primary key (identifier),
- unique (uri(200))
+ identifier VARCHAR(255) NOT NULL,
+ uri TEXT NOT NULL,
+ description TEXT NOT NULL,
+ PRIMARY KEY (identifier),
+ UNIQUE (uri(200))
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_databases`
(
- id varchar(36) not null,
- cid bigint unsigned not null,
- name varchar(255) not null,
- internal_name varchar(255) not null,
- exchange_name varchar(255) not null,
- description text,
- engine varchar(20),
- is_public boolean not null default true,
- is_schema_public boolean not null default true,
- image longblob,
- owned_by varchar(36),
- contact_person varchar(36),
- created timestamp not null default now(),
- last_modified timestamp,
- primary key (id),
- foreign key (cid) references mdb_containers (id),
- foreign key (owned_by) references mdb_users (id),
- foreign key (contact_person) references mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_databases_subjects`
-(
- dbid bigint not null,
- subjects varchar(255) not null,
- primary key (dbid, subjects)
+ id UUID NOT NULL DEFAULT UUID(),
+ cid UUID NOT NULL DEFAULT UUID(),
+ name VARCHAR(255) NOT NULL,
+ internal_name VARCHAR(255) NOT NULL,
+ exchange_name VARCHAR(255) NOT NULL,
+ description TEXT,
+ engine VARCHAR(20),
+ is_public BOOLEAN NOT NULL DEFAULT TRUE,
+ is_schema_public BOOLEAN NOT NULL DEFAULT TRUE,
+ image LONGBLOB,
+ owned_by UUID,
+ contact_person UUID,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ last_modified TIMESTAMP,
+ PRIMARY KEY (id),
+ FOREIGN KEY (cid) REFERENCES mdb_containers (id),
+ FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
+ FOREIGN KEY (contact_person) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_tables`
(
- id varchar(36) not null,
- tDBID bigint unsigned not null,
- tName varchar(64) not null,
- internal_name varchar(64) not null,
- queue_name varchar(255) not null,
- routing_key varchar(255),
- tDescription varchar(2048),
- num_rows bigint,
- data_length bigint,
- max_data_length bigint,
- avg_row_length bigint,
- `separator` char(1),
- quote char(1),
- element_null varchar(50),
- skip_lines bigint,
- element_true varchar(50),
- element_false varchar(50),
- Version text,
- created timestamp not null default now(),
- versioned boolean not null default true,
- is_public boolean not null default true,
- is_schema_public boolean not null default true,
- owned_by varchar(36) not null,
- last_modified timestamp,
- primary key (ID),
- unique (tDBID, internal_name),
- foreign key (tDBID) references mdb_databases (id),
- foreign key (owned_by) references mdb_users (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ tDBID UUID NOT NULL DEFAULT UUID(),
+ tName VARCHAR(64) NOT NULL,
+ internal_name VARCHAR(64) NOT NULL,
+ queue_name VARCHAR(255) NOT NULL,
+ routing_key VARCHAR(255),
+ tDescription VARCHAR(2048),
+ num_rows BIGINT,
+ data_length BIGINT,
+ max_data_length BIGINT,
+ avg_row_length BIGINT,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ versioned BOOLEAN NOT NULL DEFAULT TRUE,
+ is_public BOOLEAN NOT NULL DEFAULT TRUE,
+ is_schema_public BOOLEAN NOT NULL DEFAULT TRUE,
+ owned_by UUID NOT NULL DEFAULT UUID(),
+ last_modified TIMESTAMP,
+ PRIMARY KEY (ID),
+ UNIQUE (tDBID, internal_name),
+ FOREIGN KEY (tDBID) REFERENCES mdb_databases (id),
+ FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_columns`
(
- id varchar(36) not null,
- tID bigint unsigned not null,
- cName varchar(64),
- internal_name varchar(64) not null,
- Datatype enum ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','SERIAL','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- length bigint unsigned NULL,
- ordinal_position int not null,
- index_length bigint unsigned NULL,
- description varchar(2048),
- size bigint unsigned,
- d bigint unsigned,
- is_null_allowed boolean not null default true,
+ id UUID NOT NULL DEFAULT UUID(),
+ tID UUID NOT NULL DEFAULT UUID(),
+ cName VARCHAR(64),
+ internal_name VARCHAR(64) NOT NULL,
+ Datatype ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','SERIAL','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
+ length BIGINT UNSIGNED NULL,
+ ordinal_position INT NOT NULL,
+ index_length BIGINT UNSIGNED NULL,
+ description VARCHAR(2048),
+ size BIGINT UNSIGNED,
+ d BIGINT UNSIGNED,
+ is_null_allowed BOOLEAN NOT NULL DEFAULT TRUE,
val_min NUMERIC NULL,
val_max NUMERIC NULL,
mean NUMERIC NULL,
median NUMERIC NULL,
std_dev Numeric NULL,
- created timestamp not null default now(),
- last_modified timestamp,
- foreign key (tID) references mdb_tables (ID) ON DELETE CASCADE,
- primary key (ID),
- unique (tID, internal_name)
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ last_modified TIMESTAMP,
+ FOREIGN KEY (tID) REFERENCES mdb_tables (ID) ON DELETE CASCADE,
+ PRIMARY KEY (ID),
+ UNIQUE (tID, internal_name)
) WITH SYSTEM VERSIONING;
-CREATE TABLE IF NOT EXISTS `mdb_columns_enums`
+CREATE TABLE IF NOT EXISTS `mdb_columns_ENUMs`
(
- id varchar(36) not null,
- column_id bigint unsigned not null,
- value varchar(255) not null,
- foreign key (column_id) references mdb_columns (ID) ON DELETE CASCADE,
- primary key (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ column_id UUID NOT NULL DEFAULT UUID(),
+ value VARCHAR(255) NOT NULL,
+ FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
+ PRIMARY KEY (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_columns_sets`
(
- id varchar(36) not null,
- column_id bigint unsigned not null,
- value varchar(255) not null,
- foreign key (column_id) references mdb_columns (ID) ON DELETE CASCADE,
- primary key (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_nom`
-(
- cID bigint unsigned,
- tID bigint unsigned,
- maxlength int,
- last_modified timestamp,
- created timestamp not null default now(),
- primary key (cID),
- foreign key (cID) references mdb_columns (ID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_cat`
-(
- cID bigint unsigned,
- tID bigint unsigned,
- num_cat int,
- -- cat_array TEXT[],
- last_modified timestamp,
- created timestamp not null default now(),
- primary key (cID),
- foreign key (cID) references mdb_columns (ID)
+ id UUID NOT NULL DEFAULT UUID(),
+ column_id UUID NOT NULL DEFAULT UUID(),
+ value VARCHAR(255) NOT NULL,
+ FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
+ PRIMARY KEY (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key`
(
- fkid varchar(36) not null,
- tid bigint unsigned not null,
- rtid bigint unsigned not null,
- name varchar(255) not null,
- on_update varchar(50) NULL,
- on_delete varchar(50) NULL,
- position int NULL,
- primary key (fkid),
- foreign key (tid) references mdb_tables (id) ON DELETE CASCADE,
- foreign key (rtid) references mdb_tables (id)
+ fkid UUID NOT NULL DEFAULT UUID(),
+ tid UUID NOT NULL DEFAULT UUID(),
+ rtid UUID NOT NULL DEFAULT UUID(),
+ name VARCHAR(255) NOT NULL,
+ on_update VARCHAR(50) NULL,
+ on_delete VARCHAR(50) NULL,
+ position INT NULL,
+ PRIMARY KEY (fkid),
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE,
+ FOREIGN KEY (rtid) REFERENCES mdb_tables (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_constraints_primary_key`
(
- pkid varchar(36) not null,
- tID bigint unsigned not null,
- cid bigint unsigned not null,
- primary key (pkid),
- foreign key (tID) references mdb_tables (id) ON DELETE CASCADE,
- foreign key (cid) references mdb_columns (id) ON DELETE CASCADE
+ pkid UUID NOT NULL DEFAULT UUID(),
+ tID UUID NOT NULL DEFAULT UUID(),
+ cid UUID NOT NULL DEFAULT UUID(),
+ PRIMARY KEY (pkid),
+ FOREIGN KEY (tID) REFERENCES mdb_tables (id) ON DELETE CASCADE,
+ FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key_reference`
(
- id varchar(36) not null,
- fkid bigint unsigned not null,
- cid bigint unsigned not null,
- rcid bigint unsigned not null,
- primary key (id),
- unique (fkid, cid, rcid),
- foreign key (fkid) references mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
- foreign key (cid) references mdb_columns (id),
- foreign key (rcid) references mdb_columns (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_constraints_unique`
-(
- uid varchar(36) not null,
- name varchar(255) not null,
- tid bigint unsigned not null,
- position int NULL,
- primary key (uid),
- foreign key (tid) references mdb_tables (id) ON DELETE CASCADE
+ id UUID NOT NULL DEFAULT UUID(),
+ fkid UUID NOT NULL DEFAULT UUID(),
+ cid UUID NOT NULL DEFAULT UUID(),
+ rcid UUID NOT NULL DEFAULT UUID(),
+ PRIMARY KEY (id),
+ UNIQUE (fkid, cid, rcid),
+ FOREIGN KEY (fkid) REFERENCES mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
+ FOREIGN KEY (cid) REFERENCES mdb_columns (id),
+ FOREIGN KEY (rcid) REFERENCES mdb_columns (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_constraints_UNIQUE`
+(
+ uid UUID NOT NULL DEFAULT UUID(),
+ name VARCHAR(255) NOT NULL,
+ tid UUID NOT NULL DEFAULT UUID(),
+ position INT NULL,
+ PRIMARY KEY (uid),
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
+CREATE TABLE IF NOT EXISTS `mdb_constraints_UNIQUE_columns`
(
- id varchar(36) not null,
- uid bigint unsigned not null,
- cid bigint unsigned not null,
- primary key (id),
- foreign key (uid) references mdb_constraints_unique (uid),
- foreign key (cid) references mdb_columns (id) ON DELETE CASCADE
+ id UUID NOT NULL DEFAULT UUID(),
+ uid UUID NOT NULL DEFAULT UUID(),
+ cid UUID NOT NULL DEFAULT UUID(),
+ PRIMARY KEY (id),
+ FOREIGN KEY (uid) REFERENCES mdb_constraints_UNIQUE (uid),
+ FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
(
- id varchar(36) not null,
- tid bigint unsigned not null,
- checks varchar(255) not null,
- primary key (id),
- foreign key (tid) references mdb_tables (id) ON DELETE CASCADE
+ id UUID NOT NULL DEFAULT UUID(),
+ tid UUID NOT NULL DEFAULT UUID(),
+ checks VARCHAR(255) NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_concepts`
(
- id varchar(36) not null,
- uri text not null,
- name varchar(255) null,
- description text null,
- created timestamp not null default now(),
- primary key (id),
- unique (uri(200))
+ id UUID NOT NULL DEFAULT UUID(),
+ uri TEXT NOT NULL,
+ name VARCHAR(255) null,
+ description TEXT null,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id),
+ UNIQUE (uri(200))
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_units`
(
- id varchar(36) not null,
- uri text not null,
- name varchar(255) null,
- description text null,
- created timestamp not null default now(),
- primary key (id),
- unique (uri(200))
+ id UUID NOT NULL DEFAULT UUID(),
+ uri TEXT NOT NULL,
+ name VARCHAR(255) null,
+ description TEXT null,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id),
+ UNIQUE (uri(200))
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_columns_concepts`
(
- id bigint unsigned not null,
- cID bigint unsigned not null,
- created timestamp not null default now(),
- primary key (id, cid),
- foreign key (cID) references mdb_columns (ID)
+ id UUID NOT NULL DEFAULT UUID(),
+ cID UUID NOT NULL DEFAULT UUID(),
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id, cid),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_columns_units`
(
- id bigint unsigned not null,
- cID bigint unsigned not null,
- created timestamp not null default now(),
- primary key (id, cID),
- foreign key (cID) references mdb_columns (ID)
+ id UUID NOT NULL DEFAULT UUID(),
+ cID UUID NOT NULL DEFAULT UUID(),
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id, cID),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_view`
(
- id varchar(36) not null,
- vdbid bigint unsigned not null,
- vName varchar(64) not null,
- internal_name varchar(64) not null,
- Query text not null,
- query_hash varchar(255) not null,
- Public boolean not null default true,
- is_schema_public boolean not null default true,
- InitialView boolean not null,
- created timestamp not null default now(),
- last_modified timestamp,
- owned_by varchar(36) not null,
- primary key (id),
- foreign key (vdbid) references mdb_databases (id),
- foreign key (owned_by) references mdb_users (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ vdbid UUID NOT NULL DEFAULT UUID(),
+ vName VARCHAR(64) NOT NULL,
+ internal_name VARCHAR(64) NOT NULL,
+ Query TEXT NOT NULL,
+ query_hash VARCHAR(255) NOT NULL,
+ Public BOOLEAN NOT NULL DEFAULT TRUE,
+ is_schema_public BOOLEAN NOT NULL DEFAULT TRUE,
+ InitialView BOOLEAN NOT NULL,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ last_modified TIMESTAMP,
+ owned_by UUID NOT NULL DEFAULT UUID(),
+ PRIMARY KEY (id),
+ FOREIGN KEY (vdbid) REFERENCES mdb_databases (id),
+ FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_messages`
(
- id varchar(36) not null,
- type enum ('ERROR', 'WARNING', 'INFO') not null default 'INFO',
- message text not null,
- link text NULL,
- link_text varchar(255) NULL,
- display_start timestamp NULL,
- display_end timestamp NULL,
- primary key (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ type ENUM ('ERROR', 'WARNING', 'INFO') NOT NULL DEFAULT 'INFO',
+ message TEXT NOT NULL,
+ link TEXT NULL,
+ link_TEXT VARCHAR(255) NULL,
+ display_start TIMESTAMP NULL,
+ display_end TIMESTAMP NULL,
+ PRIMARY KEY (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_ontologies`
(
- id varchar(36) not null,
- prefix varchar(8) not null,
- uri text not null,
- uri_pattern text,
- sparql_endpoint text NULL,
- rdf_path text NULL,
- last_modified timestamp,
- created timestamp not null default now(),
- unique (prefix),
- unique (uri(200)),
- primary key (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ prefix VARCHAR(8) NOT NULL,
+ uri TEXT NOT NULL,
+ uri_pattern TEXT,
+ sparql_endpoint TEXT NULL,
+ rdf_path TEXT NULL,
+ last_modified TIMESTAMP,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ UNIQUE (prefix),
+ UNIQUE (uri(200)),
+ PRIMARY KEY (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_view_columns`
(
- id varchar(36) not null,
- view_id bigint unsigned not null,
- name varchar(64),
- internal_name varchar(64) not null,
- column_type enum ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- ordinal_position int not null,
- size bigint unsigned,
- d bigint unsigned,
- is_null_allowed boolean not null default true,
- primary key (id),
- foreign key (view_id) references mdb_view (id) ON DELETE CASCADE,
- unique (view_id, internal_name)
+ id UUID NOT NULL DEFAULT UUID(),
+ view_id UUID NOT NULL DEFAULT UUID(),
+ name VARCHAR(64),
+ internal_name VARCHAR(64) NOT NULL,
+ column_type ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
+ ordinal_position INT NOT NULL,
+ size BIGINT UNSIGNED,
+ d BIGINT UNSIGNED,
+ is_null_allowed BOOLEAN NOT NULL DEFAULT TRUE,
+ PRIMARY KEY (id),
+ FOREIGN KEY (view_id) REFERENCES mdb_view (id) ON DELETE CASCADE,
+ UNIQUE (view_id, internal_name)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifiers`
(
- id varchar(36) not null,
- dbid bigint unsigned not null,
- qid bigint unsigned,
- vid bigint unsigned,
- tid bigint unsigned,
- publisher varchar(255) not null,
- language varchar(2),
- publication_year int not null,
- publication_month int,
- publication_day int,
- identifier_type enum ('DATABASE', 'SUBSET', 'VIEW', 'TABLE') not null,
- status enum ('DRAFT', 'PUBLISHED') not null default ('PUBLISHED'),
- query text,
- query_normalized text,
- query_hash varchar(255),
- execution timestamp,
- result_hash varchar(255),
- result_number bigint,
- doi varchar(255),
- created timestamp not null default now(),
- owned_by varchar(36) not null,
- last_modified timestamp,
- primary key (id), /* must be a single id from persistent identifier concept */
- foreign key (dbid) references mdb_databases (id),
- foreign key (owned_by) references mdb_users (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ dbid UUID NOT NULL DEFAULT UUID(),
+ qid UUID,
+ vid UUID,
+ tid UUID,
+ publisher VARCHAR(255) NOT NULL,
+ language VARCHAR(2),
+ publication_year INT NOT NULL,
+ publication_month INT,
+ publication_day INT,
+ identifier_type ENUM ('DATABASE', 'SUBSET', 'VIEW', 'TABLE') NOT NULL,
+ status ENUM ('DRAFT', 'PUBLISHED') NOT NULL DEFAULT ('PUBLISHED'),
+ query TEXT,
+ query_normalized TEXT,
+ query_hash VARCHAR(255),
+ execution TIMESTAMP,
+ result_hash VARCHAR(255),
+ result_number BIGINT,
+ doi VARCHAR(255),
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ owned_by UUID NOT NULL DEFAULT UUID(),
+ last_modified TIMESTAMP,
+ PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
+ FOREIGN KEY (dbid) REFERENCES mdb_databases (id),
+ FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`
(
- pid bigint unsigned not null,
- license_id varchar(255) not null,
- primary key (pid, license_id),
- foreign key (pid) references mdb_identifiers (id),
- foreign key (license_id) references mdb_licenses (identifier)
+ pid UUID NOT NULL DEFAULT UUID(),
+ license_id VARCHAR(255) NOT NULL,
+ PRIMARY KEY (pid, license_id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
+ FOREIGN KEY (license_id) REFERENCES mdb_licenses (identifier)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifier_titles`
(
- id varchar(36) not null,
- pid bigint unsigned not null,
- title text not null,
- title_type enum ('ALTERNATIVE_TITLE', 'SUBTITLE', 'TRANSLATED_TITLE', 'OTHER'),
- language varchar(2),
- primary key (id),
- foreign key (pid) references mdb_identifiers (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ pid UUID NOT NULL DEFAULT UUID(),
+ title TEXT NOT NULL,
+ title_type ENUM ('ALTERNATIVE_TITLE', 'SUBTITLE', 'TRANSLATED_TITLE', 'OTHER'),
+ language VARCHAR(2),
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifier_funders`
(
- id varchar(36) not null,
- pid bigint unsigned not null,
- funder_name varchar(255) not null,
- funder_identifier text,
- funder_identifier_type enum ('CROSSREF_FUNDER_ID', 'GRID', 'ISNI', 'ROR', 'OTHER'),
- scheme_uri text,
- award_number varchar(255),
- award_title text,
- language varchar(255),
- primary key (id),
- foreign key (pid) references mdb_identifiers (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ pid UUID NOT NULL DEFAULT UUID(),
+ funder_name VARCHAR(255) NOT NULL,
+ funder_identifier TEXT,
+ funder_identifier_type ENUM ('CROSSREF_FUNDER_ID', 'GRID', 'ISNI', 'ROR', 'OTHER'),
+ scheme_uri TEXT,
+ award_number VARCHAR(255),
+ award_title TEXT,
+ language VARCHAR(255),
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifier_descriptions`
(
- id varchar(36) not null,
- pid bigint unsigned not null,
- description text not null,
- description_type enum ('ABSTRACT', 'METHODS', 'SERIES_INFORMATION', 'TABLE_OF_CONTENTS', 'TECHNICAL_INFO', 'OTHER'),
- language varchar(2),
- primary key (id),
- foreign key (pid) references mdb_identifiers (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ pid UUID NOT NULL DEFAULT UUID(),
+ description TEXT NOT NULL,
+ description_type ENUM ('ABSTRACT', 'METHODS', 'SERIES_INFORMATION', 'TABLE_OF_CONTENTS', 'TECHNICAL_INFO', 'OTHER'),
+ language VARCHAR(2),
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifier_related`
(
- id varchar(36) not null,
- pid bigint unsigned not null,
- value varchar(255) not null,
- type enum ('DOI','URL','URN','ARK','ARXIV','BIBCODE','EAN13','EISSN','HANDLE','IGSN','ISBN','ISTC','LISSN','LSID','PMID','PURL','UPC','W3ID') not null,
- relation enum ('IS_CITED_BY','CITES','IS_SUPPLEMENT_TO','IS_SUPPLEMENTED_BY','IS_CONTINUED_BY','CONTINUES','IS_DESCRIBED_BY','DESCRIBES','HAS_METADATA','IS_METADATA_FOR','HAS_VERSION','IS_VERSION_OF','IS_NEW_VERSION_OF','IS_PREVIOUS_VERSION_OF','IS_PART_OF','HAS_PART','IS_PUBLISHED_IN','IS_REFERENCED_BY','references','IS_DOCUMENTED_BY','DOCUMENTS','IS_COMPILED_BY','COMPILES','IS_VARIANT_FORM_OF','IS_ORIGINAL_FORM_OF','IS_IDENTICAL_TO','IS_REVIEWED_BY','REVIEWS','IS_DERIVED_FROM','IS_SOURCE_OF','IS_REQUIRED_BY','REQUIRES','IS_OBSOLETED_BY','OBSOLETES') not null,
- primary key (id), /* must be a single id from persistent identifier concept */
- foreign key (pid) references mdb_identifiers (id),
- unique (pid, value)
+ id UUID NOT NULL DEFAULT UUID(),
+ pid UUID NOT NULL DEFAULT UUID(),
+ value VARCHAR(255) NOT NULL,
+ type ENUM ('DOI','URL','URN','ARK','ARXIV','BIBCODE','EAN13','EISSN','HANDLE','IGSN','ISBN','ISTC','LISSN','LSID','PMID','PURL','UPC','W3ID') NOT NULL,
+ relation ENUM ('IS_CITED_BY','CITES','IS_SUPPLEMENT_TO','IS_SUPPLEMENTED_BY','IS_CONTINUED_BY','CONTINUES','IS_DESCRIBED_BY','DESCRIBES','HAS_METADATA','IS_METADATA_FOR','HAS_VERSION','IS_VERSION_OF','IS_NEW_VERSION_OF','IS_PREVIOUS_VERSION_OF','IS_PART_OF','HAS_PART','IS_PUBLISHED_IN','IS_REFERENCED_BY','REFERENCES','IS_DOCUMENTED_BY','DOCUMENTS','IS_COMPILED_BY','COMPILES','IS_VARIANT_FORM_OF','IS_ORIGINAL_FORM_OF','IS_IDENTICAL_TO','IS_REVIEWED_BY','REVIEWS','IS_DERIVED_FROM','IS_SOURCE_OF','IS_REQUIRED_BY','REQUIRES','IS_OBSOLETED_BY','OBSOLETES') NOT NULL,
+ PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
+ UNIQUE (pid, value)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifier_creators`
(
- id varchar(36) not null,
- pid bigint unsigned not null,
- given_names text,
- family_name text,
- creator_name varchar(255) not null,
- name_type enum ('PERSONAL', 'ORGANIZATIONAL') default 'PERSONAL',
- name_identifier text,
- name_identifier_scheme enum ('ROR', 'GRID', 'ISNI', 'ORCID'),
- name_identifier_scheme_uri text,
- affiliation varchar(255),
- affiliation_identifier text,
- affiliation_identifier_scheme enum ('ROR', 'GRID', 'ISNI'),
- affiliation_identifier_scheme_uri text,
- primary key (id),
- foreign key (pid) references mdb_identifiers (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_update`
-(
- uUserID varchar(255) not null,
- uDBID bigint unsigned not null,
- created timestamp not null default now(),
- primary key (uUserID, uDBID),
- foreign key (uDBID) references mdb_databases (id)
+ id UUID NOT NULL DEFAULT UUID(),
+ pid UUID NOT NULL DEFAULT UUID(),
+ given_names TEXT,
+ family_name TEXT,
+ creator_name VARCHAR(255) NOT NULL,
+ name_type ENUM ('PERSONAL', 'ORGANIZATIONAL') DEFAULT 'PERSONAL',
+ name_identifier TEXT,
+ name_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI', 'ORCID'),
+ name_identifier_scheme_uri TEXT,
+ affiliation VARCHAR(255),
+ affiliation_identifier TEXT,
+ affiliation_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI'),
+ affiliation_identifier_scheme_uri TEXT,
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_access`
(
- aUserID varchar(255) not null,
- aDBID bigint unsigned references mdb_databases (id),
- attime timestamp,
- download boolean,
- created timestamp not null default now(),
- primary key (aUserID, aDBID)
+ aUserID VARCHAR(255) NOT NULL,
+ aDBID UUID REFERENCES mdb_databases (id),
+ attime TIMESTAMP,
+ download BOOLEAN,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (aUserID, aDBID)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_have_access`
(
- user_id varchar(36) not null,
- database_id bigint unsigned references mdb_databases (id),
- access_type enum ('READ', 'WRITE_OWN', 'WRITE_ALL') not null,
- created timestamp not null default now(),
- primary key (user_id, database_id),
- foreign key (user_id) references mdb_users (id)
+ user_id UUID NOT NULL DEFAULT UUID(),
+ database_id UUID REFERENCES mdb_databases (id),
+ access_type ENUM ('READ', 'WRITE_OWN', 'WRITE_ALL') NOT NULL,
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (user_id, database_id),
+ FOREIGN KEY (user_id) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_image_types`
(
- id varchar(36) not null,
- image_id bigint unsigned not null,
- display_name varchar(255) not null,
- value varchar(255) not null,
- size_min int unsigned,
- size_max int unsigned,
- size_default int unsigned,
- size_required boolean comment 'When setting NULL, the service assumes the data type has no size',
- size_step int unsigned,
- d_min int unsigned,
- d_max int unsigned,
- d_default int unsigned,
- d_required boolean comment 'When setting NULL, the service assumes the data type has no d',
- d_step int unsigned,
- type_hint text,
- data_hint text,
- documentation text not null,
- is_generated boolean not null,
- is_quoted boolean not null,
- is_buildable boolean not null,
- primary key (id),
- foreign key (image_id) references `mdb_images` (`id`),
- unique (value)
+ id UUID NOT NULL DEFAULT UUID(),
+ image_id UUID NOT NULL DEFAULT UUID(),
+ display_name VARCHAR(255) NOT NULL,
+ value VARCHAR(255) NOT NULL,
+ size_min INT UNSIGNED,
+ size_max INT UNSIGNED,
+ size_DEFAULT INT UNSIGNED,
+ size_required BOOLEAN comment 'When setting NULL, the service assumes the data type has no size',
+ size_step INT UNSIGNED,
+ d_min INT UNSIGNED,
+ d_max INT UNSIGNED,
+ d_DEFAULT INT UNSIGNED,
+ d_required BOOLEAN comment 'When setting NULL, the service assumes the data type has no d',
+ d_step INT UNSIGNED,
+ type_hint TEXT,
+ data_hint TEXT,
+ documentation TEXT NOT NULL,
+ is_generated BOOLEAN NOT NULL,
+ is_quoted BOOLEAN NOT NULL,
+ is_buildable BOOLEAN NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`),
+ UNIQUE (value)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_image_operators`
(
- id varchar(36) not null,
- image_id bigint unsigned not null,
- display_name varchar(255) not null,
- value varchar(255) not null,
- documentation text not null,
- primary key (id),
- foreign key (image_id) references `mdb_images` (`id`),
- unique (value)
+ id UUID NOT NULL DEFAULT UUID(),
+ image_id UUID NOT NULL DEFAULT UUID(),
+ display_name VARCHAR(255) NOT NULL,
+ value VARCHAR(255) NOT NULL,
+ documentation TEXT NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`),
+ UNIQUE (value)
) WITH SYSTEM VERSIONING;
COMMIT;
@@ -558,110 +502,121 @@ VALUES ('CC0-1.0', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode'
('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode',
'The Creative Commons Attribution license allows re-distribution and re-use of a licensed work on the condition that the creator is appropriately credited.');
-INSERT INTO `mdb_images` (name, registry, version, default_port, dialect, driver_class, jdbc_method)
-VALUES ('mariadb', 'docker.io', '11.1.3', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver',
- 'mariadb');
+INSERT INTO `mdb_images` (id, name, registry, version, DEFAULT_port, dialect, driver_class, jdbc_method)
+VALUES ('d79cb089-363c-488b-9717-649e44d8fcc5', 'mariadb', 'docker.io', '11.1.3', 3306,
+ 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver', 'mariadb');
-INSERT INTO `mdb_image_types` (image_id, display_name, value, size_min, size_max, size_default, size_required,
- size_step, d_min, d_max, d_default, d_required, d_step, type_hint, data_hint,
+INSERT INTO `mdb_image_types` (image_id, display_name, value, size_min, size_max, size_DEFAULT, size_required,
+ size_step, d_min, d_max, d_DEFAULT, d_required, d_step, type_hint, data_hint,
documentation, is_quoted, is_buildable, is_generated)
-VALUES (1, 'BIGINT(size)', 'bigint', 0, null, null, false, 1, null, null, null, null, null, null, null,
- 'https://mariadb.com/kb/en/bigint/', false, true, false),
- (1, 'BINARY(size)', 'binary', 0, 255, 255, true, 1, null, null, null, null, null, 'size in Bytes', null,
- 'https://mariadb.com/kb/en/binary/', false, true, false),
- (1, 'BIT(size)', 'bit', 0, 64, null, false, 1, null, null, null, null, null, null, null,
- 'https://mariadb.com/kb/en/bit/', false, true, false),
- (1, 'BLOB(size)', 'blob', 0, 65535, null, false, 1, null, null, null, null, null, 'size in Bytes', null,
- 'https://mariadb.com/kb/en/blob/', false, false, false),
- (1, 'BOOL', 'bool', null, null, null, null, null, null, null, null, null, null, null, null,
- 'https://mariadb.com/kb/en/bool/', false, true, false),
- (1, 'CHAR(size)', 'char', 0, 255, 255, false, 1, null, null, null, null, null, null, null,
- 'https://mariadb.com/kb/en/char/', false, true, false),
- (1, 'DATE', 'date', null, null, null, null, null, null, null, null, null, null,
- 'min. 1000-01-01, max. 9999-12-31', 'e.g. YYYY-MM-DD, YY-MM-DD, YYMMDD, YYYY/MM/DD',
- 'https://mariadb.com/kb/en/date/', true, true, false),
- (1, 'DATETIME(fsp)', 'datetime', 0, 6, null, null, 1, null, null, null, null, null,
- 'fsp=microsecond precision, min. 1000-01-01 00:00:00.0, max. 9999-12-31 23:59:59.9',
+VALUES ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BIGINT(size)', 'bigint', 0, null, null, FALSE, 1, null, null, null,
+ null, null, null, null, 'https://mariadb.com/kb/en/bigint/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BINARY(size)', 'binary', 0, 255, 255, TRUE, 1, null, null, null, null,
+ null, 'size in Bytes', null, 'https://mariadb.com/kb/en/binary/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BIT(size)', 'bit', 0, 64, null, FALSE, 1, null, null, null, null, null,
+ null, null, 'https://mariadb.com/kb/en/bit/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BLOB(size)', 'blob', 0, 65535, null, FALSE, 1, null, null, null, null,
+ null, 'size in Bytes', null, 'https://mariadb.com/kb/en/blob/', FALSE, FALSE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BOOL', 'bool', null, null, null, null, null, null, null, null, null,
+ null, null, null, 'https://mariadb.com/kb/en/bool/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'CHAR(size)', 'char', 0, 255, 255, FALSE, 1, null, null, null, null,
+ null, null, null, 'https://mariadb.com/kb/en/char/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DATE', 'date', null, null, null, null, null, null, null, null, null,
+ null, 'min. 1000-01-01, max. 9999-12-31', 'e.g. YYYY-MM-DD, YY-MM-DD, YYMMDD, YYYY/MM/DD',
+ 'https://mariadb.com/kb/en/date/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DATETIME(fsp)', 'datetime', 0, 6, null, null, 1, null, null, null,
+ null, null, 'fsp=microsecond precision, min. 1000-01-01 00:00:00.0, max. 9999-12-31 23:59:59.9',
'e.g. YYYY-MM-DD HH:MM:SS, YY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS, YYMMDDHHMMSS, YYYYMMDD, YYMMDD',
- 'https://mariadb.com/kb/en/datetime/', true, true, false),
- (1, 'DECIMAL(size, d)', 'decimal', 0, 65, null, false, 1, 0, 38, null, false, null, null, null,
- 'https://mariadb.com/kb/en/decimal/', false, true, false),
- (1, 'DOUBLE(size, d)', 'double', null, null, null, false, null, null, null, null, false, null, null, null,
- 'https://mariadb.com/kb/en/double/', false, true, false),
- (1, 'ENUM(v1,v2,...)', 'enum', null, null, null, null, null, null, null, null, null, null, null,
- 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/enum/', true, true, false),
- (1, 'FLOAT(size)', 'float', null, null, null, false, null, null, null, null, null, null, null, null,
- 'https://mariadb.com/kb/en/float/', false, true, false),
- (1, 'INT(size)', 'int', null, null, null, false, null, null, null, null, null, null, 'size in Bytes', null,
- 'https://mariadb.com/kb/en/int/', false, true, false),
- (1, 'LONGBLOB', 'longblob', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB', null,
- 'https://mariadb.com/kb/en/longblob/', false, true, false),
- (1, 'LONGTEXT', 'longtext', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB', null,
- 'https://mariadb.com/kb/en/longtext/', true, true, false),
- (1, 'MEDIUMBLOB', 'mediumblob', null, null, null, null, null, null, null, null, null, null, 'max. 15.999 MiB',
- null, 'https://mariadb.com/kb/en/mediumblob/', false, true, false),
- (1, 'MEDIUMINT', 'mediumint', null, null, null, null, null, null, null, null, null, null, 'size in Bytes', null,
- 'https://mariadb.com/kb/en/mediumint/', false, true, false),
- (1, 'MEDIUMTEXT', 'mediumtext', null, null, null, null, null, null, null, null, null, null, 'size in Bytes',
- null, 'https://mariadb.com/kb/en/mediumtext/', true, true, false),
- (1, 'SERIAL', 'serial', null, null, null, null, null, null, null, null, null, null, null,
- null, 'https://mariadb.com/kb/en/bigint/', true, true, true),
- (1, 'SET(v1,v2,...)', 'set', null, null, null, null, null, null, null, null, null, null, null,
- 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/set/', true, true, false),
- (1, 'SMALLINT(size)', 'smallint', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes',
- null, 'https://mariadb.com/kb/en/smallint/', false, true, false),
- (1, 'TEXT(size)', 'text', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes', null,
- 'https://mariadb.com/kb/en/text/', true, true, false),
- (1, 'TIME(fsp)', 'time', 0, 6, 0, false, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/datetime/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DECIMAL(size, d)', 'decimal', 0, 65, null, FALSE, 1, 0, 38, null,
+ FALSE, null, null, null, 'https://mariadb.com/kb/en/decimal/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DOUBLE(size, d)', 'double', null, null, null, FALSE, null, null, null,
+ null, FALSE, null, null, null, 'https://mariadb.com/kb/en/double/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'ENUM(v1,v2,...)', 'ENUM', null, null, null, null, null, null, null,
+ null, null, null, null, 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/ENUM/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'FLOAT(size)', 'float', null, null, null, FALSE, null, null, null, null,
+ null, null, null, null, 'https://mariadb.com/kb/en/float/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'INT(size)', 'int', null, null, null, FALSE, null, null, null, null,
+ null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/int/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'LONGBLOB', 'longblob', null, null, null, null, null, null, null, null,
+ null, null, 'max. 3.999 GiB', null, 'https://mariadb.com/kb/en/longblob/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'LONGTEXT', 'longTEXT', null, null, null, null, null, null, null, null,
+ null, null, 'max. 3.999 GiB', null, 'https://mariadb.com/kb/en/longTEXT/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'MEDIUMBLOB', 'mediumblob', null, null, null, null, null, null, null,
+ null, null, null, 'max. 15.999 MiB', null, 'https://mariadb.com/kb/en/mediumblob/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'MEDIUMINT', 'mediumint', null, null, null, null, null, null, null,
+ null, null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/mediumint/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'MEDIUMTEXT', 'mediumTEXT', null, null, null, null, null, null, null,
+ null, null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/mediumTEXT/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'SERIAL', 'serial', null, null, null, null, null, null, null, null,
+ null, null, null, null, 'https://mariadb.com/kb/en/bigint/', TRUE, TRUE, TRUE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'SET(v1,v2,...)', 'set', null, null, null, null, null, null, null, null,
+ null, null, null, 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/set/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'SMALLINT(size)', 'smallint', 0, null, null, FALSE, null, null, null,
+ null, null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/smallint/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TEXT(size)', 'TEXT', 0, null, null, FALSE, null, null, null, null,
+ null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/TEXT/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TIME(fsp)', 'time', 0, 6, 0, FALSE, null, null, null, null, null, null,
'fsp=microsecond precision, min. 0, max. 6', 'e.g. HH:MM:SS, HH:MM, HHMMSS, H:M:S',
- 'https://mariadb.com/kb/en/time/', true, true, false),
- (1, 'TIMESTAMP(fsp)', 'timestamp', 0, 6, 0, false, null, null, null, null, null, null,
- 'fsp=microsecond precision, min. 0, max. 6',
+ 'https://mariadb.com/kb/en/time/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TIMESTAMP(fsp)', 'timestamp', 0, 6, 0, FALSE, null, null, null, null,
+ null, null, 'fsp=microsecond precision, min. 0, max. 6',
'e.g. YYYY-MM-DD HH:MM:SS, YY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS, YYMMDDHHMMSS, YYYYMMDD, YYMMDD',
- 'https://mariadb.com/kb/en/timestamp/', true, true, false),
- (1, 'TINYBLOB', 'tinyblob', null, null, null, null, null, null, null, null, null, null, null,
- 'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/timestamp/', false, true, false),
- (1, 'TINYINT(size)', 'tinyint', 0, null, null, false, null, null, null, null, null, null, null,
- 'size in Bytes', 'https://mariadb.com/kb/en/tinyint/', false, true, false),
- (1, 'TINYTEXT', 'tinytext', null, null, null, null, null, null, null, null, null, null, null,
- 'max. 255 characters', 'https://mariadb.com/kb/en/tinytext/', true, true, false),
- (1, 'YEAR', 'year', 2, 4, null, false, 2, null, null, null, null, null, 'min. 1901, max. 2155', 'e.g. YYYY, YY',
- 'https://mariadb.com/kb/en/year/', false, true, false),
- (1, 'VARBINARY(size)', 'varbinary', 0, null, null, true, null, null, null, null, null, null, null,
- null, 'https://mariadb.com/kb/en/varbinary/', false, true, false),
- (1, 'varchar(size)', 'varchar', 0, 65532, 255, true, null, null, null, null, null, null, null,
- null, 'https://mariadb.com/kb/en/varchar/', false, true, false);
+ 'https://mariadb.com/kb/en/timestamp/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TINYBLOB', 'tinyblob', null, null, null, null, null, null, null, null,
+ null, null, null, 'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/timestamp/', FALSE,
+ TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TINYINT(size)', 'tinyint', 0, null, null, FALSE, null, null, null,
+ null, null, null, null, 'size in Bytes', 'https://mariadb.com/kb/en/tinyint/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TINYTEXT', 'tinyTEXT', null, null, null, null, null, null, null, null,
+ null, null, null, 'max. 255 characters', 'https://mariadb.com/kb/en/tinyTEXT/', TRUE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'YEAR', 'year', 2, 4, null, FALSE, 2, null, null, null, null, null,
+ 'min. 1901, max. 2155', 'e.g. YYYY, YY', 'https://mariadb.com/kb/en/year/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'VARBINARY(size)', 'varbinary', 0, null, null, TRUE, null, null, null,
+ null, null, null, null, null, 'https://mariadb.com/kb/en/varbinary/', FALSE, TRUE, FALSE),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'VARCHAR(size)', 'VARCHAR', 0, 65532, 255, TRUE, null, null, null, null,
+ null, null, null, null, 'https://mariadb.com/kb/en/VARCHAR/', FALSE, TRUE, FALSE);
+
INSERT INTO `mdb_image_operators` (image_id, display_name, value, documentation)
-VALUES (1, 'Equal operator', '=', 'https://mariadb.com/kb/en/assignment-operators-assignment-operator/'),
- (1, 'NULL-safe equal operator', '<=>', 'https://mariadb.com/kb/en/null-safe-equal/'),
- (1, 'Less-than operator', '<', 'https://mariadb.com/kb/en/less-than/'),
- (1, 'Less than or equal operator', '<=', 'https://mariadb.com/kb/en/less-than-or-equal/'),
- (1, 'Greater-than operator', '>', 'https://mariadb.com/kb/en/greater-than/'),
- (1, 'Greater than or equal operator', '>=', 'https://mariadb.com/kb/en/greater-than-or-equal/'),
- (1, 'Not equal operator', '!=', 'https://mariadb.com/kb/en/not-equal/'),
- (1, 'Addition operator', '+', 'https://mariadb.com/kb/en/addition-operator/'),
- (1, 'Division operator', '/', 'https://mariadb.com/kb/en/division-operator/'),
- (1, 'Modulo operator', '%', 'https://mariadb.com/kb/en/modulo-operator/'),
- (1, 'Multiplication operator', '*', 'https://mariadb.com/kb/en/multiplication-operator/'),
- (1, 'Subtraction operator', '-', 'https://mariadb.com/kb/en/subtraction-operator-/'),
- (1, 'LIKE', 'LIKE', 'https://mariadb.com/kb/en/like/'),
- (1, 'NOT LIKE', 'NOT LIKE', 'https://mariadb.com/kb/en/not-like/'),
- (1, 'IN', 'IN', 'https://mariadb.com/kb/en/in/'),
- (1, 'NOT IN', 'NOT IN', 'https://mariadb.com/kb/en/not-in/'),
- (1, 'IS', 'IS', 'https://mariadb.com/kb/en/is/'),
- (1, 'IS NOT', 'IS NOT', 'https://mariadb.com/kb/en/is-not/'),
- (1, 'IS not null', 'IS not null', 'https://mariadb.com/kb/en/is-not-null/'),
- (1, 'IS NULL', 'IS NULL', 'https://mariadb.com/kb/en/is-null/'),
- (1, 'ISNULL', 'ISNULL', 'https://mariadb.com/kb/en/isnull/'),
- (1, 'REGEXP', 'REGEXP', 'https://mariadb.com/kb/en/regexp/'),
- (1, 'NOT REGEXP', 'NOT REGEXP', 'https://mariadb.com/kb/en/not-regexp/'),
- (1, 'Bitwise AND', '&', 'https://mariadb.com/kb/en/bitwise_and/'),
- (1, 'Bitwise OR', '|', 'https://mariadb.com/kb/en/bitwise-or/'),
- (1, 'Bitwise XOR', '^', 'https://mariadb.com/kb/en/bitwise-xor/'),
- (1, 'Bitwise NOT', '~', 'https://mariadb.com/kb/en/bitwise-not/'),
- (1, 'Left shift', '<<', 'https://mariadb.com/kb/en/shift-left/'),
- (1, 'Right shift', '>>', 'https://mariadb.com/kb/en/shift-right/');
+VALUES ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Equal operator', '=',
+ 'https://mariadb.com/kb/en/assignment-operators-assignment-operator/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NULL-safe equal operator', '<=>',
+ 'https://mariadb.com/kb/en/null-safe-equal/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Less-than operator', '<', 'https://mariadb.com/kb/en/less-than/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Less than or equal operator', '<=',
+ 'https://mariadb.com/kb/en/less-than-or-equal/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Greater-than operator', '>',
+ 'https://mariadb.com/kb/en/greater-than/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Greater than or equal operator', '>=',
+ 'https://mariadb.com/kb/en/greater-than-or-equal/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Not equal operator', '!=', 'https://mariadb.com/kb/en/not-equal/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Addition operator', '+',
+ 'https://mariadb.com/kb/en/addition-operator/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Division operator', '/',
+ 'https://mariadb.com/kb/en/division-operator/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Modulo operator', '%', 'https://mariadb.com/kb/en/modulo-operator/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Multiplication operator', '*',
+ 'https://mariadb.com/kb/en/multiplication-operator/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Subtraction operator', '-',
+ 'https://mariadb.com/kb/en/subtraction-operator-/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'LIKE', 'LIKE', 'https://mariadb.com/kb/en/like/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NOT LIKE', 'NOT LIKE', 'https://mariadb.com/kb/en/not-like/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IN', 'IN', 'https://mariadb.com/kb/en/in/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NOT IN', 'NOT IN', 'https://mariadb.com/kb/en/not-in/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS', 'IS', 'https://mariadb.com/kb/en/is/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS NOT', 'IS NOT', 'https://mariadb.com/kb/en/is-not/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS NOT NULL', 'IS NOT NULL', 'https://mariadb.com/kb/en/is-not-null/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS NULL', 'IS NULL', 'https://mariadb.com/kb/en/is-null/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'ISNULL', 'ISNULL', 'https://mariadb.com/kb/en/isnull/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'REGEXP', 'REGEXP', 'https://mariadb.com/kb/en/regexp/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NOT REGEXP', 'NOT REGEXP', 'https://mariadb.com/kb/en/not-regexp/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise AND', '&', 'https://mariadb.com/kb/en/bitwise_and/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise OR', '|', 'https://mariadb.com/kb/en/bitwise-or/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise XOR', '^', 'https://mariadb.com/kb/en/bitwise-xor/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise NOT', '~', 'https://mariadb.com/kb/en/bitwise-not/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Left shift', '<<', 'https://mariadb.com/kb/en/shift-left/'),
+ ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Right shift', '>>', 'https://mariadb.com/kb/en/shift-right/');
INSERT
INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)
diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml
index 37e8bec63f5b772f35dc97529c899edea14200fe..6c3b1aa13fbe0ccac21e0e0ce1ede0a78e6f340d 100644
--- a/dbrepo-metadata-service/api/pom.xml
+++ b/dbrepo-metadata-service/api/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-api</artifactId>
<name>dbrepo-metadata-service-api</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service-entities</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml
index b73a11050c8d9ea55bf8649a1694bfc1c00c7600..313309e18831501558a149cab52920bb90e89e91 100644
--- a/dbrepo-metadata-service/entities/pom.xml
+++ b/dbrepo-metadata-service/entities/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-entities</artifactId>
<name>dbrepo-metadata-service-entity</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml
index a9c3a1f388e6f1e7e55c6e1ec47f4e3d7acf70fc..54c464b11a31cea0e588f797fa38012c573a1d02 100644
--- a/dbrepo-metadata-service/oai/pom.xml
+++ b/dbrepo-metadata-service/oai/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-oai</artifactId>
<name>dbrepo-metadata-service-oai</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index 54115d9e16441c6f651c9dad9579089bee2d6e1e..d294d8583b08b34fc56c835c08bac25229a6a9b7 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<name>dbrepo-metadata-service</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<description>Service that manages the metadata</description>
@@ -27,7 +27,7 @@
<module>report</module>
</modules>
- <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/</url>
+ <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/</url>
<developers>
<developer>
<name>Martin Weise</name>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index f78cb7c2599f35692bbf13b8e001c683eadb01d3..6bcb8d579b67439ad4bcd590cf5af3819f70218e 100644
--- a/dbrepo-metadata-service/report/pom.xml
+++ b/dbrepo-metadata-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
<name>dbrepo-metadata-service-report</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index 696b3c223ae7a5ac113efe544b21a6b5ba67f3a0..4d3b5f933d2c39674b2f9e58461387c0a2cffdb8 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
<name>dbrepo-metadata-service-repositories</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index f3d420f35ec25fb27dd66a8df3a90561e649b33d..9e9f23d11fdbab4fc2308bead597a7626272ceb1 100644
--- a/dbrepo-metadata-service/rest-service/pom.xml
+++ b/dbrepo-metadata-service/rest-service/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-rest-service</artifactId>
<name>dbrepo-metadata-service-rest</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index b817658a09424af38fb372ce440258e0b8be7b38..906fa5258b02807565c4acc0e361d5c65bd65b77 100644
--- a/dbrepo-metadata-service/services/pom.xml
+++ b/dbrepo-metadata-service/services/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-services</artifactId>
<name>dbrepo-metadata-service-services</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/test/pom.xml b/dbrepo-metadata-service/test/pom.xml
index a68140ebac0f0d0289e88e14a754a8f72a6f18cc..792523227eaa968b3dd8c340779bece2323cb461 100644
--- a/dbrepo-metadata-service/test/pom.xml
+++ b/dbrepo-metadata-service/test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.5</version>
+ <version>1.7.0</version>
</parent>
<artifactId>dbrepo-metadata-service-test</artifactId>
<name>dbrepo-metadata-service-test</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
<dependencies>
<dependency>
diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile
index 536a5f3a9172dfa50a38671ff50a7d06b9e4a8b2..6284708cc1d7f99f10843ad47c05b35a25916bf4 100644
--- a/dbrepo-search-service/Pipfile
+++ b/dbrepo-search-service/Pipfile
@@ -18,7 +18,7 @@ jwt = "~=1.3"
testcontainers-opensearch = "*"
pytest = "*"
rdflib = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.5.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.7.0.tar.gz"}
gunicorn = "*"
[dev-packages]
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index ee4559cd98d5de000c481dde00e5176390b61fc9..f6db779333032ad20a626e70890a1ce7852d67c1 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "2f5a0ee9d98b5e49a8d4957fb07a5231178b3fe8cc2016850c9b42c67780004d"
+ "sha256": "30aa6fefdbdbb9f57d58ebc8660eee64445a831cea44c6ca1fa605f2a2e1adc3"
},
"pipfile-spec": 6,
"requires": {
@@ -369,9 +369,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:e2312f0d3cff34934578a16b01d646d8309e3a3d1bb4cbda9f984acf97824e00"
+ "sha256:b555d9cbbbc07f1bd8f449b7bb38b2f7221f86b897bff08dd7c34933befae865"
],
- "path": "./lib/dbrepo-1.6.5.tar.gz"
+ "path": "./lib/dbrepo-1.7.0.tar.gz"
},
"docker": {
"hashes": [
@@ -748,11 +748,11 @@
},
"mistune": {
"hashes": [
- "sha256:02106ac2aa4f66e769debbfa028509a275069dcffce0dfa578edd7b991ee700a",
- "sha256:e0740d635f515119f7d1feb6f9b192ee60f0cc649f80a8f944f905706a21654c"
+ "sha256:4b47731332315cdca99e0ded46fc0004001c1299ff773dfb48fbe1fd226de319",
+ "sha256:733bf018ba007e8b5f2d3a9eb624034f6ee26c4ea769a98ec533ee111d504dff"
],
"markers": "python_version >= '3.8'",
- "version": "==3.1.1"
+ "version": "==3.1.2"
},
"multidict": {
"hashes": [
diff --git a/dbrepo-search-service/init/Pipfile b/dbrepo-search-service/init/Pipfile
index b9a274061348045bc48b80501425bcef8c907721..fb1215f57667a4a54c344b54b047ebb4b00e8ad9 100644
--- a/dbrepo-search-service/init/Pipfile
+++ b/dbrepo-search-service/init/Pipfile
@@ -9,7 +9,7 @@ opensearch-py = "~=2.2"
python-dotenv = "~=1.0"
testcontainers-opensearch = "*"
pytest = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.5.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.7.0.tar.gz"}
rdflib = "*"
[dev-packages]
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index 5fa254a95c9d93d6bece70f256d29c91983bd25e..5136c21707d1e3f339c703e1d82aaef96e63d9a7 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "ff7c99ed5a6bbe231e029a957724c779f019be7456f43ef9cc08df576991d7c3"
+ "sha256": "f2b08da6e7efe0ce8db0dd5a4a7d2ba9b2992b391f191cf60db744d0e353f614"
},
"pipfile-spec": 6,
"requires": {
@@ -259,9 +259,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:e2312f0d3cff34934578a16b01d646d8309e3a3d1bb4cbda9f984acf97824e00"
+ "sha256:b555d9cbbbc07f1bd8f449b7bb38b2f7221f86b897bff08dd7c34933befae865"
],
- "path": "./lib/dbrepo-1.6.5.tar.gz"
+ "path": "./lib/dbrepo-1.7.0.tar.gz"
},
"docker": {
"hashes": [
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.5-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.5-py3-none-any.whl
deleted file mode 100644
index 2a5cda78c55f725af708e7ff1d7f4b281586613d..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.5-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.5.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.5.tar.gz
deleted file mode 100644
index 5117abc68daa9a4e776392855c6022c8d20d5d31..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.5.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0-py3-none-any.whl
deleted file mode 100644
index b4ceb85027aa4164b602f876080c0f8979534b0e..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0.tar.gz
deleted file mode 100644
index e8de842c2945231eb547737851eb6269ee5ba84e..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.7.0-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.7.0-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..42c0e32ce8e4f895afa9e105ecdcb3d508ba2257
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.7.0-py3-none-any.whl differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.7.0.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.7.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8ecf0661cfdd270b33d7fe4e8bdce444569e995c
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.7.0.tar.gz differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.5-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.5-py3-none-any.whl
deleted file mode 100644
index 2a5cda78c55f725af708e7ff1d7f4b281586613d..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.5-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.5.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.5.tar.gz
deleted file mode 100644
index 5117abc68daa9a4e776392855c6022c8d20d5d31..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.5.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl
deleted file mode 100644
index b4ceb85027aa4164b602f876080c0f8979534b0e..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.5rc0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.5rc0.tar.gz
deleted file mode 100644
index e8de842c2945231eb547737851eb6269ee5ba84e..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.5rc0.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.7.0-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.7.0-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..42c0e32ce8e4f895afa9e105ecdcb3d508ba2257
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.7.0-py3-none-any.whl differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.7.0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.7.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8ecf0661cfdd270b33d7fe4e8bdce444569e995c
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.7.0.tar.gz differ
diff --git a/dbrepo-upload-service/pom.xml b/dbrepo-upload-service/pom.xml
index 44b77d7bf59f95af8cabcee93d055e25216db130..e7784d34593c68e3ad1f4c26bc69f9057659aee1 100644
--- a/dbrepo-upload-service/pom.xml
+++ b/dbrepo-upload-service/pom.xml
@@ -11,9 +11,9 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-upload-service</artifactId>
<name>dbrepo-upload-service</name>
- <version>1.6.5</version>
+ <version>1.7.0</version>
- <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/</url>
+ <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/</url>
<developers>
<developer>
<name>Martin Weise</name>
diff --git a/docker-compose.yml b/docker-compose.yml
index 94b5fc30a61c1081e194fd4eb98c45d7af9b261c..675794464f0cfad8006ded5fe0662bbed2927990 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,7 @@ services:
ports:
- "3306:3306"
environment:
+ BITNAMI_DEBUG: true
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
MARIADB_GALERA_MARIABACKUP_PASSWORD: "${METADATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml
index 63f5f997ffc71fbe57e0d42d10d8694a315761c7..6af1965b3f2f93250717913ce464ca975decc341 100644
--- a/helm/dbrepo/Chart.yaml
+++ b/helm/dbrepo/Chart.yaml
@@ -7,8 +7,8 @@ description: Helm Chart for installing DBRepo
sources:
- https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
type: application
-version: "1.6.5"
-appVersion: "1.6.5"
+version: "1.7.0"
+appVersion: "1.7.0"
keywords:
- dbrepo
maintainers:
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 3c00deb523d8a700e1ee2f36e9746dd00ae007fc..c827d39943f2ce3b2cb262abee51842f4a572d74 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -11,7 +11,7 @@ sample [
for your deployment and update the variables, especially `hostname`.
```bash
-helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.6.5"
+helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.7.0"
```
## Prerequisites
@@ -34,7 +34,7 @@ variable when you increase the available Pod memory for performance.
To install the chart with the release name `my-release`:
```bash
-helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.6.5"
+helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.7.0"
```
The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index f370c8825750a431296ef68c3d482a2e4eee9389..a9437e2cc19fae55c40e5ab0ddf772e20f11ab81 100644
Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 8a23308aff3c047f2fdaec2f56b9768f9d282e54..ff5562eebc310b204b49694fd0c53134a0cbbbf1 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -122,7 +122,7 @@ authservice:
setupJob:
image:
## @skip authservice.setupJob.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.7.0
## @param authservice.setupJob.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param authservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -415,7 +415,7 @@ analyseservice:
enabled: true
image:
## @skip analyseservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.7.0
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param analyseservice.podSecurityContext.enabled Enable pods' Security Context
@@ -476,7 +476,7 @@ metadataservice:
enabled: true
image:
## @skip metadataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param metadataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -573,7 +573,7 @@ dataservice:
endpoint: http://data-service
image:
## @skip dataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.0
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param dataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -659,7 +659,7 @@ searchservice:
endpoint: http://search-service
image:
## @skip searchservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.7.0
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param searchservice.podSecurityContext.enabled Enable pods' Security Context
@@ -706,7 +706,7 @@ searchservice:
init:
image:
## @skip searchservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.7.0
## @param searchservice.init.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param searchservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -767,7 +767,7 @@ storageservice:
init:
image:
## @skip storageservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.7.0
s3:
## @param storageservice.init.s3.endpoint The S3-capable endpoint the microservice connects to.
endpoint: http://storage-service-s3:8333
@@ -876,7 +876,7 @@ ui:
enabled: true
image:
## @skip ui.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.5
+ name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.7.0
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param ui.podSecurityContext.enabled Enable pods' Security Context
diff --git a/install.sh b/install.sh
index 004a29ff1f5ff20445ba5f49f9ed8520eb228429..6de016007f4e4eab84cd331a0a1a7aafca046b38 100644
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# preset
-VERSION="1.6.5"
+VERSION="1.7.0"
MIN_CPU=8
MIN_RAM=4
MIN_MAP_COUNT=262144
diff --git a/lib/python/docs/index.rst b/lib/python/docs/index.rst
index 8951bf165f7c5738843ccdcb011c8b932f1531e5..511a08b52d559b8dc252e593dd69c692aacabf6c 100644
--- a/lib/python/docs/index.rst
+++ b/lib/python/docs/index.rst
@@ -6,7 +6,7 @@ Pandas `DataFrame <https://pandas.pydata.org/docs/reference/api/pandas.DataFrame
provides an object-oriented API as well as low-level access to DBRepo services.
.. note::
- The SDK has been implemented and documented for DBRepo version 1.6.5, earlier versions may be supported but are not tested for compatibility.
+ The SDK has been implemented and documented for DBRepo version 1.7.0, earlier versions may be supported but are not tested for compatibility.
Quickstart
----------
diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml
index cbebfbc8a90c462e808d50def00390739c217b80..49b9bbb1b7e166bff6f58533fbd879559485e239 100644
--- a/lib/python/pyproject.toml
+++ b/lib/python/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "dbrepo"
-version = "1.6.5"
+version = "1.7.0"
description = "DBRepo Python Library"
keywords = [
"DBRepo",
@@ -34,7 +34,7 @@ requires = [
build-backend = "setuptools.build_meta"
[project.urls]
-Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/"
+Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/"
Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/python/"
Issues = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues"
Source = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/"
\ No newline at end of file
diff --git a/lib/python/setup.py b/lib/python/setup.py
index 19600afc0be83a18d00fff7a75cc082bb73408c1..4fff48185b04734932caad08d4aa06583730a52f 100644
--- a/lib/python/setup.py
+++ b/lib/python/setup.py
@@ -2,9 +2,9 @@
from distutils.core import setup
setup(name="dbrepo",
- version="1.6.5",
+ version="1.7.0",
description="A library for communicating with DBRepo",
- url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/",
+ url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/",
author="Martin Weise",
license="Apache-2.0",
author_email="martin.weise@tuwien.ac.at",
diff --git a/mkdocs.yml b/mkdocs.yml
index 5ec3a92799fba08d9299e466e780422f20bf1a65..536eed294ed4f5683d601f2e0a460a8ade5267d1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
site_name: Database Repository
-site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/
+site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/
repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
repo_name: fda-services
site_author: Research Unit Data Science, Technische Universität Wien
@@ -120,9 +120,9 @@ markdown_extensions:
custom_icons:
- .docs/overrides/.icons
extra:
- homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/
+ homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/
version:
- default: 1.6
+ default: 1.7
provider: mike
social:
- icon: simple/artifacthub
diff --git a/sonar-project.properties b/sonar-project.properties
index c044de9ff1cd165bdd794b1959d5bae87369f5a0..0d25b112d7133494be618d3f61e3e17a2c415e94 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@
sonar.projectKey=fair-data-austria-db-repository_fda-services_a57fa043-ab99-4cdd-a721-162d9a916d77
sonar.host.url=https://s39.datalab.tuwien.ac.at
# project
-sonar.projectVersion=1.6.5
+sonar.projectVersion=1.7.0
# general
sonar.qualitygate.wait=true
sonar.projectCreation.mainBranchName=master
diff --git a/versions.json b/versions.json
index b42a3dfd7d8ac8f78858923d4ac6d89906452771..95ca2a62a6fec4b73534bc3d6981b1bcdfd8fff2 100644
--- a/versions.json
+++ b/versions.json
@@ -1,4 +1,9 @@
[
+ {
+ "version": "1.7",
+ "title": "1.7",
+ "aliases": []
+ },
{
"version": "1.6",
"title": "1.6",