Skip to content

Commit 761bfc5

Browse files
cmoogkyleconroy
authored andcommitted
patches mysql goose command parsing
1 parent 79ec914 commit 761bfc5

File tree

5 files changed

+4
-63
lines changed

5 files changed

+4
-63
lines changed

internal/mysql/README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
# MySQL Support
22

3-
## Example Usage
4-
5-
```
6-
$ cd ./example
7-
$ sqlc unstable__mysql generate
8-
```
9-
103
## Missing Features
114

12-
- support for the `queries` field being specified as a directory of files
135
- missing many MySQL types and function returns types

internal/mysql/example/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

internal/mysql/example/queries.sql

Lines changed: 0 additions & 35 deletions
This file was deleted.

internal/mysql/example/sqlc.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

internal/mysql/parse.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"io"
66
"io/ioutil"
7-
"os"
87
"path/filepath"
98
"strings"
109

@@ -34,15 +33,15 @@ func parsePath(sqlPath string, inPkg string, s *Schema, settings dinosql.Generat
3433

3534
parsedQueries := []*Query{}
3635
for _, filename := range files {
37-
file, err := os.Open(filename)
36+
blob, err := ioutil.ReadFile(filename)
3837
if err != nil {
39-
return nil, fmt.Errorf("Failed to open file [%v]: %v", filename, err)
38+
return nil, fmt.Errorf("Failed to read file [%v]: %v", filename, err)
4039
}
41-
contents, err := ioutil.ReadAll(file)
40+
contents := dinosql.RemoveRollbackStatements(string(blob))
4241
if err != nil {
4342
return nil, fmt.Errorf("Failed to read contents of file [%v]: %v", filename, err)
4443
}
45-
queries, err := parseContents(filename, string(contents), s, settings)
44+
queries, err := parseContents(filename, contents, s, settings)
4645
if err != nil {
4746
return nil, err
4847
}

0 commit comments

Comments
 (0)