From 13d5d8cb3ce45d17cff60b46e4a278d6288f2d20 Mon Sep 17 00:00:00 2001 From: Andrew Benton Date: Fri, 6 Oct 2023 15:52:10 -0700 Subject: [PATCH] feat(generate): reorder codegen handlers to prefer plugins resolves https://github.com/sqlc-dev/sqlc/issues/2716 --- internal/cmd/generate.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/cmd/generate.go b/internal/cmd/generate.go index 589295e74d..b479670e5d 100644 --- a/internal/cmd/generate.go +++ b/internal/cmd/generate.go @@ -367,14 +367,6 @@ func codegen(ctx context.Context, combo config.CombinedSettings, sql outPair, re var handler ext.Handler var out string switch { - case sql.Gen.Go != nil: - out = combo.Go.Out - handler = ext.HandleFunc(golang.Generate) - - case sql.Gen.JSON != nil: - out = combo.JSON.Out - handler = ext.HandleFunc(json.Generate) - case sql.Plugin != nil: out = sql.Plugin.Out plug, err := findPlugin(combo.Global, sql.Plugin.Plugin) @@ -404,6 +396,14 @@ func codegen(ctx context.Context, combo config.CombinedSettings, sql outPair, re } req.PluginOptions = opts + case sql.Gen.Go != nil: + out = combo.Go.Out + handler = ext.HandleFunc(golang.Generate) + + case sql.Gen.JSON != nil: + out = combo.JSON.Out + handler = ext.HandleFunc(json.Generate) + default: return "", nil, fmt.Errorf("missing language backend") }