delay queryset override parsing until codegen plugin takes over

andrewmbenton · andrewmbenton · commit 750229276ecb · 2023-10-26T20:46:23.000-07:00
diff --git a/internal/codegen/golang/opts/override.go b/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) {
diff --git a/internal/config/config.go b/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
diff --git a/internal/config/override.go b/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) {
diff --git a/internal/config/v_one.go b/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
diff --git a/internal/config/v_two.go b/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
 			}
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/invalid_tags/stderr.txt b/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

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,6 @@ func Combine(conf Config, pkg SQL) CombinedSettings {`
`269`	`269`	`for k, v := range pkg.Gen.Go.Rename {`
`270`	`270`	`cs.Rename[k] = v`
`271`	`271`	`}`
`272`		`- cs.Overrides = append(cs.Overrides, pkg.Gen.Go.Overrides...)`
`273`	`272`	`}`
`274`	`273`	`if pkg.Gen.JSON != nil {`
`275`	`274`	`cs.JSON = *pkg.Gen.JSON`
Original file line number	Diff line number	Diff line change
`@@ -96,18 +96,13 @@ func v1ParseConfig(rd io.Reader) (Config, error) {`
`96`	`96`	`*settings.Packages[j].QueryParameterLimit = 1`
`97`	`97`	`}`
`98`	`98`
`99`		`- for i := range settings.Packages[j].Overrides {`
`100`		`- if err := settings.Packages[j].Overrides[i].Parse(); err != nil {`
`101`		`- return config, err`
`102`		`- }`
`103`		`- }`
`104`	`99`	`if settings.Packages[j].Name == "" {`
`105`	`100`	`settings.Packages[j].Name = filepath.Base(settings.Packages[j].Path)`
`106`	`101`	`}`
	`102`	`+`
`107`	`103`	`if settings.Packages[j].Engine == "" {`
`108`	`104`	`settings.Packages[j].Engine = EnginePostgreSQL`
`109`	`105`	`}`
`110`		`-`
`111`	`106`	`}`
`112`	`107`
`113`	`108`	`return settings.Translate(), nil`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,6 @@ func v2ParseConfig(rd io.Reader) (Config, error) {`
`84`	`84`	`*conf.SQL[j].Gen.Go.QueryParameterLimit = 1`
`85`	`85`	`}`
`86`	`86`
`87`		`- for i := range conf.SQL[j].Gen.Go.Overrides {`
`88`		`- if err := conf.SQL[j].Gen.Go.Overrides[i].Parse(); err != nil {`
`89`		`- return conf, err`
`90`		`- }`
`91`		`- }`
`92`	`87`	`for k, v := range conf.SQL[j].Gen.Go.Rename {`
`93`	`88`	`conf.SQL[j].Gen.Go.Rename[k] = v`
`94`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-error parsing sqlc.json: bad syntax for struct tag pair`
	`1`	`+# package override`
	`2`	`+error generating code: bad syntax for struct tag pair`