diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-03-02 11:07:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 11:07:30 -0500 |
| commit | 571bc9bf2efa841b29bf036f4d307664bfbe155d (patch) | |
| tree | 41fb3a459db99d1f0ec2ed2e00d4ca580a5d0c46 /internal/sqlparse | |
| parent | Update readme (diff) | |
| parent | Remove Latest() from migration fs repo in favor of using List on service (diff) | |
| download | cli-571bc9bf2efa841b29bf036f4d307664bfbe155d.zip | |
Merge pull request #1 from eugenetriguba/0.3.0
Diffstat (limited to '')
| -rw-r--r-- | internal/sqlparse/sqlparse.go | 19 | ||||
| -rw-r--r-- | internal/sqlparse/sqlparse_test.go | 64 |
2 files changed, 58 insertions, 25 deletions
diff --git a/internal/sqlparse/sqlparse.go b/internal/sqlparse/sqlparse.go index 9ded618..e986068 100644 --- a/internal/sqlparse/sqlparse.go +++ b/internal/sqlparse/sqlparse.go @@ -2,26 +2,29 @@ package sqlparse import ( "bufio" + "fmt" "io" "strings" ) -type SqlParser struct { - reader io.Reader +type SqlParser interface { + Parse(reader io.Reader) (ExecutionOptions, error) } type ExecutionOptions struct { UseTransaction bool } -func NewSqlParser(reader io.Reader) *SqlParser { - return &SqlParser{reader: reader} +type sqlParser struct{} + +func NewSqlParser() SqlParser { + return sqlParser{} } -func (sp *SqlParser) Parse() (*ExecutionOptions, error) { - options := &ExecutionOptions{UseTransaction: true} +func (sp sqlParser) Parse(reader io.Reader) (ExecutionOptions, error) { + options := ExecutionOptions{UseTransaction: true} - scanner := bufio.NewScanner(sp.reader) + scanner := bufio.NewScanner(reader) if scanner.Scan() { firstLine := strings.ToLower(strings.TrimSpace(scanner.Text())) if strings.HasPrefix(firstLine, "-- bolt:") { @@ -37,7 +40,7 @@ func (sp *SqlParser) Parse() (*ExecutionOptions, error) { } if err := scanner.Err(); err != nil { - return nil, err + return options, fmt.Errorf("parsing sql file encountered an error: %w", err) } return options, nil diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 51b93b1..12a435d 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -1,56 +1,86 @@ package sqlparse_test import ( + "bytes" + "errors" + "io" "strings" "testing" "github.com/eugenetriguba/bolt/internal/sqlparse" - "gotest.tools/v3/assert" + "github.com/eugenetriguba/checkmate/assert" ) func TestSqlParser_Parse(t *testing.T) { - type test struct { + testCases := []struct { buffer string - expectedExecutionOptions *sqlparse.ExecutionOptions - } - - tests := []test{ + expectedExecutionOptions sqlparse.ExecutionOptions + }{ { buffer: "-- bolt: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: false}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: false}, }, { buffer: "-- BOLT: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: false}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: false}, }, { buffer: "\n-- bolt: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "--bolt: no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "-- bolt : no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: true}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: true}, }, { buffer: "-- bolt: no-transaction no-transaction", - expectedExecutionOptions: &sqlparse.ExecutionOptions{UseTransaction: false}, + expectedExecutionOptions: sqlparse.ExecutionOptions{UseTransaction: false}, }, } - for _, tc := range tests { - sqlParser := sqlparse.NewSqlParser(strings.NewReader(tc.buffer)) + for _, tc := range testCases { + sqlParser := sqlparse.NewSqlParser() - execOptions, err := sqlParser.Parse() - assert.NilError(t, err) + execOptions, err := sqlParser.Parse(strings.NewReader(tc.buffer)) + assert.Nil(t, err) assert.DeepEqual(t, execOptions, tc.expectedExecutionOptions) } } + +type ErrReader struct { + Reader io.Reader + ErrCond string +} + +func (er *ErrReader) Read(p []byte) (int, error) { + n, err := er.Reader.Read(p) + if err != nil { + return n, err + } + + if bytes.Contains(p[:n], []byte(er.ErrCond)) { + return n, errors.New("error: unwanted input encountered") + } + + return n, nil +} + +func TestSqlParserParseError(t *testing.T) { + reader := &ErrReader{ + Reader: strings.NewReader(" "), + ErrCond: " ", + } + sqlParser := sqlparse.NewSqlParser() + _, err := sqlParser.Parse(reader) + assert.NotNil(t, err) + assert.ErrorContains(t, err, "unwanted input encountered") +} |