From f3c2a8cd0b4ed7c984427bd4efd1ae018ddec5cb Mon Sep 17 00:00:00 2001
From: qanghaa <quanghahl315@gmail.com>
Date: Sun, 18 Aug 2024 14:58:18 +0700
Subject: [PATCH 1/3] fix incorrect generate model names for "bonuses" and
 "metadata"

---
 .../testdata/inflection/mysql/go/models.go    |  8 +++
 .../testdata/inflection/mysql/go/query.sql.go | 54 +++++++++++++++++++
 .../testdata/inflection/mysql/query.sql       |  6 +++
 .../testdata/inflection/mysql/schema.sql      |  2 +
 .../inflection/postgresql/pgx/v4/go/models.go |  8 +++
 .../postgresql/pgx/v4/go/query.sql.go         | 48 +++++++++++++++++
 .../inflection/postgresql/pgx/v4/query.sql    |  6 +++
 .../inflection/postgresql/pgx/v4/schema.sql   |  3 +-
 .../inflection/postgresql/pgx/v5/go/models.go |  8 +++
 .../postgresql/pgx/v5/go/query.sql.go         | 48 +++++++++++++++++
 .../inflection/postgresql/pgx/v5/query.sql    |  6 +++
 .../inflection/postgresql/pgx/v5/schema.sql   |  3 +-
 .../inflection/postgresql/stdlib/go/models.go |  8 +++
 .../postgresql/stdlib/go/query.sql.go         | 54 +++++++++++++++++++
 .../inflection/postgresql/stdlib/query.sql    |  6 +++
 .../inflection/postgresql/stdlib/schema.sql   |  3 +-
 .../testdata/inflection/sqlite/go/models.go   |  8 +++
 .../inflection/sqlite/go/query.sql.go         | 54 +++++++++++++++++++
 .../testdata/inflection/sqlite/query.sql      |  6 +++
 .../testdata/inflection/sqlite/schema.sql     |  3 +-
 internal/inflection/singular.go               |  9 ++++
 21 files changed, 347 insertions(+), 4 deletions(-)

diff --git a/internal/endtoend/testdata/inflection/mysql/go/models.go b/internal/endtoend/testdata/inflection/mysql/go/models.go
index cc60f36582..522598a8e1 100644
--- a/internal/endtoend/testdata/inflection/mysql/go/models.go
+++ b/internal/endtoend/testdata/inflection/mysql/go/models.go
@@ -4,6 +4,10 @@
 
 package querytest
 
+type Bonuse struct {
+	ID string
+}
+
 type Calorie struct {
 	ID string
 }
@@ -12,6 +16,10 @@ type Campus struct {
 	ID string
 }
 
+type ProductMetadatum struct {
+	ID string
+}
+
 type ProductMetum struct {
 	ID string
 }
diff --git a/internal/endtoend/testdata/inflection/mysql/go/query.sql.go b/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
index f6282cceed..b2a2c5c6a3 100644
--- a/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
@@ -9,6 +9,60 @@ import (
 	"context"
 )
 
+const getBonuses = `-- name: GetBonuses :many
+SELECT id FROM bonuses
+`
+
+func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, getBonuses)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getProductMetadata = `-- name: GetProductMetadata :many
+SELECT id FROM product_metadata
+`
+
+func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, getProductMetadata)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const listCalories = `-- name: ListCalories :many
 SELECT id FROM calories
 `
diff --git a/internal/endtoend/testdata/inflection/mysql/query.sql b/internal/endtoend/testdata/inflection/mysql/query.sql
index e3917086b9..8a5e469a7c 100644
--- a/internal/endtoend/testdata/inflection/mysql/query.sql
+++ b/internal/endtoend/testdata/inflection/mysql/query.sql
@@ -9,3 +9,9 @@ SELECT * FROM product_meta;
 
 /* name: ListCalories :many */
 SELECT * FROM calories;
+
+/* name: GetProductMetadata :many */
+SELECT * FROM product_metadata;
+
+/* name: GetBonuses :many */
+SELECT * FROM bonuses;
diff --git a/internal/endtoend/testdata/inflection/mysql/schema.sql b/internal/endtoend/testdata/inflection/mysql/schema.sql
index b0d88c8695..716bab0f58 100644
--- a/internal/endtoend/testdata/inflection/mysql/schema.sql
+++ b/internal/endtoend/testdata/inflection/mysql/schema.sql
@@ -2,4 +2,6 @@ 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);
 
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go
index cc60f36582..522598a8e1 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go
@@ -4,6 +4,10 @@
 
 package querytest
 
+type Bonuse struct {
+	ID string
+}
+
 type Calorie struct {
 	ID string
 }
@@ -12,6 +16,10 @@ type Campus struct {
 	ID string
 }
 
+type ProductMetadatum struct {
+	ID string
+}
+
 type ProductMetum struct {
 	ID string
 }
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
index 2791144914..43c47c44c9 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/query.sql.go
@@ -9,6 +9,54 @@ import (
 	"context"
 )
 
+const getBonuses = `-- name: GetBonuses :many
+SELECT id FROM bonuses
+`
+
+func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
+	rows, err := q.db.Query(ctx, getBonuses)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getProductMetadata = `-- name: GetProductMetadata :many
+SELECT id FROM product_metadata
+`
+
+func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
+	rows, err := q.db.Query(ctx, getProductMetadata)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const listCalories = `-- name: ListCalories :many
 SELECT id FROM calories
 `
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql
index 6e2828d458..6d21f4f4c5 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql
@@ -9,3 +9,9 @@ SELECT * FROM product_meta;
 
 -- name: ListCalories :many
 SELECT * FROM calories;
+
+-- name: GetProductMetadata :many
+SELECT * FROM product_metadata;
+
+-- name: GetBonuses :many
+SELECT * FROM bonuses;
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql
index b0d88c8695..9cba1b565b 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql
@@ -2,4 +2,5 @@ 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);
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go
index cc60f36582..522598a8e1 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go
@@ -4,6 +4,10 @@
 
 package querytest
 
+type Bonuse struct {
+	ID string
+}
+
 type Calorie struct {
 	ID string
 }
@@ -12,6 +16,10 @@ type Campus struct {
 	ID string
 }
 
+type ProductMetadatum struct {
+	ID string
+}
+
 type ProductMetum struct {
 	ID string
 }
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
index 2791144914..43c47c44c9 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/query.sql.go
@@ -9,6 +9,54 @@ import (
 	"context"
 )
 
+const getBonuses = `-- name: GetBonuses :many
+SELECT id FROM bonuses
+`
+
+func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
+	rows, err := q.db.Query(ctx, getBonuses)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getProductMetadata = `-- name: GetProductMetadata :many
+SELECT id FROM product_metadata
+`
+
+func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
+	rows, err := q.db.Query(ctx, getProductMetadata)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const listCalories = `-- name: ListCalories :many
 SELECT id FROM calories
 `
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql
index 6e2828d458..6d21f4f4c5 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql
@@ -9,3 +9,9 @@ SELECT * FROM product_meta;
 
 -- name: ListCalories :many
 SELECT * FROM calories;
+
+-- name: GetProductMetadata :many
+SELECT * FROM product_metadata;
+
+-- name: GetBonuses :many
+SELECT * FROM bonuses;
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql
index b0d88c8695..9cba1b565b 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql
@@ -2,4 +2,5 @@ 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);
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go
index cc60f36582..522598a8e1 100644
--- a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go
+++ b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go
@@ -4,6 +4,10 @@
 
 package querytest
 
+type Bonuse struct {
+	ID string
+}
+
 type Calorie struct {
 	ID string
 }
@@ -12,6 +16,10 @@ type Campus struct {
 	ID string
 }
 
+type ProductMetadatum struct {
+	ID string
+}
+
 type ProductMetum struct {
 	ID string
 }
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
index f6282cceed..b2a2c5c6a3 100644
--- a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
@@ -9,6 +9,60 @@ import (
 	"context"
 )
 
+const getBonuses = `-- name: GetBonuses :many
+SELECT id FROM bonuses
+`
+
+func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, getBonuses)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getProductMetadata = `-- name: GetProductMetadata :many
+SELECT id FROM product_metadata
+`
+
+func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, getProductMetadata)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const listCalories = `-- name: ListCalories :many
 SELECT id FROM calories
 `
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql b/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql
index 6e2828d458..6d21f4f4c5 100644
--- a/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql
+++ b/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql
@@ -9,3 +9,9 @@ SELECT * FROM product_meta;
 
 -- name: ListCalories :many
 SELECT * FROM calories;
+
+-- name: GetProductMetadata :many
+SELECT * FROM product_metadata;
+
+-- name: GetBonuses :many
+SELECT * FROM bonuses;
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql
index b0d88c8695..9cba1b565b 100644
--- a/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql
+++ b/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql
@@ -2,4 +2,5 @@ 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);
diff --git a/internal/endtoend/testdata/inflection/sqlite/go/models.go b/internal/endtoend/testdata/inflection/sqlite/go/models.go
index cc60f36582..522598a8e1 100644
--- a/internal/endtoend/testdata/inflection/sqlite/go/models.go
+++ b/internal/endtoend/testdata/inflection/sqlite/go/models.go
@@ -4,6 +4,10 @@
 
 package querytest
 
+type Bonuse struct {
+	ID string
+}
+
 type Calorie struct {
 	ID string
 }
@@ -12,6 +16,10 @@ type Campus struct {
 	ID string
 }
 
+type ProductMetadatum struct {
+	ID string
+}
+
 type ProductMetum struct {
 	ID string
 }
diff --git a/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go b/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
index f6282cceed..b2a2c5c6a3 100644
--- a/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
@@ -9,6 +9,60 @@ import (
 	"context"
 )
 
+const getBonuses = `-- name: GetBonuses :many
+SELECT id FROM bonuses
+`
+
+func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, getBonuses)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getProductMetadata = `-- name: GetProductMetadata :many
+SELECT id FROM product_metadata
+`
+
+func (q *Queries) GetProductMetadata(ctx context.Context) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, getProductMetadata)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const listCalories = `-- name: ListCalories :many
 SELECT id FROM calories
 `
diff --git a/internal/endtoend/testdata/inflection/sqlite/query.sql b/internal/endtoend/testdata/inflection/sqlite/query.sql
index e3917086b9..8a5e469a7c 100644
--- a/internal/endtoend/testdata/inflection/sqlite/query.sql
+++ b/internal/endtoend/testdata/inflection/sqlite/query.sql
@@ -9,3 +9,9 @@ SELECT * FROM product_meta;
 
 /* name: ListCalories :many */
 SELECT * FROM calories;
+
+/* name: GetProductMetadata :many */
+SELECT * FROM product_metadata;
+
+/* name: GetBonuses :many */
+SELECT * FROM bonuses;
diff --git a/internal/endtoend/testdata/inflection/sqlite/schema.sql b/internal/endtoend/testdata/inflection/sqlite/schema.sql
index b0d88c8695..9cba1b565b 100644
--- a/internal/endtoend/testdata/inflection/sqlite/schema.sql
+++ b/internal/endtoend/testdata/inflection/sqlite/schema.sql
@@ -2,4 +2,5 @@ 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);
diff --git a/internal/inflection/singular.go b/internal/inflection/singular.go
index edac927603..739743b4e5 100644
--- a/internal/inflection/singular.go
+++ b/internal/inflection/singular.go
@@ -43,5 +43,14 @@ func Singular(s SingularParams) string {
 	if strings.ToLower(s.Name) == "waves" {
 		return "wave"
 	}
+
+	if strings.ToLower(s.Name) == "bonuses" {
+		return "bonus"
+	}
+
+	if strings.ToLower(s.Name) == "metadata" {
+		return "metadata"
+	}
+
 	return upstream.Singular(s.Name)
 }

From 3f67f732fa3eba25127990993721f6cbb65f1d9a Mon Sep 17 00:00:00 2001
From: qanghaa <quanghahl315@gmail.com>
Date: Sat, 19 Oct 2024 11:43:14 +0700
Subject: [PATCH 2/3] remove bonuses to special table name list

---
 .../testdata/inflection/sqlite/go/models.go   |  4 ---
 .../inflection/sqlite/go/query.sql.go         | 27 -------------------
 .../testdata/inflection/sqlite/query.sql      |  5 +---
 .../testdata/inflection/sqlite/schema.sql     |  3 +--
 4 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/internal/endtoend/testdata/inflection/sqlite/go/models.go b/internal/endtoend/testdata/inflection/sqlite/go/models.go
index 522598a8e1..1fa48e00f3 100644
--- a/internal/endtoend/testdata/inflection/sqlite/go/models.go
+++ b/internal/endtoend/testdata/inflection/sqlite/go/models.go
@@ -4,10 +4,6 @@
 
 package querytest
 
-type Bonuse struct {
-	ID string
-}
-
 type Calorie struct {
 	ID string
 }
diff --git a/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go b/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
index b2a2c5c6a3..c33eea852e 100644
--- a/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/sqlite/go/query.sql.go
@@ -9,33 +9,6 @@ import (
 	"context"
 )
 
-const getBonuses = `-- name: GetBonuses :many
-SELECT id FROM bonuses
-`
-
-func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
-	rows, err := q.db.QueryContext(ctx, getBonuses)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []string
-	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
-			return nil, err
-		}
-		items = append(items, id)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getProductMetadata = `-- name: GetProductMetadata :many
 SELECT id FROM product_metadata
 `
diff --git a/internal/endtoend/testdata/inflection/sqlite/query.sql b/internal/endtoend/testdata/inflection/sqlite/query.sql
index 8a5e469a7c..74e1aaf8c3 100644
--- a/internal/endtoend/testdata/inflection/sqlite/query.sql
+++ b/internal/endtoend/testdata/inflection/sqlite/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;
\ No newline at end of file
diff --git a/internal/endtoend/testdata/inflection/sqlite/schema.sql b/internal/endtoend/testdata/inflection/sqlite/schema.sql
index 9cba1b565b..ad17ad7427 100644
--- a/internal/endtoend/testdata/inflection/sqlite/schema.sql
+++ b/internal/endtoend/testdata/inflection/sqlite/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);
\ No newline at end of file

From 17fea6024706af5bdb8a9ea7eb5ab15a60a8cfeb Mon Sep 17 00:00:00 2001
From: qanghaa <quanghahl315@gmail.com>
Date: Sat, 19 Oct 2024 11:44:16 +0700
Subject: [PATCH 3/3] remove bonuses to special table name list

---
 .../testdata/inflection/mysql/go/models.go    |  4 ---
 .../testdata/inflection/mysql/go/query.sql.go | 27 -------------------
 .../testdata/inflection/mysql/query.sql       |  5 +---
 .../testdata/inflection/mysql/schema.sql      |  2 --
 .../inflection/postgresql/pgx/v4/go/models.go |  4 ---
 .../postgresql/pgx/v4/go/query.sql.go         | 24 -----------------
 .../inflection/postgresql/pgx/v4/query.sql    |  5 +---
 .../inflection/postgresql/pgx/v4/schema.sql   |  3 +--
 .../inflection/postgresql/pgx/v5/go/models.go |  4 ---
 .../postgresql/pgx/v5/go/query.sql.go         | 24 -----------------
 .../inflection/postgresql/pgx/v5/query.sql    |  5 +---
 .../inflection/postgresql/pgx/v5/schema.sql   |  3 +--
 .../inflection/postgresql/stdlib/go/models.go |  4 ---
 .../postgresql/stdlib/go/query.sql.go         | 27 -------------------
 .../inflection/postgresql/stdlib/query.sql    |  5 +---
 .../inflection/postgresql/stdlib/schema.sql   |  3 +--
 internal/inflection/singular.go               |  4 ---
 17 files changed, 7 insertions(+), 146 deletions(-)

diff --git a/internal/endtoend/testdata/inflection/mysql/go/models.go b/internal/endtoend/testdata/inflection/mysql/go/models.go
index 522598a8e1..1fa48e00f3 100644
--- a/internal/endtoend/testdata/inflection/mysql/go/models.go
+++ b/internal/endtoend/testdata/inflection/mysql/go/models.go
@@ -4,10 +4,6 @@
 
 package querytest
 
-type Bonuse struct {
-	ID string
-}
-
 type Calorie struct {
 	ID string
 }
diff --git a/internal/endtoend/testdata/inflection/mysql/go/query.sql.go b/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
index b2a2c5c6a3..c33eea852e 100644
--- a/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/mysql/go/query.sql.go
@@ -9,33 +9,6 @@ import (
 	"context"
 )
 
-const getBonuses = `-- name: GetBonuses :many
-SELECT id FROM bonuses
-`
-
-func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
-	rows, err := q.db.QueryContext(ctx, getBonuses)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []string
-	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
-			return nil, err
-		}
-		items = append(items, id)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getProductMetadata = `-- name: GetProductMetadata :many
 SELECT id FROM product_metadata
 `
diff --git a/internal/endtoend/testdata/inflection/mysql/query.sql b/internal/endtoend/testdata/inflection/mysql/query.sql
index 8a5e469a7c..74e1aaf8c3 100644
--- 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;
\ No newline at end of file
diff --git a/internal/endtoend/testdata/inflection/mysql/schema.sql b/internal/endtoend/testdata/inflection/mysql/schema.sql
index 716bab0f58..f7d5c7c2a5 100644
--- 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
index 522598a8e1..1fa48e00f3 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/models.go
@@ -4,10 +4,6 @@
 
 package querytest
 
-type Bonuse struct {
-	ID string
-}
-
 type Calorie struct {
 	ID string
 }
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
index 43c47c44c9..31a5440758 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/go/query.sql.go
@@ -9,30 +9,6 @@ import (
 	"context"
 )
 
-const getBonuses = `-- name: GetBonuses :many
-SELECT id FROM bonuses
-`
-
-func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
-	rows, err := q.db.Query(ctx, getBonuses)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []string
-	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
-			return nil, err
-		}
-		items = append(items, id)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getProductMetadata = `-- name: GetProductMetadata :many
 SELECT id FROM product_metadata
 `
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/query.sql
index 6d21f4f4c5..abc0da2ef2 100644
--- 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;
\ No newline at end of file
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v4/schema.sql
index 9cba1b565b..ad17ad7427 100644
--- 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);
\ No newline at end of file
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go
index 522598a8e1..1fa48e00f3 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/models.go
@@ -4,10 +4,6 @@
 
 package querytest
 
-type Bonuse struct {
-	ID string
-}
-
 type Calorie struct {
 	ID string
 }
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
index 43c47c44c9..31a5440758 100644
--- a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/go/query.sql.go
@@ -9,30 +9,6 @@ import (
 	"context"
 )
 
-const getBonuses = `-- name: GetBonuses :many
-SELECT id FROM bonuses
-`
-
-func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
-	rows, err := q.db.Query(ctx, getBonuses)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []string
-	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
-			return nil, err
-		}
-		items = append(items, id)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getProductMetadata = `-- name: GetProductMetadata :many
 SELECT id FROM product_metadata
 `
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/query.sql
index 6d21f4f4c5..abc0da2ef2 100644
--- 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;
\ No newline at end of file
diff --git a/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/inflection/postgresql/pgx/v5/schema.sql
index 9cba1b565b..ad17ad7427 100644
--- 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);
\ No newline at end of file
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go
index 522598a8e1..1fa48e00f3 100644
--- a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go
+++ b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/models.go
@@ -4,10 +4,6 @@
 
 package querytest
 
-type Bonuse struct {
-	ID string
-}
-
 type Calorie struct {
 	ID string
 }
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
index b2a2c5c6a3..c33eea852e 100644
--- a/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/inflection/postgresql/stdlib/go/query.sql.go
@@ -9,33 +9,6 @@ import (
 	"context"
 )
 
-const getBonuses = `-- name: GetBonuses :many
-SELECT id FROM bonuses
-`
-
-func (q *Queries) GetBonuses(ctx context.Context) ([]string, error) {
-	rows, err := q.db.QueryContext(ctx, getBonuses)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []string
-	for rows.Next() {
-		var id string
-		if err := rows.Scan(&id); err != nil {
-			return nil, err
-		}
-		items = append(items, id)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const getProductMetadata = `-- name: GetProductMetadata :many
 SELECT id FROM product_metadata
 `
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql b/internal/endtoend/testdata/inflection/postgresql/stdlib/query.sql
index 6d21f4f4c5..abc0da2ef2 100644
--- 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;
\ No newline at end of file
diff --git a/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/inflection/postgresql/stdlib/schema.sql
index 9cba1b565b..ad17ad7427 100644
--- 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);
\ No newline at end of file
diff --git a/internal/inflection/singular.go b/internal/inflection/singular.go
index 739743b4e5..64e042a6ab 100644
--- 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"
 	}