Skip to content

Commit 2c9a491

Browse files
authored
codegen: Use catalog's default schema (#2310)
Remove references to hard-coded "public" schema
1 parent 6a3e9ae commit 2c9a491

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

internal/cmd/shim.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import (
1111
"github.com/kyleconroy/sqlc/internal/sql/catalog"
1212
)
1313

14-
func pluginOverride(o config.Override) *plugin.Override {
14+
func pluginOverride(r *compiler.Result, o config.Override) *plugin.Override {
1515
var column string
1616
var table plugin.Identifier
1717

1818
if o.Column != "" {
1919
colParts := strings.Split(o.Column, ".")
2020
switch len(colParts) {
2121
case 2:
22+
table.Schema = r.Catalog.DefaultSchema
2223
table.Name = colParts[0]
2324
column = colParts[1]
2425
case 3:
@@ -43,10 +44,10 @@ func pluginOverride(o config.Override) *plugin.Override {
4344
}
4445
}
4546

46-
func pluginSettings(cs config.CombinedSettings) *plugin.Settings {
47+
func pluginSettings(r *compiler.Result, cs config.CombinedSettings) *plugin.Settings {
4748
var over []*plugin.Override
4849
for _, o := range cs.Overrides {
49-
over = append(over, pluginOverride(o))
50+
over = append(over, pluginOverride(r, o))
5051
}
5152
return &plugin.Settings{
5253
Version: cs.Global.Version,
@@ -291,7 +292,7 @@ func pluginQueryParam(p compiler.Parameter) *plugin.Parameter {
291292

292293
func codeGenRequest(r *compiler.Result, settings config.CombinedSettings) *plugin.CodeGenRequest {
293294
return &plugin.CodeGenRequest{
294-
Settings: pluginSettings(settings),
295+
Settings: pluginSettings(r, settings),
295296
Catalog: pluginCatalog(r.Catalog),
296297
Queries: pluginQueries(r),
297298
SqlcVersion: info.Version,

internal/codegen/sdk/sdk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func Matches(o *plugin.Override, n *plugin.Identifier, defaultSchema string) boo
3232
if o.Table.Catalog != "" && !MatchString(o.Table.Catalog, n.Catalog) {
3333
return false
3434
}
35-
if o.Table.Schema == "" && n.Schema != "" {
35+
if o.Table.Schema == "" && schema != "" {
3636
return false
3737
}
3838
if o.Table.Schema != "" && !MatchString(o.Table.Schema, schema) {

internal/endtoend/testdata/overrides/sqlite/go/db.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/overrides/sqlite/go/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/db.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/overrides_go_struct_tags/sqlite/go/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/overrides_go_types/sqlite/go/db.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)