put json plugin settings in PluginOptions

internal/cmd/generate.go

@@ -413,7 +413,7 @@ func codegen(ctx context.Context, combo config.CombinedSettings, sql outPair, re
 		if err != nil {
 			return "", nil, fmt.Errorf("opts marshal failed: %w", err)
 		}
-		req.Settings.Codegen.Options = opts
+		req.PluginOptions = opts
 
 	default:
 		return "", nil, fmt.Errorf("missing language backend")

internal/codegen/json/gen.go

@@ -12,21 +12,17 @@ import (
 )
 
 func parseOptions(req *plugin.CodeGenRequest) (*opts, error) {
-	if req.Settings == nil {
+	if len(req.PluginOptions) == 0 {
 		return new(opts), nil
 	}
-	if req.Settings.Codegen != nil {
-		if len(req.Settings.Codegen.Options) != 0 {
-			var options *opts
-			dec := ejson.NewDecoder(bytes.NewReader(req.Settings.Codegen.Options))
-			dec.DisallowUnknownFields()
-			if err := dec.Decode(&options); err != nil {
-				return options, fmt.Errorf("unmarshalling options: %s", err)
-			}
-			return options, nil
-		}
+
+	var options *opts
+	dec := ejson.NewDecoder(bytes.NewReader(req.PluginOptions))
+	dec.DisallowUnknownFields()
+	if err := dec.Decode(&options); err != nil {
+		return options, fmt.Errorf("unmarshalling options: %s", err)
 	}
-	return new(opts), nil
+	return options, nil
 }
 
 func Generate(ctx context.Context, req *plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {

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

@@ -13,7 +13,7 @@
     "codegen": {
       "out": "",
       "plugin": "",
-      "options": "eyJvdXQiOiJnZW4iLCJpbmRlbnQiOiIgICIsImZpbGVuYW1lIjoiY29kZWdlbi5qc29uIn0="
+      "options": ""
     }
   },
   "catalog": {
@@ -65363,5 +65363,5 @@
     }
   ],
   "sqlc_version": "v1.22.0",
-  "plugin_options": ""
+  "plugin_options": "eyJvdXQiOiJnZW4iLCJpbmRlbnQiOiIgICIsImZpbGVuYW1lIjoiY29kZWdlbi5qc29uIn0="
 }