Skip to content

Commit fab267e

Browse files
authored
fix(inflection): Incorrect handling of meta (#1228)
1 parent da832bb commit fab267e

File tree

10 files changed

+109
-0
lines changed

10 files changed

+109
-0
lines changed

internal/endtoend/testdata/inflection/mysql/go/models.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/inflection/mysql/go/query.sql.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
CREATE TABLE campus (id text not null);
22
CREATE TABLE students (id text not null);
3+
CREATE TABLE product_meta (id text not null);
34

45
/* name: ListCampuses :many */
56
SELECT * FROM campus;
67

78
/* name: ListStudents :many */
89
SELECT * FROM students;
10+
11+
/* name: ListMetadata :many */
12+
SELECT * FROM product_meta;

internal/endtoend/testdata/inflection/postgresql/pgx/go/models.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/inflection/postgresql/pgx/go/query.sql.go

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
CREATE TABLE campus (id text not null);
22
CREATE TABLE students (id text not null);
3+
CREATE TABLE product_meta (id text not null);
34

45
-- name: ListCampuses :many
56
SELECT * FROM campus;
67

78
-- name: ListStudents :many
89
SELECT * FROM students;
10+
11+
-- name: ListMetadata :many
12+
SELECT * FROM product_meta;

internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
CREATE TABLE campus (id text not null);
22
CREATE TABLE students (id text not null);
3+
CREATE TABLE product_meta (id text not null);
34

45
-- name: ListCampuses :many
56
SELECT * FROM campus;
67

78
-- name: ListStudents :many
89
SELECT * FROM students;
10+
11+
-- name: ListMetadata :many
12+
SELECT * FROM product_meta;

internal/inflection/singular.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,12 @@ func Singular(name string) string {
1414
if strings.ToLower(name) == "campus" {
1515
return name
1616
}
17+
// Manual fix for incorrect handling of "meta"
18+
//
19+
// https://github.com/kyleconroy/sqlc/issues/1217
20+
// https://github.com/jinzhu/inflection/issues/21
21+
if strings.ToLower(name) == "meta" {
22+
return name
23+
}
1724
return upstream.Singular(name)
1825
}

0 commit comments

Comments
 (0)