Skip to content

Prioritize native database installations over Docker #4302

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

Open
kyleconroy wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −12
Open

Prioritize native database installations over Docker #4302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions internal/sqltest/local/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ func MySQL(t *testing.T, migrations []string) string {

dburi := os.Getenv("MYSQL_SERVER_URI")
if dburi == "" {
if ierr := docker.Installed(); ierr == nil {
u, err := docker.StartMySQLServer(ctx)
if ierr := native.Supported(); ierr == nil {
u, err := native.StartMySQLServer(ctx)
if err != nil {
t.Fatal(err)
}
dburi = u
} else if ierr := native.Supported(); ierr == nil {
// Fall back to native installation when Docker is not available
u, err := native.StartMySQLServer(ctx)
} else if ierr := docker.Installed(); ierr == nil {
// Fall back to Docker when native installation is not available
u, err := docker.StartMySQLServer(ctx)
if err != nil {
t.Fatal(err)
}
dburi = u
} else {
t.Skip("MYSQL_SERVER_URI is empty and neither Docker nor native installation is available")
t.Skip("MYSQL_SERVER_URI is empty and neither native installation nor Docker is available")
}
}

Expand Down
12 changes: 6 additions & 6 deletions internal/sqltest/local/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ func postgreSQL(t *testing.T, migrations []string, rw bool) string {

dburi := os.Getenv("POSTGRESQL_SERVER_URI")
if dburi == "" {
if ierr := docker.Installed(); ierr == nil {
u, err := docker.StartPostgreSQLServer(ctx)
if ierr := native.Supported(); ierr == nil {
u, err := native.StartPostgreSQLServer(ctx)
if err != nil {
t.Fatal(err)
}
dburi = u
} else if ierr := native.Supported(); ierr == nil {
// Fall back to native installation when Docker is not available
u, err := native.StartPostgreSQLServer(ctx)
} else if ierr := docker.Installed(); ierr == nil {
// Fall back to Docker when native installation is not available
u, err := docker.StartPostgreSQLServer(ctx)
if err != nil {
t.Fatal(err)
}
dburi = u
} else {
t.Skip("POSTGRESQL_SERVER_URI is empty and neither Docker nor native installation is available")
t.Skip("POSTGRESQL_SERVER_URI is empty and neither native installation nor Docker is available")
}
}

Expand Down
Loading