delay queryset override parsing until codegen plugin takes over

Author: andrewmbenton

internal/codegen/golang/opts/override.go

@@ -33,17 +33,17 @@ type Override struct {
 	// fully qualified name of the column, e.g. `accounts.id`
 	Column string `json:"column" yaml:"column"`
 
-	ColumnName   *pattern.Match
-	TableCatalog *pattern.Match
-	TableSchema  *pattern.Match
-	TableRel     *pattern.Match
-	GoImportPath string
-	GoPackage    string
-	GoTypeName   string
-	GoBasicType  bool
+	ColumnName   *pattern.Match `json:"-"`
+	TableCatalog *pattern.Match `json:"-"`
+	TableSchema  *pattern.Match `json:"-"`
+	TableRel     *pattern.Match `json:"-"`
+	GoImportPath string         `json:"-"`
+	GoPackage    string         `json:"-"`
+	GoTypeName   string         `json:"-"`
+	GoBasicType  bool           `json:"-"`
 
 	// Parsed form of GoStructTag, e.g. {"validate:", "required"}
-	GoStructTags map[string]string
+	GoStructTags map[string]string `json:"-"`
 }
 
 func (o *Override) Parse() (err error) {

internal/config/config.go

@@ -269,7 +269,6 @@ func Combine(conf Config, pkg SQL) CombinedSettings {
 		for k, v := range pkg.Gen.Go.Rename {
 			cs.Rename[k] = v
 		}
-		cs.Overrides = append(cs.Overrides, pkg.Gen.Go.Overrides...)
 	}
 	if pkg.Gen.JSON != nil {
 		cs.JSON = *pkg.Gen.JSON

internal/config/override.go

@@ -35,17 +35,17 @@ type Override struct {
 	// fully qualified name of the column, e.g. `accounts.id`
 	Column string `json:"column" yaml:"column"`
 
-	ColumnName   *pattern.Match
-	TableCatalog *pattern.Match
-	TableSchema  *pattern.Match
-	TableRel     *pattern.Match
-	GoImportPath string
-	GoPackage    string
-	GoTypeName   string
-	GoBasicType  bool
+	ColumnName   *pattern.Match `json:"-"`
+	TableCatalog *pattern.Match `json:"-"`
+	TableSchema  *pattern.Match `json:"-"`
+	TableRel     *pattern.Match `json:"-"`
+	GoImportPath string         `json:"-"`
+	GoPackage    string         `json:"-"`
+	GoTypeName   string         `json:"-"`
+	GoBasicType  bool           `json:"-"`
 
 	// Parsed form of GoStructTag, e.g. {"validate:", "required"}
-	GoStructTags map[string]string
+	GoStructTags map[string]string `json:"-"`
 }
 
 func (o *Override) Parse() (err error) {

internal/config/v_one.go

@@ -96,18 +96,13 @@ func v1ParseConfig(rd io.Reader) (Config, error) {
 			*settings.Packages[j].QueryParameterLimit = 1
 		}
 
-		for i := range settings.Packages[j].Overrides {
-			if err := settings.Packages[j].Overrides[i].Parse(); err != nil {
-				return config, err
-			}
-		}
 		if settings.Packages[j].Name == "" {
 			settings.Packages[j].Name = filepath.Base(settings.Packages[j].Path)
 		}
+
 		if settings.Packages[j].Engine == "" {
 			settings.Packages[j].Engine = EnginePostgreSQL
 		}
-
 	}
 
 	return settings.Translate(), nil

internal/config/v_two.go

@@ -84,11 +84,6 @@ func v2ParseConfig(rd io.Reader) (Config, error) {
 				*conf.SQL[j].Gen.Go.QueryParameterLimit = 1
 			}
 
-			for i := range conf.SQL[j].Gen.Go.Overrides {
-				if err := conf.SQL[j].Gen.Go.Overrides[i].Parse(); err != nil {
-					return conf, err
-				}
-			}
 			for k, v := range conf.SQL[j].Gen.Go.Rename {
 				conf.SQL[j].Gen.Go.Rename[k] = v
 			}

internal/endtoend/testdata/overrides_go_struct_tags/invalid_tags/stderr.txt

@@ -1 +1,2 @@
-error parsing sqlc.json: bad syntax for struct tag pair
+# package override
+error generating code: bad syntax for struct tag pair