From b084e3673b6200bd72b4aa75acd625a18e02c988 Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 27 Jun 2023 14:26:23 +0200 Subject: [PATCH] internal/dis/component/sql: Fix backup for mariadb --- internal/dis/component/sql/backup.go | 2 +- internal/dis/component/sql/snapshot.go | 2 +- internal/dis/component/sql/sql.go | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/dis/component/sql/backup.go b/internal/dis/component/sql/backup.go index ad341d8..d3b9257 100644 --- a/internal/dis/component/sql/backup.go +++ b/internal/dis/component/sql/backup.go @@ -18,7 +18,7 @@ func (*SQL) BackupName() string { // Backup makes a backup of all SQL databases into the path dest. func (sql *SQL) Backup(scontext *component.StagingContext) error { return scontext.AddFile("", func(ctx context.Context, file io.Writer) error { - code := sql.Stack().Exec(ctx, stream.NewIOStream(file, scontext.Progress(), nil, 0), "sql", "mysqldump", "--all-databases")() + code := sql.Stack().Exec(ctx, stream.NewIOStream(file, scontext.Progress(), nil, 0), "sql", SQlDumpExecutable, "--all-databases")() if code != 0 { return errSQLBackup } diff --git a/internal/dis/component/sql/snapshot.go b/internal/dis/component/sql/snapshot.go index 6550562..97db745 100644 --- a/internal/dis/component/sql/snapshot.go +++ b/internal/dis/component/sql/snapshot.go @@ -23,7 +23,7 @@ func (sql *SQL) Snapshot(wisski models.Instance, scontext *component.StagingCont // SnapshotDB makes a backup of the sql database into dest. func (sql *SQL) SnapshotDB(ctx context.Context, progress io.Writer, dest io.Writer, database string) error { - code := sql.Stack().Exec(ctx, stream.NewIOStream(dest, progress, nil, 0), "sql", "mysqldump", "--databases", database)() + code := sql.Stack().Exec(ctx, stream.NewIOStream(dest, progress, nil, 0), "sql", SQlDumpExecutable, "--databases", database)() if code != 0 { return errSQLBackup } diff --git a/internal/dis/component/sql/sql.go b/internal/dis/component/sql/sql.go index 5f3400c..031e4bd 100644 --- a/internal/dis/component/sql/sql.go +++ b/internal/dis/component/sql/sql.go @@ -58,3 +58,11 @@ func (sql *SQL) Stack() component.StackWithResources { }, }) } + +const ( + // "mysql"-compatible executable for raw sql queries + SQLQueryExecutable = "mariadb" + + // "mysqldump"-compatible executable for dumping an entire database + SQlDumpExecutable = "mariadb-dump" +)