Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 4 additions & 7 deletions cqlbuilder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ func (eb *ExprBuilder) SortByModifiers(index string, mods ...cql.Modifier) *Expr

// Build finalizes and returns the query.
func (eb *ExprBuilder) Build() (cql.Query, error) {
if eb.err != nil {
return cql.Query{}, eb.err
}
if eb.build == nil {
return cql.Query{}, fmt.Errorf("builder is missing query context")
}
Expand Down Expand Up @@ -460,7 +463,7 @@ func (sb *SearchBuilder) ModRel(name cql.CqlModifier, rel cql.Relation, value st
return sb
}
if strings.TrimSpace(string(name)) == "" {
sb.err = fmt.Errorf("modifier name must be non-empty")
sb.err = fmt.Errorf("modifier relation name must be non-empty")
return sb
}
if rel == "" {
Expand Down Expand Up @@ -515,19 +518,13 @@ func (sb *SearchBuilder) termWithEscaper(term string, esc func(string) string) *

// Escapes backslashes and quotes in a string.
func EscapeSpecialChars(s string) string {
if s == "" {
return s
}
s = strings.ReplaceAll(s, "\\", "\\\\")
s = strings.ReplaceAll(s, "\"", "\\\"")
return s
}

// Escapes masking characters (*, ?, ^) in a string.
func EscapeMaskingChars(s string) string {
if s == "" {
return s
}
s = strings.ReplaceAll(s, "*", "\\*")
s = strings.ReplaceAll(s, "?", "\\?")
s = strings.ReplaceAll(s, "^", "\\^")
Expand Down
Loading