Skip to content

Manual fix for incorrect handling of "calories" #2018

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 3 commits into from
Jan 17, 2023
Merged

Manual fix for incorrect handling of "calories" #2018

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
855c2e3
Manual fix for incorrect handling of "calories"
mpyw Jan 13, 2023
086f580
e2e: Add queries
mpyw Jan 13, 2023
2841d2e
e2e: Regenerate files
mpyw Jan 13, 2023
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.

4 changes: 4 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
@@ -1,6 +1,7 @@
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);

/* name: ListCampuses :many */
SELECT * FROM campus;
Expand All @@ -10,3 +11,6 @@ SELECT * FROM students;

/* name: ListMetadata :many */
SELECT * FROM product_meta;

/* name: ListCalories :many */
SELECT * FROM calories;
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.

4 changes: 4 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
@@ -1,6 +1,7 @@
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);

-- name: ListCampuses :many
SELECT * FROM campus;
Expand All @@ -10,3 +11,6 @@ SELECT * FROM students;

-- name: ListMetadata :many
SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;
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.

4 changes: 4 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
@@ -1,6 +1,7 @@
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);

-- name: ListCampuses :many
SELECT * FROM campus;
Expand All @@ -10,3 +11,6 @@ SELECT * FROM students;

-- name: ListMetadata :many
SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;
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.

4 changes: 4 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
@@ -1,6 +1,7 @@
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);

-- name: ListCampuses :many
SELECT * FROM campus;
Expand All @@ -10,3 +11,6 @@ SELECT * FROM students;

-- name: ListMetadata :many
SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;
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.

4 changes: 4 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
@@ -1,6 +1,7 @@
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);

/* name: ListCampuses :many */
SELECT * FROM campus;
Expand All @@ -10,3 +11,6 @@ SELECT * FROM students;

/* name: ListMetadata :many */
SELECT * FROM product_meta;

/* name: ListCalories :many */
SELECT * FROM calories;
7 changes: 7 additions & 0 deletions internal/inflection/singular.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,12 @@ func Singular(s SingularParams) string {
if strings.ToLower(s.Name) == "meta" {
return s.Name
}
// Manual fix for incorrect handling of "calories"
//
// https://github.com/kyleconroy/sqlc/issues/2017
// https://github.com/jinzhu/inflection/issues/23
if strings.ToLower(s.Name) == "calories" {
return "calorie"
}
return upstream.Singular(s.Name)
}