From b2da1f54032075fd670009195f8f178e79a771cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Mon, 23 Mar 2020 20:02:32 +0100
Subject: [PATCH] MAINT: there was MYSQL_CMD and CMD_MYSQL; removed one
---
patches/patch20151022-0/patch.sh | 2 +-
patches/utils/patch_header.sh | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/patches/patch20151022-0/patch.sh b/patches/patch20151022-0/patch.sh
index 0f52979..7952afe 100755
--- a/patches/patch20151022-0/patch.sh
+++ b/patches/patch20151022-0/patch.sh
@@ -35,7 +35,7 @@ fi
check_version $OLD_VERSION
function addIdx {
- $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE $1 ADD COLUMN pidx TINYINT UNSIGNED NOT NULL DEFAULT 0;"
+ $MYSQL_CMD $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE $1 ADD COLUMN pidx TINYINT UNSIGNED NOT NULL DEFAULT 0;"
}
addIdx "reference_data"
diff --git a/patches/utils/patch_header.sh b/patches/utils/patch_header.sh
index 7cb477b..0a425b8 100644
--- a/patches/utils/patch_header.sh
+++ b/patches/utils/patch_header.sh
@@ -22,7 +22,6 @@
# ** end header
#
#header for patch scripts
-CMD_MYSQL=mysql
CMD_MYSQL_DUMP=mysqldump
USAGE="$1 [ --env=ENV_FILE ] [ --patch=PATCH ] [ --backupdir=BACKUPDIR ]\n\n"
CMD_OPTIONS=cat <<EOF
@@ -148,7 +147,7 @@ function uptodate {
# @param $1: db version string, e.g. v2.0.0
# @return: 0 on success, 1 on failure
function check_version {
- local version=$($CMD_MYSQL $MYSQL_CONNECTION -B -e "Select CaosDBVersion();")
+ local version=$($MYSQL_CMD $MYSQL_CONNECTION -B -e "Select CaosDBVersion();")
if [[ "$(echo $version | sed 's/^CaosDBVersion()\s//')" = "$1" ]]; then
return 0
fi
@@ -168,7 +167,7 @@ function dump_table {
function mysql_execute {
set +e
- $CMD_MYSQL $MYSQL_CONNECTION -e "$1"
+ $MYSQL_CMD $MYSQL_CONNECTION -e "$1"
ret=${PIPESTATUS[0]}
if [ "$ret" -ne 0 ]; then
failure "MYSQL ERROR"
@@ -177,6 +176,6 @@ function mysql_execute {
}
function redo_table {
- $CMD_MYSQL $MYSQL_CONNECTION < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
+ $MYSQL_CMD $MYSQL_CONNECTION < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
}
--
GitLab