From 4ce7b16a3b08269487579a8a3a147501e291495c Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 15 Apr 2020 11:36:36 +0200
Subject: [PATCH] Update to 3.0.0
---
.../{patch20200312-2.1.2 => patch20200415-3.0.0}/patch.sh | 8 ++++----
.../patch20200415-3.0.0/versioning.sql | 2 --
utils/patch_header.sh | 1 +
3 files changed, 5 insertions(+), 6 deletions(-)
rename patches/{patch20200312-2.1.2 => patch20200415-3.0.0}/patch.sh (89%)
rename tests/test_0_next_patch.sql => patches/patch20200415-3.0.0/versioning.sql (99%)
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 121b433..3d28b4e 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 ced1a9a..7818f7d 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 488b7a0..c50846e 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*)
--
GitLab