From bee3f068bdfb12b1e95116761b2dd6d5974ac823 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 18 Feb 2026 06:51:31 +0000 Subject: [PATCH] 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 --- internal/sqltest/local/mysql.go | 12 ++++++------ internal/sqltest/local/postgres.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/sqltest/local/mysql.go b/internal/sqltest/local/mysql.go index 05733f6e8b..eee424d3ab 100644 --- a/internal/sqltest/local/mysql.go +++ b/internal/sqltest/local/mysql.go @@ -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") } } diff --git a/internal/sqltest/local/postgres.go b/internal/sqltest/local/postgres.go index 243a7133ab..88d856b86d 100644 --- a/internal/sqltest/local/postgres.go +++ b/internal/sqltest/local/postgres.go @@ -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") } }