Merge remote-tracking branch 'upstream/main'

.github/workflows/ci.yml

@@ -12,8 +12,16 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-go@v5
  with:
- go-version: '1.21.0'
+ go-version: '1.21'
+ # - run: go install github.com/sqlc-dev/sqlc/cmd/sqlc@main
+ - uses: sqlc-dev/setup-sqlc@v4
+ with:
+ sqlc-version: '1.25.0'
  - run: make
+ - run: make test
+ - run: sqlc diff
+ working-directory: examples
+
  - uses: actions/upload-artifact@v3
  with:
  name: sqlc-gen-python

.gitignore

@@ -1 +1,8 @@
-*.wasm
+bin
+*.wasm
+
+# Devenv
+.envrc
+.direnv
+.devenv*
+devenv.local.nix

internal/gen.go

@@ -1136,7 +1136,7 @@ func HashComment(s string) string{
  return "# " + strings.ReplaceAll(s, "\n", "\n# ")
 }
 
-func Generate(_ context.Context, req *plugin.CodeGenRequest) (*plugin.CodeGenResponse, error){
+func Generate(_ context.Context, req *plugin.GenerateRequest) (*plugin.GenerateResponse, error){
  // Setup our defaults for our Config struct and parse our config file
  defaultModelsFileName := "models.py"
  conf := Config{
@@ -1209,7 +1209,7 @@ func Generate(_ context.Context, req *plugin.CodeGenRequest) (*plugin.CodeGenRes
  }
 
  // Finally we send our outputs back to SQLC
- resp := plugin.CodeGenResponse{}
+ resp := plugin.GenerateResponse{}
 
  for filename, code := range output{
  resp.Files = append(resp.Files, &plugin.File{