Skip to content

internal/dinosql: Error on duplicate query names #221

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

Merged
kyleconroy merged 2 commits into from
Dec 27, 2019
+8 −1
Merged

internal/dinosql: Error on duplicate query names #221

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f22b765
internal/dinosql: Error on duplicate query names
kyleconroy Dec 27, 2019
049f34d
Only check for duplicates if name is not empty
kyleconroy Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/dinosql/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ func ParseQueries(c core.Catalog, settings GenerateSettings, pkg PackageSettings

merr := NewParserErr()
var q []*Query
set := map[string]struct{}{}
for _, filename := range files {
if !strings.HasSuffix(filename, ".sql") {
continue
Expand All @@ -221,7 +222,6 @@ func ParseQueries(c core.Catalog, settings GenerateSettings, pkg PackageSettings
continue
}
for _, stmt := range tree.Statements {
// line, col := location(source, stmt)
query, err := parseQuery(c, stmt, source)
if err == errUnsupportedStatementType {
continue
Expand All @@ -230,6 +230,13 @@ func ParseQueries(c core.Catalog, settings GenerateSettings, pkg PackageSettings
merr.Add(filename, source, location(stmt), err)
continue
}
if query.Name != "" {
if _, exists := set[query.Name]; exists {
merr.Add(filename, source, location(stmt), fmt.Errorf("duplicate query name: %s", query.Name))
continue
}
set[query.Name] = struct{}{}
}
query.Filename = filepath.Base(filename)
if query != nil {
q = append(q, query)
Expand Down