Skip to content

Reduce cyclo complexity for the stmt data conversion #12

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
edocsss merged 11 commits into from
Sep 17, 2022
Merged

Reduce cyclo complexity for the stmt data conversion #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6a8d729
Improve test coverage; add coverage badge
edocsss Sep 6, 2022
f93074c
Apply Code Coverage Badge
edocsss Sep 6, 2022
bffca22
Add placehodler for coverage badge
edocsss Sep 6, 2022
ca855f3
Apply Code Coverage Badge
edocsss Sep 6, 2022
f39440d
Add coverage badge only during the full integration testing modeg
edocsss Sep 6, 2022
0ef0ae5
Merge branch 'prepare-for-awesome-go' of github.com:FreeLeh/GoFreeDB …
edocsss Sep 6, 2022
97e040e
Run the integration test if it's other people with approval or it's me
edocsss Sep 6, 2022
2c19ddd
Apply Code Coverage Badge
edocsss Sep 6, 2022
8d4402b
Reduce cyclo complexity
edocsss Sep 17, 2022
1ea4c98
Merge branch 'main' into prepare-for-awesome-go
edocsss Sep 17, 2022
13dbc71
Apply Code Coverage Badge
edocsss Sep 17, 2022
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

![Unit Test](https://github.com/FreeLeh/GoFreeDB/actions/workflows/unit_test.yml/badge.svg)
![Integration Test](https://github.com/FreeLeh/GoFreeDB/actions/workflows/full_test.yml/badge.svg)
![Coverage](https://img.shields.io/badge/Coverage-81.8%25-brightgreen)
![Coverage](https://img.shields.io/badge/Coverage-81.5%25-brightgreen)
[![Go Report Card](https://goreportcard.com/badge/github.com/FreeLeh/GoFreeDB)](https://goreportcard.com/report/github.com/FreeLeh/GoFreeDB)
[![Go Reference](https://pkg.go.dev/badge/github.com/FreeLeh/GoFreeDB.svg)](https://pkg.go.dev/github.com/FreeLeh/GoFreeDB)

Expand Down
31 changes: 29 additions & 2 deletions stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,21 @@ func (q *queryBuilder) writeWhere(stmt *strings.Builder) error {
}

func (q *queryBuilder) convertArg(arg interface{}) (string, error) {
switch converted := arg.(type) {
case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
return q.convertInt(arg)
case float32, float64:
return q.convertFloat(arg)
case string, []byte:
return q.convertString(arg)
case bool:
return strconv.FormatBool(converted), nil
default:
return "", errors.New("unsupported argument type")
}
}

func (q *queryBuilder) convertInt(arg interface{}) (string, error) {
switch converted := arg.(type) {
case int:
return strconv.FormatInt(int64(converted), 10), nil
Expand All @@ -137,10 +152,24 @@ func (q *queryBuilder) convertArg(arg interface{}) (string, error) {
return strconv.FormatUint(uint64(converted), 10), nil
case uint64:
return strconv.FormatUint(converted, 10), nil
default:
return "", errors.New("unsupported argument type")
}
}

func (q *queryBuilder) convertFloat(arg interface{}) (string, error) {
switch converted := arg.(type) {
case float32:
return strconv.FormatFloat(float64(converted), 'f', -1, 64), nil
case float64:
return strconv.FormatFloat(converted, 'f', -1, 64), nil
default:
return "", errors.New("unsupported argument type")
}
}

func (q *queryBuilder) convertString(arg interface{}) (string, error) {
switch converted := arg.(type) {
case string:
cleaned := strings.ToLower(strings.TrimSpace(converted))
if googleSheetSelectStmtStringKeyword.MatchString(cleaned) {
Expand All @@ -149,8 +178,6 @@ func (q *queryBuilder) convertArg(arg interface{}) (string, error) {
return strconv.Quote(converted), nil
case []byte:
return strconv.Quote(string(converted)), nil
case bool:
return strconv.FormatBool(converted), nil
default:
return "", errors.New("unsupported argument type")
}
Expand Down