Fixed handling for a dbName that do not exist in the backup being res…

…tored (#148) * Fixed handling for a dbName that do not exist in the backup being restored * Fixed handling for a dbName that do not exist in the backup being restored
pingcap · Feb 1, 2020 · 3863a3a · 3863a3a
1 parent 0a43d2a
commit 3863a3a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/cmd/restore.go b/cmd/restore.go
@@ -111,6 +111,9 @@ func runRestore(flagSet *flag.FlagSet, cmdName, dbName, tableName string) error
 	case len(dbName) != 0 && len(tableName) == 0:
 		// database restore
 		db := client.GetDatabase(dbName)
+		if db == nil {
+			return errors.Errorf("database %s not found in backup", dbName)
+		}
 		err = client.CreateDatabase(db.Schema)
 		if err != nil {
 			return errors.Trace(err)
@@ -122,6 +125,9 @@ func runRestore(flagSet *flag.FlagSet, cmdName, dbName, tableName string) error
 	case len(dbName) != 0 && len(tableName) != 0:
 		// table restore
 		db := client.GetDatabase(dbName)
+		if db == nil {
+			return errors.Errorf("database %s not found in backup", dbName)
+		}
 		err = client.CreateDatabase(db.Schema)
 		if err != nil {
 			return errors.Trace(err)