Skip to content
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

Fix incorrect generate model names for "metadata" suffix #3553

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Fix incorrect generate model names for "metadata" suffix #3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3c2a8c
fix incorrect generate model names for "bonuses" and "metadata"
qanghaa Aug 18, 2024
3f67f73
remove bonuses to special table name list
qanghaa Oct 19, 2024
17fea60
remove bonuses to special table name list
qanghaa Oct 19, 2024
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
4 changes: 4 additions & 0 deletions internal/endtoend/testdata/inflection/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.

27 changes: 27 additions & 0 deletions internal/endtoend/testdata/inflection/mysql/go/query.sql.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: 3 additions & 0 deletions internal/endtoend/testdata/inflection/mysql/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ SELECT * FROM product_meta;

/* name: ListCalories :many */
SELECT * FROM calories;

/* name: GetProductMetadata :many */
SELECT * FROM product_metadata;
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/inflection/mysql/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);

CREATE TABLE product_metadata (id text not null);
4 changes: 4 additions & 0 deletions internal/endtoend/testdata/inflection/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.

24 changes: 24 additions & 0 deletions internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/query.sql.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: 3 additions & 0 deletions internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;

-- name: GetProductMetadata :many
SELECT * FROM product_metadata;
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);

CREATE TABLE product_metadata (id text not null);
4 changes: 4 additions & 0 deletions internal/endtoend/testdata/inflection/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.

24 changes: 24 additions & 0 deletions internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/query.sql.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: 3 additions & 0 deletions internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;

-- name: GetProductMetadata :many
SELECT * FROM product_metadata;
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);

CREATE TABLE product_metadata (id text not null);
4 changes: 4 additions & 0 deletions internal/endtoend/testdata/inflection/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.

27 changes: 27 additions & 0 deletions internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.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: 3 additions & 0 deletions internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;

-- name: GetProductMetadata :many
SELECT * FROM product_metadata;
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);

CREATE TABLE product_metadata (id text not null);
4 changes: 4 additions & 0 deletions internal/endtoend/testdata/inflection/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.

27 changes: 27 additions & 0 deletions internal/endtoend/testdata/inflection/sqlite/go/query.sql.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: 3 additions & 0 deletions internal/endtoend/testdata/inflection/sqlite/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ SELECT * FROM product_meta;

/* name: ListCalories :many */
SELECT * FROM calories;

/* name: GetProductMetadata :many */
SELECT * FROM product_metadata;
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/inflection/sqlite/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);

CREATE TABLE product_metadata (id text not null);
5 changes: 5 additions & 0 deletions internal/inflection/singular.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,10 @@ func Singular(s SingularParams) string {
if strings.ToLower(s.Name) == "waves" {
return "wave"
}

if strings.ToLower(s.Name) == "metadata" {
return "metadata"
}

return upstream.Singular(s.Name)
}
Loading