Skip to content

fix(codegen/golang): handle go_struct_tag for db_type overrides #4055

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
merged 4 commits into from
Aug 12, 2025
Merged

fix(codegen/golang): handle go_struct_tag for db_type overrides #4055

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08c808d
fix(codegen/golang): handle `go_struct_tag` for `db_type` overrides
andrewmbenton Aug 11, 2025
9c42b32
update tests
andrewmbenton Aug 11, 2025
90dd838
properly handle nullable and other db_type match parameters
andrewmbenton Aug 11, 2025
5611a92
and update tests
andrewmbenton Aug 11, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
and update tests
  • Loading branch information
@andrewmbenton
andrewmbenton committed Aug 11, 2025
commit 5611a92e21ec15474c1b25f1f11432b28d22f91c
13 changes: 7 additions & 6 deletions internal/endtoend/testdata/overrides_go_struct_tags/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.

3 changes: 2 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/mysql/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CREATE TABLE foo (
other text NOT NULL,
tagged text NOT NULL
tagged text NOT NULL,
nulltext text
);

CREATE TABLE bar (
Expand Down
8 changes: 7 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/mysql/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
},
{
"db_type": "text",
"go_struct_tag": "utype:\"text\""
"go_struct_tag": "utype:\"notnull_text\""
},
{
"db_type": "text",
"go_type": "string",
"nullable": true,
"go_struct_tag": "utype:\"nullable_text\""
}
]
}
Expand Down
21 changes: 9 additions & 12 deletions internal/endtoend/testdata/overrides_go_struct_tags/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.

3 changes: 2 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CREATE TABLE foo (
id text,
other_id text,
about text,
other text
other text,
notnulltext text not null
);

CREATE TABLE bar (
Expand Down
8 changes: 7 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v4/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@
},
{
"db_type": "text",
"go_struct_tag": "utype:\"text\""
"go_struct_tag": "utype:\"notnull_text\""
},
{
"db_type": "text",
"go_type": "string",
"nullable": true,
"go_struct_tag": "utype:\"nullable_text\""
}
]
}
Expand Down
21 changes: 9 additions & 12 deletions internal/endtoend/testdata/overrides_go_struct_tags/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.

3 changes: 2 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CREATE TABLE foo (
id text,
other_id text,
about text,
other text
other text,
notnulltext text not null
);

CREATE TABLE bar (
Expand Down
8 changes: 7 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/postgresql/pgx/v5/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@
},
{
"db_type": "text",
"go_struct_tag": "utype:\"text\""
"go_struct_tag": "utype:\"notnull_text\""
},
{
"db_type": "text",
"go_type": "string",
"nullable": true,
"go_struct_tag": "utype:\"nullable_text\""
}
]
}
Expand Down
9 changes: 3 additions & 6 deletions internal/endtoend/testdata/overrides_go_struct_tags/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.

3 changes: 2 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CREATE TABLE foo (
id text,
other_id text
other_id text,
notnulltext text not null
);
8 changes: 7 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/postgresql/stdlib/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@
},
{
"db_type": "text",
"go_struct_tag": "utype:\"text\""
"go_struct_tag": "utype:\"notnull_text\""
},
{
"db_type": "text",
"go_type": "string",
"nullable": true,
"go_struct_tag": "utype:\"nullable_text\""
}
]
}
Expand Down
19 changes: 10 additions & 9 deletions internal/endtoend/testdata/overrides_go_struct_tags/sqlite/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.

3 changes: 2 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/sqlite/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
CREATE TABLE foo (
other text NOT NULL,
tagged text NOT NULL,
tag3 text NOT NULL
tag3 text NOT NULL,
nulltext text
);

CREATE TABLE bar (
Expand Down
8 changes: 7 additions & 1 deletion internal/endtoend/testdata/overrides_go_struct_tags/sqlite/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@
},
{
"db_type": "text",
"go_struct_tag": "utype:\"text\""
"go_struct_tag": "utype:\"notnull_text\""
},
{
"db_type": "text",
"go_type": "string",
"nullable": true,
"go_struct_tag": "utype:\"nullable_text\""
}
]
}
Expand Down
Loading