use alias

Author: sapk

internal/codegen/golang/result.go

@@ -123,7 +123,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(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
 	}
@@ -140,13 +140,16 @@ func newGoEmbed(embed *plugin.Identifier, structs []Struct, defaultSchema string
 		}
 
 		fields := make([]Field, len(s.Fields))
-		for i, f := range s.Fields {
-			fields[i] = f
+		copy(fields, s.Fields)
+
+		structName := s.Name
+		if s.Table.Name != columnName {
+			structName = columnName
 		}
 
 		return &goEmbed{
 			modelType: s.Name,
-			modelName: s.Name,
+			modelName: structName,
 			fields:    fields,
 		}
 	}
@@ -287,7 +290,7 @@ func buildQueries(req *plugin.GenerateRequest, options *opts.Options, structs []
 					columns = append(columns, goColumn{
 						id:     i,
 						Column: c,
-						embed:  newGoEmbed(c.EmbedTable, structs, req.Catalog.DefaultSchema),
+						embed:  newGoEmbed(c.Name, c.EmbedTable, structs, req.Catalog.DefaultSchema),
 					})
 				}
 				var err error

internal/compiler/output_columns.go

@@ -268,7 +268,7 @@ func (c *Compiler) outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, er
 				// add a column with a reference to an embedded table
 				if embed, ok := qc.embeds.Find(n); ok {
 					cols = append(cols, &Column{
-						Name:       embed.Table.Name,
+						Name:       embed.Name(),
 						EmbedTable: embed.Table,
 					})
 					continue

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

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

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

@@ -16,4 +16,8 @@ CREATE TABLE baz.users (
     name varchar(255) NOT NULL
 );
 
-
+CREATE TABLE user_links (
+  owner_id integer NOT NULL,
+  consumer_id integer NOT NULL,
+  PRIMARY KEY (owner_id, consumer_id)
+);

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

@@ -22,4 +22,13 @@ SELECT sqlc.embed(bu) FROM baz.users bu;
 
 -- name: WithCrossSchema :many
 SELECT sqlc.embed(users), sqlc.embed(bu) FROM users
-INNER JOIN baz.users bu ON users.id = bu.id;
+INNER JOIN baz.users bu ON users.id = bu.id;
+
+-- name: ListUserLink :many
+SELECT
+    sqlc.embed(owner),
+    sqlc.embed(consumer)
+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;

internal/endtoend/testdata/sqlc_embed/mysql/schema.sql

@@ -16,4 +16,8 @@ CREATE TABLE baz.users (
     name varchar(255) NOT NULL
 );
 
-
+CREATE TABLE user_links (
+  owner_id integer NOT NULL,
+  consumer_id integer NOT NULL,
+  PRIMARY KEY (owner_id, consumer_id)
+);