Skip to content

Commit 8d38845

Browse files
committed
RHINENG-20867: fix pg_dump restrict key failure
1 parent 606529f commit 8d38845

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

database_admin/schema_test.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ import (
1818
_ "github.com/golang-migrate/migrate/v4/source/file"
1919
)
2020

21-
func setCmdAuth(cmd *exec.Cmd) {
21+
func dumpSchema() ([]byte, error) {
22+
cmd := exec.Command("pg_dump", "--restrict-key", "testupgradekey", "-O")
2223
cmd.Args = append(cmd.Args,
2324
"-h", utils.FailIfEmpty(utils.CoreCfg.DBHost, "DB_HOST"),
2425
"-p", strconv.Itoa(utils.CoreCfg.DBPort),
2526
"-U", utils.FailIfEmpty(utils.CoreCfg.DBUser, "DB_USER"),
2627
"-d", utils.FailIfEmpty(utils.CoreCfg.DBName, "DB_NAME"))
2728
cmd.Env = append(cmd.Env, fmt.Sprintf("PGPASSWORD=%v", utils.FailIfEmpty(utils.CoreCfg.DBPassword, "DB_PASSWD")))
29+
return cmd.Output()
2830
}
2931

3032
func writeTemp(dir, filename string, data []byte) {
@@ -63,22 +65,15 @@ func TestSchemaCompatiblity(t *testing.T) {
6365
err = m.Up()
6466
assert.NoError(t, err)
6567

66-
dumpCmd := exec.Command("pg_dump", "-O")
67-
setCmdAuth(dumpCmd)
68-
69-
migrated, err := dumpCmd.Output()
68+
migrated, err := dumpSchema()
7069
assert.NoError(t, err)
7170
err = m.Drop()
7271
assert.NoError(t, err)
7372

7473
err = database.ExecFile("./schema/create_schema.sql")
7574

7675
assert.NoError(t, err)
77-
78-
dumpCmd = exec.Command("pg_dump", "-O")
79-
setCmdAuth(dumpCmd)
80-
81-
fromScratch, err := dumpCmd.Output()
76+
fromScratch, err := dumpSchema()
8277
assert.NoError(t, err)
8378

8479
migratedLines := strings.SplitAfter(string(migrated), "\n")

0 commit comments

Comments
 (0)