From a451bde80ffa1266d329ac7dcdb575d96339cc1c Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@conroy.org>
Date: Wed, 7 Jun 2023 12:32:35 -0700
Subject: [PATCH] codegen: Use catalog's default schema

Remove references to hard-coded "public" schema
---
 internal/cmd/shim.go                                     | 9 +++++----
 internal/codegen/sdk/sdk.go                              | 2 +-
 internal/endtoend/testdata/overrides/sqlite/go/db.go     | 2 +-
 internal/endtoend/testdata/overrides/sqlite/go/models.go | 2 +-
 .../testdata/overrides_go_struct_tags/sqlite/go/db.go    | 2 +-
 .../overrides_go_struct_tags/sqlite/go/models.go         | 2 +-
 .../endtoend/testdata/overrides_go_types/sqlite/go/db.go | 2 +-
 .../testdata/overrides_go_types/sqlite/go/models.go      | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
index d3c8a85725..8a7e80824f 100644
--- a/internal/cmd/shim.go
+++ b/internal/cmd/shim.go
@@ -11,7 +11,7 @@ import (
 	"github.com/kyleconroy/sqlc/internal/sql/catalog"
 )
 
-func pluginOverride(o config.Override) *plugin.Override {
+func pluginOverride(r *compiler.Result, o config.Override) *plugin.Override {
 	var column string
 	var table plugin.Identifier
 
@@ -19,6 +19,7 @@ func pluginOverride(o config.Override) *plugin.Override {
 		colParts := strings.Split(o.Column, ".")
 		switch len(colParts) {
 		case 2:
+			table.Schema = r.Catalog.DefaultSchema
 			table.Name = colParts[0]
 			column = colParts[1]
 		case 3:
@@ -43,10 +44,10 @@ func pluginOverride(o config.Override) *plugin.Override {
 	}
 }
 
-func pluginSettings(cs config.CombinedSettings) *plugin.Settings {
+func pluginSettings(r *compiler.Result, cs config.CombinedSettings) *plugin.Settings {
 	var over []*plugin.Override
 	for _, o := range cs.Overrides {
-		over = append(over, pluginOverride(o))
+		over = append(over, pluginOverride(r, o))
 	}
 	return &plugin.Settings{
 		Version:   cs.Global.Version,
@@ -291,7 +292,7 @@ func pluginQueryParam(p compiler.Parameter) *plugin.Parameter {
 
 func codeGenRequest(r *compiler.Result, settings config.CombinedSettings) *plugin.CodeGenRequest {
 	return &plugin.CodeGenRequest{
-		Settings:    pluginSettings(settings),
+		Settings:    pluginSettings(r, settings),
 		Catalog:     pluginCatalog(r.Catalog),
 		Queries:     pluginQueries(r),
 		SqlcVersion: info.Version,
diff --git a/internal/codegen/sdk/sdk.go b/internal/codegen/sdk/sdk.go
index 98bcaefa17..2f97da1bb8 100644
--- a/internal/codegen/sdk/sdk.go
+++ b/internal/codegen/sdk/sdk.go
@@ -32,7 +32,7 @@ func Matches(o *plugin.Override, n *plugin.Identifier, defaultSchema string) boo
 	if o.Table.Catalog != "" && !MatchString(o.Table.Catalog, n.Catalog) {
 		return false
 	}
-	if o.Table.Schema == "" && n.Schema != "" {
+	if o.Table.Schema == "" && schema != "" {
 		return false
 	}
 	if o.Table.Schema != "" && !MatchString(o.Table.Schema, schema) {
diff --git a/internal/endtoend/testdata/overrides/sqlite/go/db.go b/internal/endtoend/testdata/overrides/sqlite/go/db.go
index c74c7782d1..e41f9c22e0 100644
--- a/internal/endtoend/testdata/overrides/sqlite/go/db.go
+++ b/internal/endtoend/testdata/overrides/sqlite/go/db.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.16.0
+//   sqlc v1.18.0
 
 package override
 
diff --git a/internal/endtoend/testdata/overrides/sqlite/go/models.go b/internal/endtoend/testdata/overrides/sqlite/go/models.go
index 99dc55fe89..263c88806f 100644
--- a/internal/endtoend/testdata/overrides/sqlite/go/models.go
+++ b/internal/endtoend/testdata/overrides/sqlite/go/models.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.16.0
+//   sqlc v1.18.0
 
 package override
 
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/db.go b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/db.go
index c74c7782d1..e41f9c22e0 100644
--- a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/db.go
+++ b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/db.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.16.0
+//   sqlc v1.18.0
 
 package override
 
diff --git a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go
index 491c1a0cf4..b5299bb37b 100644
--- a/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go
+++ b/internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.16.0
+//   sqlc v1.18.0
 
 package override
 
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/go/db.go b/internal/endtoend/testdata/overrides_go_types/sqlite/go/db.go
index c74c7782d1..e41f9c22e0 100644
--- a/internal/endtoend/testdata/overrides_go_types/sqlite/go/db.go
+++ b/internal/endtoend/testdata/overrides_go_types/sqlite/go/db.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.16.0
+//   sqlc v1.18.0
 
 package override
 
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go b/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go
index 802ccb2665..cb2b45bf58 100644
--- a/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go
+++ b/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.16.0
+//   sqlc v1.18.0
 
 package override