Skip to content

Commit bee3f06

Browse files
committed
feat: prefer native database over Docker in sqltest/local
Change the database selection order in local/postgres.go and local/mysql.go to try native installations first and fall back to Docker, instead of the previous Docker-first ordering. This better suits environments where databases are installed natively (e.g., CI or remote development), avoiding unnecessary Docker overhead. https://claude.ai/code/session_01XbZNE4YfrtML4B6sLVf2E3
1 parent c048334 commit bee3f06

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

internal/sqltest/local/mysql.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func MySQL(t *testing.T, migrations []string) string {
2626

2727
dburi := os.Getenv("MYSQL_SERVER_URI")
2828
if dburi == "" {
29-
if ierr := docker.Installed(); ierr == nil {
30-
u, err := docker.StartMySQLServer(ctx)
29+
if ierr := native.Supported(); ierr == nil {
30+
u, err := native.StartMySQLServer(ctx)
3131
if err != nil {
3232
t.Fatal(err)
3333
}
3434
dburi = u
35-
} else if ierr := native.Supported(); ierr == nil {
36-
// Fall back to native installation when Docker is not available
37-
u, err := native.StartMySQLServer(ctx)
35+
} else if ierr := docker.Installed(); ierr == nil {
36+
// Fall back to Docker when native installation is not available
37+
u, err := docker.StartMySQLServer(ctx)
3838
if err != nil {
3939
t.Fatal(err)
4040
}
4141
dburi = u
4242
} else {
43-
t.Skip("MYSQL_SERVER_URI is empty and neither Docker nor native installation is available")
43+
t.Skip("MYSQL_SERVER_URI is empty and neither native installation nor Docker is available")
4444
}
4545
}
4646

internal/sqltest/local/postgres.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ func postgreSQL(t *testing.T, migrations []string, rw bool) string {
3636

3737
dburi := os.Getenv("POSTGRESQL_SERVER_URI")
3838
if dburi == "" {
39-
if ierr := docker.Installed(); ierr == nil {
40-
u, err := docker.StartPostgreSQLServer(ctx)
39+
if ierr := native.Supported(); ierr == nil {
40+
u, err := native.StartPostgreSQLServer(ctx)
4141
if err != nil {
4242
t.Fatal(err)
4343
}
4444
dburi = u
45-
} else if ierr := native.Supported(); ierr == nil {
46-
// Fall back to native installation when Docker is not available
47-
u, err := native.StartPostgreSQLServer(ctx)
45+
} else if ierr := docker.Installed(); ierr == nil {
46+
// Fall back to Docker when native installation is not available
47+
u, err := docker.StartPostgreSQLServer(ctx)
4848
if err != nil {
4949
t.Fatal(err)
5050
}
5151
dburi = u
5252
} else {
53-
t.Skip("POSTGRESQL_SERVER_URI is empty and neither Docker nor native installation is available")
53+
t.Skip("POSTGRESQL_SERVER_URI is empty and neither native installation nor Docker is available")
5454
}
5555
}
5656

0 commit comments

Comments
 (0)