diff --git a/patches/patch20200312-2.1.2/patch.sh b/patches/patch20200415-3.0.0/patch.sh similarity index 89% rename from patches/patch20200312-2.1.2/patch.sh rename to patches/patch20200415-3.0.0/patch.sh index 121b4339c0e0245ecd8570f49c2f373995fd3533..3d28b4ee05853fad964565d0e7801c7e6276e3e3 100755 --- a/patches/patch20200312-2.1.2/patch.sh +++ b/patches/patch20200415-3.0.0/patch.sh @@ -22,9 +22,9 @@ # ** end header # # new entity_version table -# Update mysql schema to version v2.1.2 -NEW_VERSION="v2.1.2" -OLD_VERSION="v2.1.2" +# Update mysql schema to version v3.0.0 +NEW_VERSION="v3.0.0" +OLD_VERSION="v2.1.1" if [ -z "$UTILSPATH" ]; then UTILSPATH="../utils" @@ -36,7 +36,7 @@ fi check_version $OLD_VERSION -# TODO +mysql_execute_file $PATCH_DIR/versioning.sql update_version $NEW_VERSION diff --git a/tests/test_0_next_patch.sql b/patches/patch20200415-3.0.0/versioning.sql similarity index 99% rename from tests/test_0_next_patch.sql rename to patches/patch20200415-3.0.0/versioning.sql index ced1a9a82c43ba9d3df076c55fa47ce50e951f8e..7818f7d08bc9537b2af07f8de7a236929b3a7b13 100644 --- a/tests/test_0_next_patch.sql +++ b/patches/patch20200415-3.0.0/versioning.sql @@ -1,6 +1,4 @@ -USE _caosdb_schema_unit_tests; - DROP TABLE IF EXISTS archive_reference_data; DROP TABLE IF EXISTS archive_null_data; DROP TABLE IF EXISTS archive_text_data; diff --git a/utils/patch_header.sh b/utils/patch_header.sh index 488b7a0f4df0c20bde1909872d923ea4c352cacc..c50846ed2a03677c86ccd056dab111a04a8f4903 100644 --- a/utils/patch_header.sh +++ b/utils/patch_header.sh @@ -88,6 +88,7 @@ while test $# -gt 0; do ;; --patch*) PATCH="${1#--*=}" + PATCH_DIR=$(dirname $PATCH) shift ;; --backupdir*)