Skip to content

Quick fix for restore of backups made by dump fails silently #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deitch merged 1 commit into from
Feb 5, 2025
Merged

Quick fix for restore of backups made by dump fails silently #402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pkg/database/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ import (
"regexp"
)

const (
// used to define default max buffer size Scanner, counter part of dump
defaultMaxAllowedPacket = 4194304
)

var (
useRegex = regexp.MustCompile(`(?i)^(USE\s*` + "`" + `)([^\s]+)(` + "`" + `\s*;)$`)
createRegex = regexp.MustCompile(`(?i)^(CREATE\s+DATABASE\s*(\/\*.*\*\/\s*)?` + "`" + `)([^\s]+)(` + "`" + `\s*(\s*\/\*.*\*\/\s*)?\s*;$)`)
Expand All @@ -27,7 +32,10 @@ func Restore(ctx context.Context, dbconn Connection, databasesMap map[string]str
if err != nil {
return fmt.Errorf("failed to restore database: %w", err)
}
scanBuf := []byte{}
scanner := bufio.NewScanner(r)
// increase the buffer size
scanner.Buffer(scanBuf, defaultMaxAllowedPacket) //TODO should be a configurable option like with dump
var current string
for scanner.Scan() {
line := scanner.Text()
Expand Down Expand Up @@ -58,6 +66,9 @@ func Restore(ctx context.Context, dbconn Connection, databasesMap map[string]str
}
current = ""
}
if err := scanner.Err(); err != nil {
return fmt.Errorf("failed to restore database: %w", err)
}
if err := tx.Commit(); err != nil {
return fmt.Errorf("failed to restore database: %w", err)
}
Expand Down