Skip to content

Commit a57c517

Browse files
committed
Prepend table names to the generated enum names
Otherwise we'll get a collision if a column name is shared for an enum table across two tables
1 parent ae0a1f8 commit a57c517

File tree

7 files changed

+36
-35
lines changed

7 files changed

+36
-35
lines changed

examples/booktest/mysql/models.go

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/booktest/mysql/query.sql.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/ondeck/mysql/models.go

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/ondeck/mysql/venue.sql.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sql/catalog/table.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package catalog
22

33
import (
44
"errors"
5+
"fmt"
56

67
"github.com/kyleconroy/sqlc/internal/sql/ast"
78
"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
@@ -162,7 +163,7 @@ func (c *Catalog) createTable(stmt *ast.CreateTableStmt) error {
162163
}
163164
if col.Vals != nil {
164165
typeName := ast.TypeName{
165-
Name: col.Colname,
166+
Name: fmt.Sprintf("%s_%s", stmt.Name.Name, col.Colname),
166167
}
167168
s := &ast.CreateEnumStmt{TypeName: &typeName, Vals: col.Vals}
168169
if err := c.createEnum(s); err != nil {

0 commit comments

Comments
 (0)