Skip to content

fix: Allow dumping db with pg_dump, utilize make cache #4964

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
merged 2 commits into from
Nov 10, 2022
Merged

fix: Allow dumping db with pg_dump, utilize make cache #4964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8bded4
fix: Allow dumping database without docker using pg_dump binary
mafredri Nov 9, 2022
ac3e1f3
fix: Utilize make cache for dumping database
mafredri Nov 9, 2022
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
39 changes: 32 additions & 7 deletions coderd/database/gen/dump/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ import (
"os/exec"
"path/filepath"
"runtime"
"strconv"
"strings"

"github.com/coder/coder/coderd/database/migrations"
"github.com/coder/coder/coderd/database/postgres"
)

const minimumPostgreSQLVersion = 13

func main() {
connection, closeFn, err := postgres.Open()
if err != nil {
Expand All @@ -30,12 +34,23 @@ func main() {
panic(err)
}

cmd := exec.Command(
"docker",
"run",
"--rm",
"--network=host",
"postgres:13",
hasPGDump := false
if _, err = exec.LookPath("pg_dump"); err == nil {
out, err := exec.Command("pg_dump", "--version").Output()
if err == nil {
// Parse output:
// pg_dump (PostgreSQL) 14.5 (Ubuntu 14.5-0ubuntu0.22.04.1)
parts := strings.Split(string(out), " ")
if len(parts) > 2 {
version, err := strconv.Atoi(strings.Split(parts[2], ".")[0])
if err == nil && version >= minimumPostgreSQLVersion {
hasPGDump = true
}
}
}
}

cmdArgs := []string{
"pg_dump",
"--schema-only",
connection,
Expand All @@ -45,8 +60,18 @@ func main() {
// We never want to manually generate
// queries executing against this table.
"--exclude-table=schema_migrations",
)
}

if !hasPGDump {
cmdArgs = append([]string{
"docker",
"run",
"--rm",
"--network=host",
fmt.Sprintf("postgres:%d", minimumPostgreSQLVersion),
}, cmdArgs...)
}
cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //#nosec
cmd.Env = append(os.Environ(), []string{
"PGTZ=UTC",
"PGCLIENTENCODING=UTF8",
Expand Down
6 changes: 4 additions & 2 deletions coderd/database/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
(
cd "$SCRIPT_DIR"

# Dump the updated schema.
go run gen/dump/main.go
echo generate 1>&2

# Dump the updated schema (use make to utilize caching).
make -C ../.. --no-print-directory coderd/database/dump.sql
# The logic below depends on the exact version being correct :(
go run github.com/kyleconroy/sqlc/cmd/sqlc@v1.13.0 generate

Expand Down