codegen: Use catalog's default schema (#2310)

Remove references to hard-coded "public" schema

Author: kyleconroy

internal/cmd/shim.go

@@ -11,14 +11,15 @@ 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
 
 	if o.Column != "" {
 		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,

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) {