Skip to content

feat(generate): support yml extension #2828

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
merged 5 commits into from
Oct 12, 2023
Merged

feat(generate): support yml extension #2828

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b608f6
feat(generate): add support for .yml file extension
xsadia Oct 11, 2023
0acbec0
fix: rollback lint
xsadia Oct 11, 2023
436af33
fix: formatting
xsadia Oct 11, 2023
9254386
fix: formatting
xsadia Oct 11, 2023
dd14568
update yaml missing condition
xsadia Oct 11, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update yaml missing condition 
Co-authored-by: Nao Yonashiro <owan.orisano@gmail.com>
  • Loading branch information
@xsadia @orisano
xsadia and orisano authored Oct 11, 2023
commit dd14568c20ae70e25d3bdbd660052c4840e3f222
2 changes: 1 addition & 1 deletion internal/cmd/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func readConfig(stderr io.Writer, dir, filename string) (string, *config.Config,
return "", nil, errors.New("config file missing")
}

if !yamlMissing && !ymlMissing && !jsonMissing {
if (!yamlMissing || !ymlMissing) && !jsonMissing {
fmt.Fprintln(stderr, "error: both sqlc.json and sqlc.(yaml|yml) files present")
return "", nil, errors.New("sqlc.json and sqlc.(yaml|yml) present")
}
Expand Down