fix process plugin tests

andrewmbenton · andrewmbenton · commit 61260000e44b · 2023-10-26T12:19:38.000-07:00
diff --git a/internal/codegen/golang/gen.go b/internal/codegen/golang/gen.go
@@ -129,11 +129,10 @@ func Generate(ctx context.Context, req *plugin.CodeGenRequest) (*plugin.CodeGenR
 
 func generate(req *plugin.CodeGenRequest, options *opts.Options, enums []Enum, structs []Struct, queries []Query) (*plugin.CodeGenResponse, error) {
 	i := &importer{
-		Settings: req.Settings,
-		Options:  options,
-		Queries:  queries,
-		Enums:    enums,
-		Structs:  structs,
+		Options: options,
+		Queries: queries,
+		Enums:   enums,
+		Structs: structs,
 	}
 
 	tctx := tmplCtx{
diff --git a/internal/codegen/golang/imports.go b/internal/codegen/golang/imports.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/sqlc-dev/sqlc/internal/codegen/golang/opts"
 	"github.com/sqlc-dev/sqlc/internal/metadata"
-	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type fileImports struct {
@@ -59,11 +58,10 @@ func mergeImports(imps ...fileImports) [][]ImportSpec {
 }
 
 type importer struct {
-	Settings *plugin.Settings
-	Options  *opts.Options
-	Queries  []Query
-	Enums    []Enum
-	Structs  []Struct
+	Options *opts.Options
+	Queries []Query
+	Enums   []Enum
+	Structs []Struct
 }
 
 func (i *importer) usesType(typ string) bool {
diff --git a/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json b/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json
@@ -9,46 +9,10 @@
       "query.sql"
     ],
     "rename": {},
-    "overrides": [],
     "codegen": {
       "out": "gen",
       "plugin": "jsonb",
       "options": "eyJmaWxlbmFtZSI6ImNvZGVnZW4uanNvbiIsImluZGVudCI6IiAgIn0="
-    },
-    "go": {
-      "emit_interface": false,
-      "emit_json_tags": false,
-      "emit_db_tags": false,
-      "emit_prepared_queries": false,
-      "emit_exact_table_names": false,
-      "emit_empty_slices": false,
-      "emit_exported_queries": false,
-      "emit_result_struct_pointers": false,
-      "emit_params_struct_pointers": false,
-      "emit_methods_with_db_argument": false,
-      "json_tags_case_style": "",
-      "package": "",
-      "out": "",
-      "sql_package": "",
-      "sql_driver": "",
-      "output_db_file_name": "",
-      "output_models_file_name": "",
-      "output_querier_file_name": "",
-      "output_copyfrom_file_name": "",
-      "output_files_suffix": "",
-      "emit_enum_valid_method": false,
-      "emit_all_enum_values": false,
-      "inflection_exclude_table_names": [],
-      "emit_pointers_for_null_types": false,
-      "query_parameter_limit": 1,
-      "output_batch_file_name": "",
-      "json_tags_id_uppercase": false,
-      "omit_unused_structs": false
-    },
-    "json": {
-      "out": "",
-      "indent": "",
-      "filename": ""
     }
   },
   "catalog": {
diff --git a/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json b/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json
@@ -9,7 +9,6 @@
       "query.sql"
     ],
     "rename": {},
-    "overrides": [],
     "codegen": {
       "out": "gen",
       "plugin": "jsonb",

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/sqlc-dev/sqlc/internal/codegen/golang/opts"`
`9`	`9`	`"github.com/sqlc-dev/sqlc/internal/metadata"`
`10`		`- "github.com/sqlc-dev/sqlc/internal/plugin"`
`11`	`10`	`)`
`12`	`11`
`13`	`12`	`type fileImports struct {`
`@@ -59,11 +58,10 @@ func mergeImports(imps ...fileImports) [][]ImportSpec {`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`type importer struct {`
`62`		`- Settings *plugin.Settings`
`63`		`- Options *opts.Options`
`64`		`- Queries []Query`
`65`		`- Enums []Enum`
`66`		`- Structs []Struct`
	`61`	`+ Options *opts.Options`
	`62`	`+ Queries []Query`
	`63`	`+ Enums []Enum`
	`64`	`+ Structs []Struct`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`func (i *importer) usesType(typ string) bool {`