From 692b78e496d7b2ee5ea1b2a0de3fbf3ce379b41c Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Wed, 28 Jul 2021 14:01:25 +0000 Subject: [PATCH] Bug 28749: Restore the database name to Koha dumps The line to use the --databases flag with mysqldump by default was accidentally removed from koha-dump when the --schema-only option was added. This makes all backups act as if koha-dump is called with the --without-db-name flag, causing koha-restore to fail to restore the database because it's neither CREATEd or USEd. This patch restores that line To test: 1 - sudo debian/scripts/koha-dump kohadev 2 - zcat /var/spool/koha/kohadev/kohadev-2021-07-28.sql.gz | grep DATABASE 3 - Notice no output 4 - Apply patch 5 - sudo debian/scripts/koha-dump kohadev 6 - zcat /var/spool/koha/kohadev/kohadev-2021-07-28.sql.gz | grep DATABASE 7 - You get the line: CREATE DATABASE /*!32312 IF NOT EXISTS*/ `koha_kohadev` /*!40100 DEFAULT CHARACTER SET latin1 */; Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- debian/scripts/koha-dump | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/scripts/koha-dump b/debian/scripts/koha-dump index b7a6061c65..f3a6b5aed7 100755 --- a/debian/scripts/koha-dump +++ b/debian/scripts/koha-dump @@ -73,6 +73,7 @@ dump_instance() backupdir="$( xmlstarlet sel -t -v 'yazgfs/config/backupdir' $kohaconfig || true )" [ -z "$backupdir" ] && backupdir="/var/spool/koha/$name" dbdump="$backupdir/$name-$date.sql.gz" + dbflag="--databases" [ "$without_db_name" = "yes" ] && dbflag="" if [ "$schema_only" = "yes" ] then -- 2.39.2