Skip to content

fix support of unquoted value on time criteria #10

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix support of unquoted value on time criteria #10

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf65a43
fix support of unquoted value on time criteria
Dec 20, 2019
55c850b
fix support of unquoted value on time criteria
Dec 20, 2019
c6e16ae
Merge branch 'master' of https://github.com/fifthaxe/influx-query-bui…
Dec 20, 2019
ab711d7
Merge branch 'master' of https://github.com/fifthaxe/influx-query-bui…
Dec 20, 2019
3742743
Merge branch 'master' of https://github.com/fifthaxe/influx-query-bui…
Dec 20, 2019
4fdd1ea
add math operations support to select fields
Dec 21, 2019
e3edaa0
add math operations support to select fields
Dec 21, 2019
2e63fd7
add math operations support to select fields
Dec 22, 2019
d276e36
add math operations support to select fields
Dec 22, 2019
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
9 changes: 9 additions & 0 deletions query_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"strings"
)

var validUnquotedTimeRegexp = regexp.MustCompile(`^\d+(ns|u|ms|s|m|h|d|w)?$`)

// Duration Duration interface
type Duration interface {
Nanoseconds(uint) Duration
Expand Down Expand Up @@ -315,6 +317,7 @@ func (q *Query) Build() string {
}

var functionMatcher = regexp.MustCompile(`.+\(.+\)$`)
var mathMatcher = regexp.MustCompile(`^(.+?)((\s*)([\-\+\/\*])(\s*)(-?\d+)(\.\d+)?)+`)

func (q *Query) buildFields() string {
if q.fields == nil {
Expand All @@ -338,6 +341,8 @@ func (q *Query) buildFields() string {

if functionMatcher.MatchString(selectField) {
fields[i] = selectField
} else if mathMatcher.MatchString(selectField) {
fields[i] = selectField
} else {
fields[i] = fmt.Sprintf("\"%s\"", selectField)
}
Expand Down Expand Up @@ -511,6 +516,10 @@ func getCriteriaTemplate(tag Tag) string {
case bool:
return fmt.Sprintf(`"%s" %s %t`, tag.key, tag.op, tag.value)
default:
if tag.key == "time" && validUnquotedTimeRegexp.MatchString(tag.value.(string)) {
// 'time' key accepts non-quoted string value (eg: 1535313431000ns)
return fmt.Sprintf(`%s %s %s`, tag.key, tag.op, tag.value)
}
return fmt.Sprintf(`"%s" %s '%s'`, tag.key, tag.op, tag.value)
}
}