Skip to content

fix: missing import with pointer overrides, solves #2168 #2125 #2217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 1 commit into from
Apr 27, 2023
Merged

fix: missing import with pointer overrides, solves #2168 #2125 #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/codegen/golang/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ func (i *importer) usesType(typ string) bool {
for _, strct := range i.Structs {
for _, f := range strct.Fields {
fType := trimSliceAndPointerPrefix(f.Type)
if strings.HasPrefix(fType, typ) {
tType := trimSliceAndPointerPrefix(typ)
if strings.HasPrefix(fType, tType) {
return true
}
}
Expand Down
31 changes: 31 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/mysql/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/mysql/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/endtoend/testdata/overrides_pointers/mysql/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT 1;
5 changes: 5 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/mysql/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CREATE TABLE foo (
other text NOT NULL,
total bigint NOT NULL,
retyped text NOT NULL
);
23 changes: 23 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/mysql/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "1",
"packages": [
{
"path": "go",
"name": "override",
"engine": "mysql",
"schema": "schema.sql",
"queries": "query.sql",
"overrides": [
{
"go_type": {
"import": "github.com/jackc/pgtype",
"type": "Text",
"package": "t",
"pointer": true
},
"column": "foo.retyped"
}
]
}
]
}
32 changes: 32 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT 1;
8 changes: 8 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CREATE TABLE foo (
other text NOT NULL,
total bigint NOT NULL,
tags text[] NOT NULL,
byte_seq bytea NOT NULL,
retyped text NOT NULL,
langs text[]
);
24 changes: 24 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v4/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": "1",
"packages": [
{
"path": "go",
"engine": "postgresql",
"sql_package": "pgx/v4",
"name": "override",
"schema": "schema.sql",
"queries": "query.sql",
"overrides": [
{
"go_type": {
"import": "github.com/jackc/pgtype",
"type": "Text",
"package": "t",
"pointer": true
},
"column": "foo.langs"
}
]
}
]
}
32 changes: 32 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT 1;
8 changes: 8 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CREATE TABLE foo (
other text NOT NULL,
total bigint NOT NULL,
tags text[] NOT NULL,
byte_seq bytea NOT NULL,
retyped text NOT NULL,
langs text[]
);
24 changes: 24 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/pgx/v5/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": "1",
"packages": [
{
"path": "go",
"engine": "postgresql",
"sql_package": "pgx/v5",
"name": "override",
"schema": "schema.sql",
"queries": "query.sql",
"overrides": [
{
"go_type": {
"import": "github.com/jackc/pgtype",
"type": "Text",
"package": "t",
"pointer": true
},
"column": "foo.langs"
}
]
}
]
}
31 changes: 31 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT 1;
8 changes: 8 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CREATE TABLE foo (
other text NOT NULL,
total bigint NOT NULL,
tags text[] NOT NULL,
byte_seq bytea NOT NULL,
retyped text NOT NULL,
langs text[]
);
23 changes: 23 additions & 0 deletions internal/endtoend/testdata/overrides_pointers/postgresql/stdlib/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "1",
"packages": [
{
"path": "go",
"name": "override",
"engine": "postgresql",
"schema": "schema.sql",
"queries": "query.sql",
"overrides": [
{
"go_type": {
"import": "github.com/jackc/pgtype",
"type": "Text",
"package": "t",
"pointer": true
},
"column": "foo.langs"
}
]
}
]
}