Add nowasm tag, fix nowasm inconsistency (#1772)

angaz · web-flow · commit 6dd9b0e58254 · 2022-08-07T10:00:46.000-07:00
diff --git a/internal/ext/wasm/nowasm.go b/internal/ext/wasm/nowasm.go
@@ -1,16 +1,19 @@
-//go:build !(cgo && ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)))
+//go:build nowasm || !(cgo && ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)))
 
 package wasm
 
 import (
 	"fmt"
+    "context"
 
 	"github.com/kyleconroy/sqlc/internal/plugin"
 )
 
 type Runner struct {
+	URL    string
+	SHA256 string
 }
 
-func (r *Runner) Generate(req *plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {
+func (r *Runner) Generate(ctx context.Context, req *plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {
 	return nil, fmt.Errorf("sqlc built without wasmtime support")
 }
diff --git a/internal/ext/wasm/wasm.go b/internal/ext/wasm/wasm.go
@@ -1,4 +1,4 @@
-//go:build cgo && ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64))
+//go:build !nowasm && cgo && ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64))
 
 // The above build constraint is based of the cgo directives in this file:
 // https://github.com/bytecodealliance/wasmtime-go/blob/main/ffi.go

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,19 @@`
`1`		`-//go:build !(cgo && ((linux && amd64) \|\| (linux && arm64) \|\| (darwin && amd64) \|\| (darwin && arm64) \|\| (windows && amd64)))`
	`1`	`+//go:build nowasm \|\| !(cgo && ((linux && amd64) \|\| (linux && arm64) \|\| (darwin && amd64) \|\| (darwin && arm64) \|\| (windows && amd64)))`
`2`	`2`
`3`	`3`	`package wasm`
`4`	`4`
`5`	`5`	`import (`
`6`	`6`	`"fmt"`
	`7`	`+ "context"`
`7`	`8`
`8`	`9`	`"github.com/kyleconroy/sqlc/internal/plugin"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`type Runner struct {`
	`13`	`+ URL string`
	`14`	`+ SHA256 string`
`12`	`15`	`}`
`13`	`16`
`14`		`-func (r Runner) Generate(req plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {`
	`17`	`+func (r Runner) Generate(ctx context.Context, req plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {`
`15`	`18`	`return nil, fmt.Errorf("sqlc built without wasmtime support")`
`16`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build cgo && ((linux && amd64) \|\| (linux && arm64) \|\| (darwin && amd64) \|\| (darwin && arm64) \|\| (windows && amd64))`
	`1`	`+//go:build !nowasm && cgo && ((linux && amd64) \|\| (linux && arm64) \|\| (darwin && amd64) \|\| (darwin && arm64) \|\| (windows && amd64))`
`2`	`2`
`3`	`3`	`// The above build constraint is based of the cgo directives in this file:`
`4`	`4`	`// https://github.com/bytecodealliance/wasmtime-go/blob/main/ffi.go`