Skip to content

Commit 2b6dc55

Browse files
authored
sqlite: fixed sqlite column type override (sqlc-dev#1986)
We should not assume that a table has a default schema name in the override config. Because different sql databases can have different default schemas. Fixes: sqlc-dev#1985
1 parent c8ccac7 commit 2b6dc55

File tree

17 files changed

+259
-2
lines changed

17 files changed

+259
-2
lines changed

internal/cmd/shim.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ func pluginOverride(o config.Override) *plugin.Override {
1919
colParts := strings.Split(o.Column, ".")
2020
switch len(colParts) {
2121
case 2:
22-
table.Schema = "public"
2322
table.Name = colParts[0]
2423
column = colParts[1]
2524
case 3:

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 == "" && schema != "" {
35+
if o.Table.Schema == "" && n.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: 31 additions & 0 deletions
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: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SELECT 1;
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CREATE TABLE foo (
2+
other text NOT NULL,
3+
total bigint NOT NULL,
4+
retyped text NOT NULL
5+
);
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": "1",
3+
"packages": [
4+
{
5+
"path": "go",
6+
"name": "override",
7+
"engine": "sqlite",
8+
"schema": "schema.sql",
9+
"queries": "query.sql",
10+
"overrides": [
11+
{
12+
"go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
13+
"column": "foo.retyped"
14+
}
15+
]
16+
}
17+
]
18+
}

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

Lines changed: 31 additions & 0 deletions
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: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SELECT 1;

0 commit comments

Comments
 (0)