From 4791731a082c733a03877639f4a177e30923b179 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 19 Jul 2019 10:24:01 +0000 Subject: [PATCH] Bug 23346: Add without-db-name parameter to koha-dump Test plan: Run koha-dump [yourdb]. Rename the files in var/spool/koha/[yourdb] Run koha-dump --without-db-name [yourdb] Run a diff between the unzipped sql files. The last dump should not contain a CREATE DATABASE and USE statement. See BZ 15664 c4. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall --- debian/scripts/koha-dump | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/scripts/koha-dump b/debian/scripts/koha-dump index 3749472127..707a8dfe05 100755 --- a/debian/scripts/koha-dump +++ b/debian/scripts/koha-dump @@ -47,6 +47,7 @@ $scriptname -h|--help --quiet|-q Make the script avoid printing to STDOUT (useful for calling from another scripts). --help|-h Display this help message + --without-db-name Do not include database name EOF } @@ -69,7 +70,9 @@ dump_instance() [ -z "$backupdir" ] && backupdir="/var/spool/koha/$name" dbdump="$backupdir/$name-$date.sql.gz" [ "$quiet" = "no" ] && echo "* DB to $dbdump" - mysqldump --databases --host="$mysqlhost" \ + dbflag="--databases" + [ "$without_db_name" = "yes" ] && dbflag="" + mysqldump $dbflag --host="$mysqlhost" \ --user="$mysqluser" --password="$mysqlpass" "$mysqldb" | gzip > "$dbdump" chown "root:$name-koha" "$dbdump" @@ -99,6 +102,7 @@ dump_instance() # Default values quiet="no" exclude_indexes="no" +without_db_name="no" while [ $# -gt 0 ]; do @@ -106,6 +110,9 @@ while [ $# -gt 0 ]; do --exclude-indexes) exclude_indexes="yes" shift ;; + --without-db-name) + without_db_name="yes" + shift ;; -h|--help) usage ; exit 0 ;; -q|--quiet) -- 2.20.1 (Apple Git-117)