From 7e0e0a50e490dcd56af55bf71cc210ba0f40b6e8 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 8 Dec 2023 09:33:52 -0800 Subject: [PATCH] build(sqlite): Disable modernc for WASM --- internal/cmd/vet.go | 1 - internal/cmd/vet_modernc.go | 7 +++++++ internal/sqltest/sqlite.go | 2 -- internal/sqltest/sqlite_modernc.go | 7 +++++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 internal/cmd/vet_modernc.go create mode 100644 internal/sqltest/sqlite_modernc.go diff --git a/internal/cmd/vet.go b/internal/cmd/vet.go index 52cd4b6f8a..5de23394d7 100644 --- a/internal/cmd/vet.go +++ b/internal/cmd/vet.go @@ -20,7 +20,6 @@ import ( "github.com/jackc/pgx/v5" "github.com/spf13/cobra" "google.golang.org/protobuf/encoding/protojson" - _ "modernc.org/sqlite" "github.com/sqlc-dev/sqlc/internal/config" "github.com/sqlc-dev/sqlc/internal/debug" diff --git a/internal/cmd/vet_modernc.go b/internal/cmd/vet_modernc.go new file mode 100644 index 0000000000..74313007af --- /dev/null +++ b/internal/cmd/vet_modernc.go @@ -0,0 +1,7 @@ +//go:build !wasm + +package cmd + +import ( + _ "modernc.org/sqlite" +) diff --git a/internal/sqltest/sqlite.go b/internal/sqltest/sqlite.go index 3a02a3cf1b..72a154d0e1 100644 --- a/internal/sqltest/sqlite.go +++ b/internal/sqltest/sqlite.go @@ -7,8 +7,6 @@ import ( "testing" "github.com/sqlc-dev/sqlc/internal/sql/sqlpath" - - _ "modernc.org/sqlite" ) func SQLite(t *testing.T, migrations []string) (*sql.DB, func()) { diff --git a/internal/sqltest/sqlite_modernc.go b/internal/sqltest/sqlite_modernc.go new file mode 100644 index 0000000000..708ea40e49 --- /dev/null +++ b/internal/sqltest/sqlite_modernc.go @@ -0,0 +1,7 @@ +//go:build !wasm + +package sqltest + +import ( + _ "modernc.org/sqlite" +)