From 242ffe02cb79a83e9c9956ee987fdd3fd643eb60 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 14 Jan 2022 17:34:30 +0100
Subject: [PATCH] new version
---
patches/patch20220110-6.0-SNAPSHOT/patch.sh | 3 +++
patches/patch20220110-6.0-SNAPSHOT/patch.sql | 2 +-
procedures/deleteEntity.sql | 1 +
utils/load_settings.sh | 1 +
utils/make_db | 1 +
utils/patch_header.sh | 7 +++++++
6 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/patches/patch20220110-6.0-SNAPSHOT/patch.sh b/patches/patch20220110-6.0-SNAPSHOT/patch.sh
index 8c73b31..739a6b8 100755
--- a/patches/patch20220110-6.0-SNAPSHOT/patch.sh
+++ b/patches/patch20220110-6.0-SNAPSHOT/patch.sh
@@ -39,7 +39,10 @@ check_version $OLD_VERSION
mysql_execute_file $PATCH_DIR/patch.sql
+is_unit_test || mysql_execute "DROP PROCEDURE _create_dirs;"
+
update_version $NEW_VERSION
+
success
diff --git a/patches/patch20220110-6.0-SNAPSHOT/patch.sql b/patches/patch20220110-6.0-SNAPSHOT/patch.sql
index 2a6c774..931ac7d 100644
--- a/patches/patch20220110-6.0-SNAPSHOT/patch.sql
+++ b/patches/patch20220110-6.0-SNAPSHOT/patch.sql
@@ -211,5 +211,5 @@ DELIMITER ;
CALL _create_dirs();
--- not to be uses after this patch has been applied.
+-- not to be used after this patch has been applied.
-- DROP PROCEDURE _create_dirs;
diff --git a/procedures/deleteEntity.sql b/procedures/deleteEntity.sql
index 5574f3e..859f43c 100644
--- a/procedures/deleteEntity.sql
+++ b/procedures/deleteEntity.sql
@@ -43,6 +43,7 @@ BEGIN
-- detele file properties
DELETE FROM files where file_id=EntityID;
+ DELETE FROM files where parent_directory=EntityID;
-- delete datatype stuff
DELETE FROM data_type
diff --git a/utils/load_settings.sh b/utils/load_settings.sh
index c24a0f4..9d5fc61 100644
--- a/utils/load_settings.sh
+++ b/utils/load_settings.sh
@@ -69,3 +69,4 @@ export DATABASE_NAME
export DATABASE_USER
export DATABASE_USER_PW
export DATABASE_USER_HOST_LIST
+export IS_UNIT_TEST
diff --git a/utils/make_db b/utils/make_db
index c9fffc4..dd72c4e 100755
--- a/utils/make_db
+++ b/utils/make_db
@@ -78,6 +78,7 @@ function _execute_tests () {
# optional parameter: [--fresh] for installing a fresh data base. Otherwise an existing one would be reused.
function _install_unit_test_database () {
DATABASE_NAME=$UNITTEST_DATABASE
+ IS_UNIT_TEST=1
if [[ $1 = "--fresh" ]] ; then
if _db_exists "$DATABASE_NAME"; then
drop "$DATABASE_NAME" ;
diff --git a/utils/patch_header.sh b/utils/patch_header.sh
index 33fbff8..37483b0 100644
--- a/utils/patch_header.sh
+++ b/utils/patch_header.sh
@@ -143,4 +143,11 @@ function redo_table {
$MYSQL_CMD $(get_db_args) < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
}
+function is_unit_test {
+ if [ -z "$IS_UNIT_TEST" ]; then
+ return 1;
+ fi
+ return 0;
+}
+
--
GitLab