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

sqlc-dev · Nov 25, 2024 · 58674b4 · 58674b4
1 parent 7d66890
commit 58674b4
Show file tree

Hide file tree

Showing 21 changed files with 174 additions and 5 deletions.
diff --git a/internal/endtoend/testdata/inflection/mysql/go/models.go b/internal/endtoend/testdata/inflection/mysql/go/models.go
diff --git a/internal/endtoend/testdata/inflection/mysql/go/query.sql.go b/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/inflection/mysql/query.sql b/internal/endtoend/testdata/inflection/mysql/query.sql
@@ -9,3 +9,6 @@ SELECT * FROM product_meta;
 
 /* name: ListCalories :many */
 SELECT * FROM calories;
+
+/* name: GetProductMetadata :many */
+SELECT * FROM product_metadata;
diff --git a/internal/endtoend/testdata/inflection/mysql/schema.sql b/internal/endtoend/testdata/inflection/mysql/schema.sql
@@ -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);
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/query.sql.go
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql
@@ -9,3 +9,6 @@ SELECT * FROM product_meta;
 
 -- name: ListCalories :many
 SELECT * FROM calories;
+
+-- name: GetProductMetadata :many
+SELECT * FROM product_metadata;
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql
@@ -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);
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/query.sql.go
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql
@@ -9,3 +9,6 @@ SELECT * FROM product_meta;
 
 -- name: ListCalories :many
 SELECT * FROM calories;
+
+-- name: GetProductMetadata :many
+SELECT * FROM product_metadata;
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql
@@ -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);
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql b/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql
@@ -9,3 +9,6 @@ SELECT * FROM product_meta;
 
 -- name: ListCalories :many
 SELECT * FROM calories;
+
+-- name: GetProductMetadata :many
+SELECT * FROM product_metadata;
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql
@@ -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);
diff --git a/internal/endtoend/testdata/inflection/sqlite/go/models.go b/internal/endtoend/testdata/inflection/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go b/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
diff --git a/internal/endtoend/testdata/inflection/sqlite/query.sql b/internal/endtoend/testdata/inflection/sqlite/query.sql
@@ -9,3 +9,6 @@ SELECT * FROM product_meta;
 
 /* name: ListCalories :many */
 SELECT * FROM calories;
+
+/* name: GetProductMetadata :many */
+SELECT * FROM product_metadata;
diff --git a/internal/endtoend/testdata/inflection/sqlite/schema.sql b/internal/endtoend/testdata/inflection/sqlite/schema.sql
@@ -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);
diff --git a/internal/inflection/singular.go b/internal/inflection/singular.go
@@ -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)
 }