add flag

Author: sapk

internal/cmd/shim.go

@@ -96,6 +96,7 @@ func pluginGoCode(s config.SQLGo) *plugin.GoCode {
 		EmitPointersForNullTypes:    s.EmitPointersForNullTypes,
 		EmitEnumValidMethod:         s.EmitEnumValidMethod,
 		EmitAllEnumValues:           s.EmitAllEnumValues,
+		EmitEmbedAlias:              s.EmitEmbedAlias,
 		JsonTagsCaseStyle:           s.JSONTagsCaseStyle,
 		Package:                     s.Package,
 		Out:                         s.Out,

internal/codegen/golang/gen.go

@@ -36,6 +36,7 @@ type tmplCtx struct {
 	EmitMethodsWithDBArgument bool
 	EmitEnumValidMethod       bool
 	EmitAllEnumValues         bool
+	EmitEmbedAlias            bool
 	UsesCopyFrom              bool
 	UsesBatch                 bool
 }
@@ -135,6 +136,7 @@ func generate(req *plugin.CodeGenRequest, enums []Enum, structs []Struct, querie
 		EmitMethodsWithDBArgument: golang.EmitMethodsWithDbArgument,
 		EmitEnumValidMethod:       golang.EmitEnumValidMethod,
 		EmitAllEnumValues:         golang.EmitAllEnumValues,
+		EmitEmbedAlias:            golang.EmitEmbedAlias,
 		UsesCopyFrom:              usesCopyFrom(queries),
 		UsesBatch:                 usesBatch(queries),
 		SQLDriver:                 parseDriver(golang.SqlPackage),

internal/codegen/golang/result.go

@@ -122,13 +122,13 @@ 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(columnName string, embed *plugin.Identifier, structs []Struct, defaultSchema string) *goEmbed {
+func newGoEmbed(req *plugin.CodeGenRequest, columnName string, embed *plugin.Identifier, structs []Struct) *goEmbed {
 	if embed == nil {
 		return nil
 	}
 
 	for _, s := range structs {
-		embedSchema := defaultSchema
+		embedSchema := req.Catalog.DefaultSchema
 		if embed.Schema != "" {
 			embedSchema = embed.Schema
 		}
@@ -142,7 +142,7 @@ func newGoEmbed(columnName string, embed *plugin.Identifier, structs []Struct, d
 		copy(fields, s.Fields)
 
 		structName := s.Name
-		if s.Table.Name != columnName {
+		if req.Settings.Go.EmitEmbedAlias && s.Table.Name != columnName {
 			structName = columnName
 		}
 
@@ -291,7 +291,7 @@ func buildQueries(req *plugin.CodeGenRequest, structs []Struct) ([]Query, error)
 					columns = append(columns, goColumn{
 						id:     i,
 						Column: c,
-						embed:  newGoEmbed(c.Name, c.EmbedTable, structs, req.Catalog.DefaultSchema),
+						embed:  newGoEmbed(req, c.Name, c.EmbedTable, structs),
 					})
 				}
 				var err error

internal/config/config.go

@@ -145,6 +145,7 @@ type SQLGo struct {
 	EmitEnumValidMethod         bool              `json:"emit_enum_valid_method,omitempty" yaml:"emit_enum_valid_method"`
 	EmitAllEnumValues           bool              `json:"emit_all_enum_values,omitempty" yaml:"emit_all_enum_values"`
 	JSONTagsCaseStyle           string            `json:"json_tags_case_style,omitempty" yaml:"json_tags_case_style"`
+	EmitEmbedAlias              bool              `json:"emit_embed_alias,omitempty" yaml:"emit_embed_alias"`
 	Package                     string            `json:"package" yaml:"package"`
 	Out                         string            `json:"out" yaml:"out"`
 	Overrides                   []Override        `json:"overrides,omitempty" yaml:"overrides"`

internal/config/v_one.go

@@ -39,6 +39,7 @@ type v1PackageSettings struct {
 	EmitPointersForNullTypes  bool       `json:"emit_pointers_for_null_types" yaml:"emit_pointers_for_null_types"`
 	EmitEnumValidMethod       bool       `json:"emit_enum_valid_method,omitempty" yaml:"emit_enum_valid_method"`
 	EmitAllEnumValues         bool       `json:"emit_all_enum_values,omitempty" yaml:"emit_all_enum_values"`
+	EmitEmbedAlias            bool       `json:"emit_embed_alias,omitempty" yaml:"emit_embed_alias"`
 	JSONTagsCaseStyle         string     `json:"json_tags_case_style,omitempty" yaml:"json_tags_case_style"`
 	SQLPackage                string     `json:"sql_package" yaml:"sql_package"`
 	SQLDriver                 string     `json:"sql_driver" yaml:"sql_driver"`
@@ -163,6 +164,7 @@ func (c *V1GenerateSettings) Translate() Config {
 					EmitPointersForNullTypes:  pkg.EmitPointersForNullTypes,
 					EmitEnumValidMethod:       pkg.EmitEnumValidMethod,
 					EmitAllEnumValues:         pkg.EmitAllEnumValues,
+					EmitEmbedAlias:            pkg.EmitEmbedAlias,
 					Package:                   pkg.Name,
 					Out:                       pkg.Path,
 					SQLPackage:                pkg.SQLPackage,

internal/endtoend/testdata/codegen_json/gen/codegen.json

@@ -42,7 +42,8 @@
       "query_parameter_limit": 1,
       "output_batch_file_name": "",
       "json_tags_id_uppercase": false,
-      "omit_unused_structs": false
+      "omit_unused_structs": false,
+      "emit_embed_alias": false
     },
     "json": {
       "out": "gen",

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

@@ -16,11 +16,6 @@ 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)
-);
 
 -- name: Only :one
 SELECT sqlc.embed(users) FROM users;
@@ -46,13 +41,4 @@ 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;
-
--- 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;
+INNER JOIN baz.users bu ON users.id = bu.id;