Merge branch 'restore-dbname' into 'master'

agneum · agneum · commit a462349e8017 · 2021-02-20T10:41:15.000Z
fix: use the default database name in the pg_restore command

See merge request postgres-ai/database-lab!268
diff --git a/pkg/retrieval/engine/postgres/logical/dump.go b/pkg/retrieval/engine/postgres/logical/dump.go
@@ -432,7 +432,7 @@ func (d *DumpJob) buildLogicalDumpCommand() []string {
 }
 
 func (d *DumpJob) buildLogicalRestoreCommand() []string {
-	restoreCmd := []string{"|", "pg_restore", "--username", d.globalCfg.Database.User(), "--create", "--dbname", d.globalCfg.Database.Name(),
+	restoreCmd := []string{"|", "pg_restore", "--username", d.globalCfg.Database.User(), "--create", "--dbname", defaults.DBName,
 		"--no-privileges", "--no-owner"}
 
 	if d.Restore.ForceInit {
diff --git a/pkg/retrieval/engine/postgres/logical/restore.go b/pkg/retrieval/engine/postgres/logical/restore.go
@@ -25,6 +25,7 @@ import (
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/dbmarker"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/cont"
+	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/defaults"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/engine/postgres/tools/health"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/retrieval/options"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
@@ -297,7 +298,7 @@ func (r *RestoreJob) updateDataStateAt() {
 }
 
 func (r *RestoreJob) buildLogicalRestoreCommand() []string {
-	restoreCmd := []string{"pg_restore", "--username", r.globalCfg.Database.User(), "--dbname", r.globalCfg.Database.Name(), "--create",
+	restoreCmd := []string{"pg_restore", "--username", r.globalCfg.Database.User(), "--dbname", defaults.DBName, "--create",
 		"--no-privileges", "--no-owner"}
 
 	if r.ForceInit {
diff --git a/pkg/retrieval/engine/postgres/logical/restore_test.go b/pkg/retrieval/engine/postgres/logical/restore_test.go
@@ -33,14 +33,14 @@ func TestRestoreCommandBuilding(t *testing.T) {
 				ForceInit:    false,
 				DumpLocation: "/tmp/db.dump",
 			},
-			Command: []string{"pg_restore", "--username", "john", "--dbname", "testdb", "--create", "--no-privileges", "--no-owner", "--jobs", "1", "/tmp/db.dump"},
+			Command: []string{"pg_restore", "--username", "john", "--dbname", "postgres", "--create", "--no-privileges", "--no-owner", "--jobs", "1", "/tmp/db.dump"},
 		},
 		{
 			CopyOptions: RestoreOptions{
 				ParallelJobs: 4,
 				ForceInit:    true,
 			},
-			Command: []string{"pg_restore", "--username", "john", "--dbname", "testdb", "--create", "--no-privileges", "--no-owner", "--clean", "--if-exists", "--jobs", "4", ""},
+			Command: []string{"pg_restore", "--username", "john", "--dbname", "postgres", "--create", "--no-privileges", "--no-owner", "--clean", "--if-exists", "--jobs", "4", ""},
 		},
 		{
 			CopyOptions: RestoreOptions{
@@ -49,7 +49,7 @@ func TestRestoreCommandBuilding(t *testing.T) {
 				Partial:      Partial{Tables: []string{"test", "users"}},
 				DumpLocation: "/tmp/db.dump",
 			},
-			Command: []string{"pg_restore", "--username", "john", "--dbname", "testdb", "--create", "--no-privileges", "--no-owner", "--jobs", "1", "--table", "test", "--table", "users", "/tmp/db.dump"},
+			Command: []string{"pg_restore", "--username", "john", "--dbname", "postgres", "--create", "--no-privileges", "--no-owner", "--jobs", "1", "--table", "test", "--table", "users", "/tmp/db.dump"},
 		},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ func (d *DumpJob) buildLogicalDumpCommand() []string {`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`func (d *DumpJob) buildLogicalRestoreCommand() []string {`
`435`		`- restoreCmd := []string{"\|", "pg_restore", "--username", d.globalCfg.Database.User(), "--create", "--dbname", d.globalCfg.Database.Name(),`
	`435`	`+ restoreCmd := []string{"\|", "pg_restore", "--username", d.globalCfg.Database.User(), "--create", "--dbname", defaults.DBName,`
`436`	`436`	`"--no-privileges", "--no-owner"}`
`437`	`437`
`438`	`438`	`if d.Restore.ForceInit {`