From fa2ae243c70d729b926349ad22e9edbafd40c68d Mon Sep 17 00:00:00 2001 From: Kolbe Kegel Date: Fri, 31 Jan 2020 15:17:43 -0800 Subject: [PATCH 1/2] Fixed handling for a dbName that do not exist in the backup being restored --- cmd/restore.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/cmd/restore.go b/cmd/restore.go index eee65ba86..194ce8f68 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -2,6 +2,8 @@ package cmd import ( "context" + "fmt" + "os" "strings" "github.com/gogo/protobuf/proto" @@ -110,8 +112,13 @@ func runRestore(flagSet *flag.FlagSet, cmdName, dbName, tableName string) error } case len(dbName) != 0 && len(tableName) == 0: // database restore + fmt.Fprintf(os.Stderr, "dbName: %s\n", dbName) db := client.GetDatabase(dbName) - err = client.CreateDatabase(db.Schema) + if db == nil { + err = errors.Errorf("database %s not found in backup", dbName) + } else { + err = client.CreateDatabase(db.Schema) + } if err != nil { return errors.Trace(err) } @@ -122,7 +129,11 @@ func runRestore(flagSet *flag.FlagSet, cmdName, dbName, tableName string) error case len(dbName) != 0 && len(tableName) != 0: // table restore db := client.GetDatabase(dbName) - err = client.CreateDatabase(db.Schema) + if db == nil { + err = errors.Errorf("database %s not found in backup", dbName) + } else { + err = client.CreateDatabase(db.Schema) + } if err != nil { return errors.Trace(err) } From cd7f4f5def73db1ae3ca5d4eb797e392a4bca2fa Mon Sep 17 00:00:00 2001 From: Kolbe Kegel Date: Fri, 31 Jan 2020 17:21:53 -0800 Subject: [PATCH 2/2] Fixed handling for a dbName that do not exist in the backup being restored --- cmd/restore.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cmd/restore.go b/cmd/restore.go index 194ce8f68..4f66e47de 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -2,8 +2,6 @@ package cmd import ( "context" - "fmt" - "os" "strings" "github.com/gogo/protobuf/proto" @@ -112,13 +110,11 @@ func runRestore(flagSet *flag.FlagSet, cmdName, dbName, tableName string) error } case len(dbName) != 0 && len(tableName) == 0: // database restore - fmt.Fprintf(os.Stderr, "dbName: %s\n", dbName) db := client.GetDatabase(dbName) if db == nil { - err = errors.Errorf("database %s not found in backup", dbName) - } else { - err = client.CreateDatabase(db.Schema) + return errors.Errorf("database %s not found in backup", dbName) } + err = client.CreateDatabase(db.Schema) if err != nil { return errors.Trace(err) } @@ -130,10 +126,9 @@ func runRestore(flagSet *flag.FlagSet, cmdName, dbName, tableName string) error // table restore db := client.GetDatabase(dbName) if db == nil { - err = errors.Errorf("database %s not found in backup", dbName) - } else { - err = client.CreateDatabase(db.Schema) + return errors.Errorf("database %s not found in backup", dbName) } + err = client.CreateDatabase(db.Schema) if err != nil { return errors.Trace(err) }