diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-02-29 19:53:20 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-02-29 19:53:20 -0500 |
| commit | bf1d3b3e1fc42132678b244e479839416a03a6ce (patch) | |
| tree | fbe4f5e7e41b77bc990ebdece673c7f16102f61f /internal/sqlparse | |
| parent | Tweak error and doc for storage module (diff) | |
| download | cli-bf1d3b3e1fc42132678b244e479839416a03a6ce.zip | |
Add service tests
Diffstat (limited to 'internal/sqlparse')
| -rw-r--r-- | internal/sqlparse/sqlparse.go | 18 | ||||
| -rw-r--r-- | internal/sqlparse/sqlparse_test.go | 24 |
2 files changed, 22 insertions, 20 deletions
diff --git a/internal/sqlparse/sqlparse.go b/internal/sqlparse/sqlparse.go index 25960c5..e986068 100644 --- a/internal/sqlparse/sqlparse.go +++ b/internal/sqlparse/sqlparse.go @@ -7,22 +7,24 @@ import ( "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:") { @@ -38,7 +40,7 @@ func (sp *SqlParser) Parse() (*ExecutionOptions, error) { } if err := scanner.Err(); err != nil { - return nil, fmt.Errorf("parsing sql file encountered an error: %w", 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 5fe58fa..12a435d 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -14,42 +14,42 @@ import ( func TestSqlParser_Parse(t *testing.T) { testCases := []struct { buffer string - expectedExecutionOptions *sqlparse.ExecutionOptions + 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 testCases { - sqlParser := sqlparse.NewSqlParser(strings.NewReader(tc.buffer)) + sqlParser := sqlparse.NewSqlParser() - execOptions, err := sqlParser.Parse() + execOptions, err := sqlParser.Parse(strings.NewReader(tc.buffer)) assert.Nil(t, err) assert.DeepEqual(t, execOptions, tc.expectedExecutionOptions) @@ -79,8 +79,8 @@ func TestSqlParserParseError(t *testing.T) { Reader: strings.NewReader(" "), ErrCond: " ", } - sqlParser := sqlparse.NewSqlParser(reader) - _, err := sqlParser.Parse() + sqlParser := sqlparse.NewSqlParser() + _, err := sqlParser.Parse(reader) assert.NotNil(t, err) assert.ErrorContains(t, err, "unwanted input encountered") } |