From 4eda1188eae3ebb9558b30ff083b9a24e53165ef Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 4 Feb 2020 12:34:54 +0100
Subject: [PATCH] WIP: pipeline
---
make_db | 3 ++-
patches/applyPatches.sh | 9 ++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/make_db b/make_db
index a7f126b..af03c05 100755
--- a/make_db
+++ b/make_db
@@ -65,6 +65,7 @@ function _execute_tests () {
# install/reset database for unit tests.
# options: [--fresh]
function _install_unit_test_database () {
+ DATABASE_NAME=$UNITTEST_DATABASE
if _db_exists "$SQL" "$DATABASE_NAME"; then
if [[ "$1" == "--fresh" ]] ; then
drop "$DATABASE_NAME" ;
@@ -73,7 +74,7 @@ function _install_unit_test_database () {
fi
fi
- sed "s/db_2_0/$UNITTEST_DATABASE/g" "$INSTALL_SQL_FILE" | $SQL
+ sed "s/db_2_0/$DATABASE_NAME/g" "$INSTALL_SQL_FILE" | $SQL
# crate test user
grant
diff --git a/patches/applyPatches.sh b/patches/applyPatches.sh
index 76db457..789be48 100755
--- a/patches/applyPatches.sh
+++ b/patches/applyPatches.sh
@@ -24,14 +24,21 @@
#apply all available patches.
set -e
-. ./utils/patch_header.sh
+echo "HERE3"
PATCHES="./patch*/patch.sh"
export UTILSPATH="./utils"
+echo "HERE4"
for p in $PATCHES
do
+ echo "HERE5"
$p "$@" --patch=$p
done
+echo "HERE6"
+source ./utils/patch_header.sh
+echo "HERE7"
cd ../
+echo "HERE8"
./update_sql_procedures.sh
+echo "HERE9"
--
GitLab