feat(generate): reorder codegen handlers to prefer plugins (#2814)

andrewmbenton · web-flow · commit 89d8cff41e01 · 2023-10-08T09:20:43.000-07:00
resolves #2716
diff --git 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")
 	}
