put WASM plugins behind a build tag

sqlc-dev · Apr 23, 2022 · 2406639 · 2406639
1 parent a8bcb34
commit 2406639
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 185 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /.idea/
 __pycache__
-cache
diff --git a/Makefile b/Makefile
@@ -54,18 +54,3 @@ internal/python/ast/ast.pb.go: protos/python/ast.proto
 		--go_out=. \
 		--go_opt=module=github.com/kyleconroy/sqlc \
 		./protos/python/ast.proto
-
-wasm: cache/sqlc-codegen-python.wasm cache/sqlc-codegen-go.wasm cache/sqlc-codegen-kotlin.wasm
-
-cache/sqlc-codegen-python.wasm: cmd/sqlc-codegen-python/main.go
-	cd cmd/sqlc-codegen-python && tinygo build -o ../../cache/sqlc-codegen-python.wasm -gc=leaking -scheduler=none -wasm-abi=generic -target=wasi
-
-cache/sqlc-codegen-kotlin.wasm: cmd/sqlc-codegen-kotlin/main.go
-	cd cmd/sqlc-codegen-kotlin && tinygo build -o ../../cache/sqlc-codegen-kotlin.wasm -gc=leaking -wasm-abi=generic -target=wasi
-
-cache/sqlc-codegen-go.wasm: cmd/sqlc-codegen-go/main.go
-	cd cmd/sqlc-codegen-go && tinygo build -o ../../cache/sqlc-codegen-go.wasm -gc=leaking -wasm-abi=generic -target=wasi
-
-
-
-
diff --git a/cmd/sqlc-codegen-go/main.go b/cmd/sqlc-codegen-go/main.go
diff --git a/cmd/sqlc-codegen-kotlin/main.go b/cmd/sqlc-codegen-kotlin/main.go
diff --git a/cmd/sqlc-codegen-python/main.go b/cmd/sqlc-codegen-python/main.go
diff --git a/examples/wasm/gen/python/models.py b/examples/wasm/gen/python/models.py
diff --git a/examples/wasm/gen/python/query.py b/examples/wasm/gen/python/query.py
diff --git a/examples/wasm/sqlc.json b/examples/wasm/sqlc.json
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220209173558-ad29539cd2e9
-	github.com/bytecodealliance/wasmtime-go v0.34.0
+	github.com/bytecodealliance/wasmtime-go v0.35.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/google/go-cmp v0.5.7

diff --git a/go.sum b/go.sum
@@ -7,6 +7,8 @@ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLj
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/bytecodealliance/wasmtime-go v0.34.0 h1:PaWS0DUusaXaU3aNoSYjag6WmuxjyPYBHgkrC4EXips=
 github.com/bytecodealliance/wasmtime-go v0.34.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI=
+github.com/bytecodealliance/wasmtime-go v0.35.0 h1:VZjaZ0XOY0qp9TQfh0CQj9zl/AbdeXePVTALy8V1sKs=
+github.com/bytecodealliance/wasmtime-go v0.35.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=

diff --git a/internal/codegen/wasm/nowasm.go b/internal/codegen/wasm/nowasm.go
@@ -0,0 +1,13 @@
+//go:build !wasmtime
+
+package wasm
+
+import (
+	"fmt"
+
+	"github.com/kyleconroy/sqlc/internal/plugin"
+)
+
+func Generate(req *plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {
+	return nil, fmt.Errorf("sqlc built without wasmtime support")
+}
diff --git a/internal/codegen/wasm/wasm.go b/internal/codegen/wasm/wasm.go
@@ -1,3 +1,5 @@
+//go:build wasmtime
+
 package wasm
 
 import (