remove bonuses to special table name list

sqlc-dev · Oct 19, 2024 · 4072241 · 4072241
1 parent 39d65ae
commit 4072241
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 146 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
@@ -11,7 +11,4 @@ SELECT * FROM product_meta;
 SELECT * FROM calories;
 
 /* name: GetProductMetadata :many */
-SELECT * FROM product_metadata;
-
-/* name: GetBonuses :many */
-SELECT * FROM bonuses;
+SELECT * FROM product_metadata;
diff --git a/internal/endtoend/testdata/inflection/mysql/schema.sql b/internal/endtoend/testdata/inflection/mysql/schema.sql
@@ -3,5 +3,3 @@ 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);
-CREATE TABLE bonuses (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
@@ -11,7 +11,4 @@ SELECT * FROM product_meta;
 SELECT * FROM calories;
 
 -- name: GetProductMetadata :many
-SELECT * FROM product_metadata;
-
--- name: GetBonuses :many
-SELECT * FROM bonuses;
+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,5 +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);
-CREATE TABLE bonuses (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
@@ -11,7 +11,4 @@ SELECT * FROM product_meta;
 SELECT * FROM calories;
 
 -- name: GetProductMetadata :many
-SELECT * FROM product_metadata;
-
--- name: GetBonuses :many
-SELECT * FROM bonuses;
+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,5 +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);
-CREATE TABLE bonuses (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
@@ -11,7 +11,4 @@ SELECT * FROM product_meta;
 SELECT * FROM calories;
 
 -- name: GetProductMetadata :many
-SELECT * FROM product_metadata;
-
--- name: GetBonuses :many
-SELECT * FROM bonuses;
+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,5 +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);
-CREATE TABLE bonuses (id text not null);
+CREATE TABLE product_metadata (id text not null);
diff --git a/internal/inflection/singular.go b/internal/inflection/singular.go
@@ -44,10 +44,6 @@ func Singular(s SingularParams) string {
 		return "wave"
 	}
 
-	if strings.ToLower(s.Name) == "bonuses" {
-		return "bonus"
-	}
-
 	if strings.ToLower(s.Name) == "metadata" {
 		return "metadata"
 	}