Skip to content

parser: Correctly handle single files #119

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 1 commit into from
Oct 29, 2019
Merged

parser: Correctly handle single files #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 19 additions & 15 deletions internal/dinosql/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,28 @@ func ParseCatalog(schema string) (core.Catalog, error) {
return core.Catalog{}, fmt.Errorf("path %s does not exist", schema)
}

var files []os.FileInfo
var files []string
if f.IsDir() {
files, err = ioutil.ReadDir(schema)
listing, err := ioutil.ReadDir(schema)
if err != nil {
return core.Catalog{}, err
}
for _, f := range listing {
files = append(files, filepath.Join(schema, f.Name()))
}
} else {
files = append(files, f)
files = append(files, schema)
}

merr := NewParserErr()
c := core.NewCatalog()
for _, f := range files {
if !strings.HasSuffix(f.Name(), ".sql") {
for _, filename := range files {
if !strings.HasSuffix(filename, ".sql") {
continue
}
if strings.HasPrefix(f.Name(), ".") {
if strings.HasPrefix(filepath.Base(filename), ".") {
continue
}
filename := filepath.Join(schema, f.Name())
blob, err := ioutil.ReadFile(filename)
if err != nil {
merr.Add(filename, "", 0, err)
Expand Down Expand Up @@ -174,26 +176,28 @@ func ParseQueries(c core.Catalog, settings GenerateSettings, pkg PackageSettings
return nil, fmt.Errorf("path %s does not exist", pkg.Queries)
}

var files []os.FileInfo
var files []string
if f.IsDir() {
files, err = ioutil.ReadDir(pkg.Queries)
listing, err := ioutil.ReadDir(pkg.Queries)
if err != nil {
return nil, err
}
for _, f := range listing {
files = append(files, filepath.Join(pkg.Queries, f.Name()))
}
} else {
files = append(files, f)
files = append(files, pkg.Queries)
}

merr := NewParserErr()
var q []*Query
for _, f := range files {
if !strings.HasSuffix(f.Name(), ".sql") {
for _, filename := range files {
if !strings.HasSuffix(filename, ".sql") {
continue
}
if strings.HasPrefix(f.Name(), ".") {
if strings.HasPrefix(filepath.Base(filename), ".") {
continue
}
filename := filepath.Join(pkg.Queries, f.Name())
blob, err := ioutil.ReadFile(filename)
if err != nil {
merr.Add(filename, "", 0, err)
Expand All @@ -212,7 +216,7 @@ func ParseQueries(c core.Catalog, settings GenerateSettings, pkg PackageSettings
merr.Add(filename, source, location(stmt), err)
continue
}
query.Filename = f.Name()
query.Filename = filepath.Base(filename)
if query != nil {
q = append(q, query)
}
Expand Down