refactor(cmd): keep OutputPair and ResultProcessor names from main

Unexported aliases added no encapsulation (same package) and only
increase PR noise. Restore AnalyzerDatabase field alignment as on main.

Made-with: Cursor

Author: asmyasnikov

internal/cmd/generate.go

@@ -186,23 +186,23 @@ type generator struct {
 	codegenHandlerOverride grpc.ClientConnInterface
 }
 
-func (g *generator) Pairs(ctx context.Context, conf *config.Config) []outputPair {
-	var pairs []outputPair
+func (g *generator) Pairs(ctx context.Context, conf *config.Config) []OutputPair {
+	var pairs []OutputPair
 	for _, sql := range conf.SQL {
 		if sql.Gen.Go != nil {
-			pairs = append(pairs, outputPair{
+			pairs = append(pairs, OutputPair{
 				SQL: sql,
 				Gen: config.SQLGen{Go: sql.Gen.Go},
 			})
 		}
 		if sql.Gen.JSON != nil {
-			pairs = append(pairs, outputPair{
+			pairs = append(pairs, OutputPair{
 				SQL: sql,
 				Gen: config.SQLGen{JSON: sql.Gen.JSON},
 			})
 		}
 		for i := range sql.Codegen {
-			pairs = append(pairs, outputPair{
+			pairs = append(pairs, OutputPair{
 				SQL:    sql,
 				Plugin: &sql.Codegen[i],
 			})
@@ -211,7 +211,7 @@ func (g *generator) Pairs(ctx context.Context, conf *config.Config) []outputPair
 	return pairs
 }
 
-func (g *generator) ProcessResult(ctx context.Context, combo config.CombinedSettings, sql outputPair, result *compiler.Result) error {
+func (g *generator) ProcessResult(ctx context.Context, combo config.CombinedSettings, sql OutputPair, result *compiler.Result) error {
 	out, resp, err := codegen(ctx, combo, sql, result, g.codegenHandlerOverride)
 	if err != nil {
 		return err
@@ -282,7 +282,7 @@ func parse(ctx context.Context, name, dir string, sql config.SQL, combo config.C
 	return c.Result(), false
 }
 
-func codegen(ctx context.Context, combo config.CombinedSettings, sql outputPair, result *compiler.Result, codegenOverride grpc.ClientConnInterface) (string, *plugin.GenerateResponse, error) {
+func codegen(ctx context.Context, combo config.CombinedSettings, sql OutputPair, result *compiler.Result, codegenOverride grpc.ClientConnInterface) (string, *plugin.GenerateResponse, error) {
 	defer trace.StartRegion(ctx, "codegen").End()
 	req := codeGenRequest(result, combo)
 	var handler grpc.ClientConnInterface

internal/cmd/plugin_engine.go

@@ -29,7 +29,7 @@ import (
 // engine plugin via ParseRequest; the responses are turned into compiler.Result and
 // passed to ProcessResult. No AST or compiler parsing is used.
 // When inputs.FileContents is set, schema/query bytes are taken from it (no disk read).
-func runPluginQuerySet(ctx context.Context, rp resultProcessor, name, dir string, sql outputPair, combo config.CombinedSettings, inputs *sourceFiles, o *Options) error {
+func runPluginQuerySet(ctx context.Context, rp ResultProcessor, name, dir string, sql OutputPair, combo config.CombinedSettings, inputs *sourceFiles, o *Options) error {
 	enginePlugin, found := config.FindEnginePlugin(&combo.Global, string(combo.Package.Engine))
 	if !found || enginePlugin.Process == nil {
 		e := string(combo.Package.Engine)

internal/cmd/process.go

@@ -19,19 +19,19 @@ import (
 	"github.com/sqlc-dev/sqlc/internal/opts"
 )
 
-type outputPair struct {
+type OutputPair struct {
 	Gen    config.SQLGen
 	Plugin *config.Codegen
 
 	config.SQL
 }
 
-type resultProcessor interface {
-	Pairs(context.Context, *config.Config) []outputPair
-	ProcessResult(context.Context, config.CombinedSettings, outputPair, *compiler.Result) error
+type ResultProcessor interface {
+	Pairs(context.Context, *config.Config) []OutputPair
+	ProcessResult(context.Context, config.CombinedSettings, OutputPair, *compiler.Result) error
 }
 
-func Process(ctx context.Context, rp resultProcessor, dir, filename string, o *Options) error {
+func Process(ctx context.Context, rp ResultProcessor, dir, filename string, o *Options) error {
 	e := o.Env
 	stderr := o.Stderr
 
@@ -55,7 +55,7 @@ func Process(ctx context.Context, rp resultProcessor, dir, filename string, o *O
 	return processQuerySets(ctx, rp, inputs, o)
 }
 
-func processQuerySets(ctx context.Context, rp resultProcessor, inputs *sourceFiles, o *Options) error {
+func processQuerySets(ctx context.Context, rp ResultProcessor, inputs *sourceFiles, o *Options) error {
 	stderr := o.Stderr
 	conf := inputs.Config
 	dir := inputs.Dir

internal/cmd/push.go

@@ -46,17 +46,17 @@ type pusher struct {
 	results []*bundler.QuerySetArchive
 }
 
-func (g *pusher) Pairs(ctx context.Context, conf *config.Config) []outputPair {
-	var pairs []outputPair
+func (g *pusher) Pairs(ctx context.Context, conf *config.Config) []OutputPair {
+	var pairs []OutputPair
 	for _, sql := range conf.SQL {
-		pairs = append(pairs, outputPair{
+		pairs = append(pairs, OutputPair{
 			SQL: sql,
 		})
 	}
 	return pairs
 }
 
-func (g *pusher) ProcessResult(ctx context.Context, combo config.CombinedSettings, sql outputPair, result *compiler.Result) error {
+func (g *pusher) ProcessResult(ctx context.Context, combo config.CombinedSettings, sql OutputPair, result *compiler.Result) error {
 	req := codeGenRequest(result, combo)
 	g.m.Lock()
 	g.results = append(g.results, &bundler.QuerySetArchive{

internal/config/config.go

@@ -158,8 +158,8 @@ type SQL struct {
 // AnalyzerDatabase represents the database analyzer setting.
 // It can be a boolean (true/false) or the string "only" for database-only mode.
 type AnalyzerDatabase struct {
-	value  *bool // nil means not set, true/false for boolean values
-	isOnly bool  // true when set to "only"
+	value   *bool  // nil means not set, true/false for boolean values
+	isOnly  bool   // true when set to "only"
 }
 
 // IsEnabled returns true if the database analyzer should be used.