codgen: Include serialized codegen options (#1890)

* codgen: Include serialized codegen options

These options were already included, but not in a way that made them
easy to use. We could also pass in a pointer to the existing setting
document, but I think this is cleaner

* Fix tests

* Fix tests (again)

Author: kyleconroy

Makefile

@@ -17,7 +17,7 @@ build-endtoend:
 
 test-ci: test-examples build-endtoend
 
-regen: sqlc-dev
+regen: sqlc-dev sqlc-gen-json
 	go run ./scripts/regenerate/
 
 sqlc-dev:
@@ -26,6 +26,9 @@ sqlc-dev:
 sqlc-pg-gen:
 	go build -o ~/bin/sqlc-pg-gen ./internal/tools/sqlc-pg-gen
 
+sqlc-gen-json:
+	go build -o ~/bin/sqlc-gen-json ./cmd/sqlc-gen-json
+
 start:
 	docker-compose up -d
 

internal/cmd/generate.go

@@ -17,6 +17,7 @@ import (
 	"github.com/kyleconroy/sqlc/internal/codegen/python"
 	"github.com/kyleconroy/sqlc/internal/compiler"
 	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/kyleconroy/sqlc/internal/config/convert"
 	"github.com/kyleconroy/sqlc/internal/debug"
 	"github.com/kyleconroy/sqlc/internal/ext"
 	"github.com/kyleconroy/sqlc/internal/ext/process"
@@ -295,6 +296,7 @@ func codegen(ctx context.Context, combo config.CombinedSettings, sql outPair, re
 	if debug.Traced {
 		region = trace.StartRegion(ctx, "codegen")
 	}
+	req := codeGenRequest(result, combo)
 	var handler ext.Handler
 	var out string
 	switch {
@@ -335,10 +337,16 @@ func codegen(ctx context.Context, combo config.CombinedSettings, sql outPair, re
 			return "", nil, fmt.Errorf("unsupported plugin type")
 		}
 
+		opts, err := convert.YAMLtoJSON(sql.Plugin.Options)
+		if err != nil {
+			return "", nil, fmt.Errorf("invalid plugin options")
+		}
+		req.PluginOptions = opts
+
 	default:
 		return "", nil, fmt.Errorf("missing language backend")
 	}
-	resp, err := handler.Generate(ctx, codeGenRequest(result, combo))
+	resp, err := handler.Generate(ctx, req)
 	if region != nil {
 		region.End()
 	}

internal/endtoend/testdata/codegen_json/gen/codegen.json

@@ -49697,5 +49697,6 @@
       "insert_into_table": null
     }
   ],
-  "sqlc_version": "v1.15.0"
+  "sqlc_version": "v1.15.0",
+  "plugin_options": ""
 }

internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json

@@ -49697,5 +49697,6 @@
       "insert_into_table": null
     }
   ],
-  "sqlc_version": "v1.15.0"
+  "sqlc_version": "v1.15.0",
+  "plugin_options": "eyJmaWxlbmFtZSI6ImNvZGVnZW4uanNvbiIsImluZGVudCI6IiAgIn0="
 }

internal/plugin/codegen.pb.go

@@ -208,6 +208,7 @@ message CodeGenRequest
   Catalog catalog = 2 [json_name="catalog"];
   repeated Query queries = 3 [json_name="queries"];
   string sqlc_version = 4 [json_name="sqlc_version"];
+  bytes plugin_options = 5 [json_name="plugin_options"];
 }
 
 message CodeGenResponse