try as override options type

sqlc-dev · Oct 27, 2023 · af4a202 · af4a202
1 parent bcbe477
commit af4a202
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"encoding/json"
-	"fmt"
 	"strings"
 
 	gopluginopts "github.com/sqlc-dev/sqlc/internal/codegen/golang/opts"
@@ -39,7 +38,7 @@ func pluginOverride(r *compiler.Result, o config.Override) *plugin.Override {
 
 	var options []byte
 	var err error
-	if o.Options.IsZero() {
+	if len(o.Options) == 0 {
 		// Send go-specific override information to the go codegen plugin
 		options, err = json.Marshal(gopluginopts.OverrideOptions{
 			GoType:      o.GoType,
@@ -49,12 +48,7 @@ func pluginOverride(r *compiler.Result, o config.Override) *plugin.Override {
 			panic(err) // TODO don't panic, return err
 		}
 	} else {
-		options, err = convert.YAMLtoJSON(o.Options)
-		if err != nil {
-			panic(err)
-		}
-
-		fmt.Printf(">>> %s", string(options))
+		options = o.Options
 	}
 
 	return &plugin.Override{

diff --git a/internal/codegen/golang/opts/options.go b/internal/codegen/golang/opts/options.go
@@ -49,7 +49,6 @@ func ParseOpts(req *plugin.CodeGenRequest) (*Options, error) {
 	var options *Options
 	dec := json.NewDecoder(bytes.NewReader(req.PluginOptions))
 	dec.DisallowUnknownFields()
-	fmt.Printf("### %s", string(req.PluginOptions))
 	if err := dec.Decode(&options); err != nil {
 		return options, fmt.Errorf("unmarshalling options: %w", err)
 	}

diff --git a/internal/config/override.go b/internal/config/override.go
@@ -1,13 +1,13 @@
 package config
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"strings"
 
 	gopluginopts "github.com/sqlc-dev/sqlc/internal/codegen/golang/opts"
 	"github.com/sqlc-dev/sqlc/internal/pattern"
-	"gopkg.in/yaml.v3"
 )
 
 type Override struct {
@@ -43,8 +43,8 @@ type Override struct {
 	TableRel     *pattern.Match `json:"-"`
 
 	// For passing plugin-specific configuration
-	Plugin  string    `json:"plugin,omitempty"`
-	Options yaml.Node `json:"options,omitempty"`
+	Plugin  string          `json:"plugin,omitempty"`
+	Options json.RawMessage `json:"options,omitempty"`
 }
 
 func (o Override) hasGoOptions() bool {
@@ -78,7 +78,7 @@ func (o *Override) Parse() (err error) {
 		return fmt.Errorf("Override specifying both `column` (%q) and `db_type` (%q) is not valid.", o.Column, o.DBType)
 	case o.Column == "" && o.DBType == "":
 		return fmt.Errorf("Override must specify one of either `column` or `db_type`")
-	case o.hasGoOptions() && !o.Options.IsZero():
+	case o.hasGoOptions() && len(o.Options) > 0:
 		return fmt.Errorf("Override can specify go_type/go_struct_tag or options but not both")
 	}