fix: Honor Package level renames in v2 yaml config

[Emyrk]

When following the docs for renames for pkg scoped renames, the renames were not applying. This is my first look into the sqlc config, but it looked like things were just not plumbed through.

I just adds setting the renames from the yaml parse. In the combine settings I made sure to assign the renames from the pkg (the global was already set). This change does make pkg renames override global ones.

---

For unit testing, I noticed all the endtoend/testdata use a v1 config. Instead of adding more vectors to that to also do v2 directories, what if we just added a sqlc.v1.yaml and sqlc.v2.yaml to each directory and run it twice? Or something of that nature to test v2 configs? At present this is not tested aside from some manual checking.

[alicebob]

This seems to fix #1977.

[Emyrk]

Is it possible to get this in soon? Seems small and trivial?

[mpyw]

I noticed the same problem and wrote a patch, but then I found that this PR had already been submitted! 🤣

diff --git a/internal/config/config.go b/internal/config/config.go
index 0dfd57bc..1c8942c8 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -214,12 +214,22 @@ func Combine(conf Config, pkg SQL) CombinedSettings {
 		Global:  conf,
 		Package: pkg,
 	}
+	merge := func(dst, src map[string]string) map[string]string {
+		for k, v := range src {
+			if dst == nil {
+				dst = make(map[string]string)
+			}
+			dst[k] = v
+		}
+		return dst
+	}
 	if conf.Gen.Go != nil {
-		cs.Rename = conf.Gen.Go.Rename
+		cs.Rename = merge(cs.Rename, conf.Gen.Go.Rename)
 		cs.Overrides = append(cs.Overrides, conf.Gen.Go.Overrides...)
 	}
 	if pkg.Gen.Go != nil {
 		cs.Go = *pkg.Gen.Go
+		cs.Rename = merge(cs.Rename, pkg.Gen.Go.Rename)
 		cs.Overrides = append(cs.Overrides, pkg.Gen.Go.Overrides...)
 	}
 	if pkg.Gen.JSON != nil {

[mpyw]

@kyleconroy There are a workaround with global rename config, but the bug may confuse many people. A patch version should be released soon if possible.

[sgielen]

@kyleconroy respectful bump to make you aware of this tiny PR fixing #1977 :-)

[Emyrk]

@kyleconroy There are a workaround with global rename config, but the bug may confuse many people. A patch version should be released soon if possible.

That is what I did in the meantime.