diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 5c49eb7e9c88346b8423a611dc14aca2e85cf346..44f91cec48761cfb05747c2825cafc602d3b356f 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update \ unzip \ python3-lxml \ python3-pip \ + python3-pytest \ python3-sqlparse \ python3-sphinx \ doxygen diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3878ddb5d95b9319fc6c44481efe9a63d284da41..7db3e239fc96a8cd46fdcc8c833eac71e0ef2758 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,11 @@ # -# This file is a part of the CaosDB Project. +# This file is a part of the LinkAhead Project. # # Copyright (C) 2018 Research Group Biomedical Physics, # Max-Planck-Institute for Dynamics and Self-Organization Göttingen +# Copyright (C) 2024 Indiscale GmbH <info@indiscale.com> # Copyright (C) 2019 Henrik tom Wörden +# Copyright (C) 2024 Daniel Hornung <d.hornung@indiscale.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -62,6 +64,13 @@ unittests-mariadb: script: - make pipeline-test SQL_HOST=mariadb +# Run the dump update tests +test-dump-update: + tags: [ docker ] + stage: test + script: + - make test-dump-update + # Run the unit tests with MySQL 5 unittests-mysql-5: tags: [ docker ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 464b7e89b847014345cc0e27e05c80ffcdb93c9a..a04bc6c003041567616eb532468cb630c9fdd20a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### +- Script to update outdated database dumps. + ### Changed ### ### Deprecated ### diff --git a/Makefile b/Makefile index 495f3d3d15519f230f1562417aacd34c3f48d586..7527a258a53d5247700db85d5e17e45ce1c9bb2f 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,10 @@ drop-%: test: ./utils/make_db test --fresh +.PHONY: test-dump-update +test-dump-update: + pytest dump_updates + # Run tests with a database which is started in a Docker container .PHONY: test-docker test-docker: diff --git a/procedures/entityVersioning.sql b/procedures/entityVersioning.sql index 8f6b10bf40735409d8de697cccf62cee30c29dc1..a71c0c729f9fae5e710b8cfd8e37618e7615ff20 100644 --- a/procedures/entityVersioning.sql +++ b/procedures/entityVersioning.sql @@ -1,5 +1,5 @@ /* - * This file is a part of the CaosDB Project. + * This file is a part of the LinkAhead Project. * * Copyright (C) 2020-2024 IndiScale GmbH <info@indiscale.com> * Copyright (C) 2020,2023 Timm Fitschen <t.fitschen@indiscale.com>