keep plural when not matching table name

Author: sapk

internal/codegen/golang/result.go

@@ -122,7 +122,7 @@ type goEmbed struct {
 
 // look through all the structs and attempt to find a matching one to embed
 // We need the name of the struct and its field names.
-func newGoEmbed(req *plugin.CodeGenRequest, tableName string, embed *plugin.Identifier, structs []Struct, defaultSchema string) *goEmbed {
+func newGoEmbed(columnName string, embed *plugin.Identifier, structs []Struct, defaultSchema string) *goEmbed {
 	if embed == nil {
 		return nil
 	}
@@ -141,12 +141,9 @@ func newGoEmbed(req *plugin.CodeGenRequest, tableName string, embed *plugin.Iden
 		fields := make([]Field, len(s.Fields))
 		copy(fields, s.Fields)
 
-		structName := tableName
-		if !req.Settings.Go.EmitExactTableNames {
-			structName = inflection.Singular(inflection.SingularParams{
-				Name:       structName,
-				Exclusions: req.Settings.Go.InflectionExcludeTableNames,
-			})
+		structName := s.Name
+		if s.Table.Name != columnName {
+			structName = columnName
 		}
 
 		return &goEmbed{
@@ -294,7 +291,7 @@ func buildQueries(req *plugin.CodeGenRequest, structs []Struct) ([]Query, error)
 					columns = append(columns, goColumn{
 						id:     i,
 						Column: c,
-						embed:  newGoEmbed(req, c.Name, c.EmbedTable, structs, req.Catalog.DefaultSchema),
+						embed:  newGoEmbed(c.Name, c.EmbedTable, structs, req.Catalog.DefaultSchema),
 					})
 				}
 				var err error

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

@@ -51,8 +51,8 @@ INNER JOIN baz.users bu ON users.id = bu.id;
 -- name: ListUserLink :many
 SELECT
     sqlc.embed(owner),
-    sqlc.embed(consumer)
+    sqlc.embed(consumers)
 FROM
     user_links
     INNER JOIN users AS owner ON owner.id = user_links.owner_id
-    INNER JOIN users AS consumer ON consumer.id = user_links.consumer_id;
+    INNER JOIN users AS consumers ON consumers.id = user_links.consumer_id;