From 170c12bde22a5dbe5bec24d5e314c90f7c4cc63a Mon Sep 17 00:00:00 2001
From: Steven Masley <stevenmasley@coder.com>
Date: Thu, 15 Dec 2022 13:13:43 -0600
Subject: [PATCH] fix: Honor Package level renames in v2 yaml config

Package level config renames override global level config renames
---
 internal/config/config.go | 8 +++++++-
 internal/config/v_two.go  | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 0dfd57bcc9..153018901f 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -213,13 +213,19 @@ func Combine(conf Config, pkg SQL) CombinedSettings {
 	cs := CombinedSettings{
 		Global:  conf,
 		Package: pkg,
+		Rename:  map[string]string{},
 	}
 	if conf.Gen.Go != nil {
-		cs.Rename = conf.Gen.Go.Rename
+		for k, v := range conf.Gen.Go.Rename {
+			cs.Rename[k] = v
+		}
 		cs.Overrides = append(cs.Overrides, conf.Gen.Go.Overrides...)
 	}
 	if pkg.Gen.Go != nil {
 		cs.Go = *pkg.Gen.Go
+		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 {
diff --git a/internal/config/v_two.go b/internal/config/v_two.go
index f0bad47e78..94b05be2d0 100644
--- a/internal/config/v_two.go
+++ b/internal/config/v_two.go
@@ -79,6 +79,9 @@ func v2ParseConfig(rd io.Reader) (Config, error) {
 					return conf, err
 				}
 			}
+			for k, v := range conf.SQL[j].Gen.Go.Rename {
+				conf.SQL[j].Gen.Go.Rename[k] = v
+			}
 		}
 		if conf.SQL[j].Gen.JSON != nil {
 			if conf.SQL[j].Gen.JSON.Out == "" {