FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix: deduplicate enum constant names that collapse to the same identifier by alliasgher · Pull Request #4519 · sqlc-dev/sqlc · GitHub

/ sqlc Public

fix: deduplicate enum constant names that collapse to the same identifier #4519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alliasgher wants to merge 1 commit into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 0 Commits 1 Checks 12 Files changed
Open

fix: deduplicate enum constant names that collapse to the same identifier #4519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .go  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 12 additions & 3 deletions internal/codegen/golang/result.go
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,24 @@ func buildEnums(req *plugin.GenerateRequest, options *opts.Options) []Enum {
seen := make(map[string]struct{}, len(enum.Vals))
for i, v := range enum.Vals {
value := EnumReplace(v)
if _, found := seen[value]; found || value == "" {
if value == "" {
value = fmt.Sprintf("value_%d", i)
}
// Dedup on the final constant name, not on EnumReplace(v):
// StructName further collapses characters (e.g. a trailing "_"),
// so distinct EnumReplace outputs like "A" and "A_" (from "A+"
// and "A-") can still map to the same constant name.
name := StructName(enumName+"_"+value, options)
if _, found := seen[name]; found {
value = fmt.Sprintf("value_%d", i)
name = StructName(enumName+"_"+value, options)
}
e.Constants = append(e.Constants, Constant{
Name: StructName(enumName+"_"+value, options),
Name: name,
Value: v,
Type: e.Name,
})
seen[value] = struct{}{}
seen[name] = struct{}{}
}
enums = append(enums, e)
}
Expand Down
40 changes: 40 additions & 0 deletions internal/codegen/golang/result_test.go
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package golang
import (
"testing"

"github.com/sqlc-dev/sqlc/internal/codegen/golang/opts"
"github.com/sqlc-dev/sqlc/internal/metadata"
"github.com/sqlc-dev/sqlc/internal/plugin"
)
Expand Down Expand Up @@ -76,3 +77,42 @@ func TestPutOutColumns_AlwaysTrueWhenQueryHasColumns(t *testing.T) {
t.Error("should be true when we have columns")
}
}

// TestBuildEnums_DeduplicatesConstantNames covers enum values that differ only
// by characters that get stripped or collapsed when building a Go identifier
// (e.g. "A+" and "A-"), which previously produced duplicate constant names and
// uncompilable output.
func TestBuildEnums_DeduplicatesConstantNames(t *testing.T) {
req := &plugin.GenerateRequest{
Catalog: &plugin.Catalog{
DefaultSchema: "public",
Schemas: []*plugin.Schema{
{
Name: "public",
Enums: []*plugin.Enum{
{
Name: "blood_group_type",
Vals: []string{"A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-"},
},
},
},
},
},
}

enums := buildEnums(req, &opts.Options{})
if len(enums) != 1 {
t.Fatalf("expected 1 enum, got %d", len(enums))
}
if got := len(enums[0].Constants); got != 8 {
t.Fatalf("expected 8 constants, got %d", got)
}

seen := make(map[string]string, 8)
for _, c := range enums[0].Constants {
if prev, dup := seen[c.Name]; dup {
t.Errorf("duplicate constant name %q for values %q and %q", c.Name, prev, c.Value)
}
seen[c.Name] = c.Value
}
}
Loading
Back | FazBrowse Home | New Git URL