Manual fix for incorrect handling of "calories" (#2018)

* Manual fix for incorrect handling of "calories"

* e2e: Add queries

* e2e: Regenerate files

Author: mpyw

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

@@ -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;
@@ -10,3 +11,6 @@ SELECT * FROM students;
 
 /* name: ListMetadata :many */
 SELECT * FROM product_meta;
+
+/* name: ListCalories :many */
+SELECT * FROM calories;

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

@@ -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;
@@ -10,3 +11,6 @@ SELECT * FROM students;
 
 -- name: ListMetadata :many
 SELECT * FROM product_meta;
+
+-- name: ListCalories :many
+SELECT * FROM calories;

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

@@ -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;
@@ -10,3 +11,6 @@ SELECT * FROM students;
 
 -- name: ListMetadata :many
 SELECT * FROM product_meta;
+
+-- name: ListCalories :many
+SELECT * FROM calories;

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

@@ -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;
@@ -10,3 +11,6 @@ SELECT * FROM students;
 
 -- name: ListMetadata :many
 SELECT * FROM product_meta;
+
+-- name: ListCalories :many
+SELECT * FROM calories;

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

@@ -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;
@@ -10,3 +11,6 @@ SELECT * FROM students;
 
 /* name: ListMetadata :many */
 SELECT * FROM product_meta;
+
+/* name: ListCalories :many */
+SELECT * FROM calories;

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

@@ -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)
 }