Skip to content

test(endtoend): Use Docker to start database servers #4076

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 10 commits into from
Aug 25, 2025
Merged

test(endtoend): Use Docker to start database servers #4076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c558997
test(endtoend): Use Docker to start database servers
kyleconroy Aug 25, 2025
0abcc96
Pull separately
kyleconroy Aug 25, 2025
768369f
sync.Do
kyleconroy Aug 25, 2025
a4893b1
Use the new Docker package
kyleconroy Aug 25, 2025
9bdaf61
Be paranoid about concurrency
kyleconroy Aug 25, 2025
f69c738
Test if things work on Windows and macOS
kyleconroy Aug 25, 2025
2c69f10
don't run tests on windows
kyleconroy Aug 25, 2025
153be0d
Only run tests on Linux
kyleconroy Aug 25, 2025
76bd585
Add a build workflow
kyleconroy Aug 25, 2025
5ded7d9
Split out build and test
kyleconroy Aug 25, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use the new Docker package
  • Loading branch information
@kyleconroy
kyleconroy committed Aug 25, 2025
commit a4893b19c6cff0725dd20f42de05235cf701860b
15 changes: 10 additions & 5 deletions internal/sqltest/local/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,27 @@ import (

migrate "github.com/sqlc-dev/sqlc/internal/migrations"
"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
"github.com/sqlc-dev/sqlc/internal/sqltest/docker"
)

var mysqlSync sync.Once
var mysqlPool *sql.DB

func MySQLServer() string {
return os.Getenv("MYSQL_SERVER_URI")
}

func MySQL(t *testing.T, migrations []string) string {
ctx := context.Background()
t.Helper()

dburi := os.Getenv("MYSQL_SERVER_URI")
if dburi == "" {
t.Skip("MYSQL_SERVER_URI is empty")
if ierr := docker.Installed(); ierr == nil {
u, err := docker.StartMySQLServer(ctx)
if err != nil {
t.Fatal(err)
}
dburi = u
} else {
t.Skip("MYSQL_SERVER_URI is empty")
}
}

mysqlSync.Do(func() {
Expand Down
15 changes: 10 additions & 5 deletions internal/sqltest/local/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
migrate "github.com/sqlc-dev/sqlc/internal/migrations"
"github.com/sqlc-dev/sqlc/internal/pgx/poolcache"
"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
"github.com/sqlc-dev/sqlc/internal/sqltest/docker"
)

var flight singleflight.Group
Expand All @@ -28,17 +29,21 @@ func ReadOnlyPostgreSQL(t *testing.T, migrations []string) string {
return postgreSQL(t, migrations, false)
}

func PostgreSQLServer() string {
return os.Getenv("POSTGRESQL_SERVER_URI")
}

func postgreSQL(t *testing.T, migrations []string, rw bool) string {
ctx := context.Background()
t.Helper()

dburi := os.Getenv("POSTGRESQL_SERVER_URI")
if dburi == "" {
t.Skip("POSTGRESQL_SERVER_URI is empty")
if ierr := docker.Installed(); ierr == nil {
u, err := docker.StartPostgreSQLServer(ctx)
if err != nil {
t.Fatal(err)
}
dburi = u
} else {
t.Skip("POSTGRESQL_SERVER_URI is empty")
}
}

postgresPool, err := cache.Open(ctx, dburi)
Expand Down
Loading