Enhanced FECompareOp error message for invalid operators

couchbaselabs · Apr 4, 2019 · 8fa98e7 · 8fa98e7
1 parent 542cb7a
commit 8fa98e7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/filterExprParser.go b/filterExprParser.go
@@ -782,6 +782,19 @@ type FEOpChar struct {
  GreaterThan *bool `@">" )`
 }
 
+func (f *FEOpChar) String() string {
+ if f.Not != nil {
+ return "!"
+ } else if f.Equal != nil {
+ return "="
+ } else if f.LessThan != nil {
+ return "<"
+ } else if f.GreaterThan != nil {
+ return ">"
+ }
+ return ""
+}
+
 type FECompareOp struct {
  OpChars0 *FEOpChar `@@`
  OpChars1 *FEOpChar `[ @@ ]`
@@ -837,7 +850,18 @@ func (feo *FECompareOp) String() string {
  } else if feo.IsLessThanOrEqualTo() {
  return OperatorLessThanEq
  }
- return "?? (FECompareOp)"
+ var invalidOp []string
+ if feo.OpChars0 != nil {
+ invalidOp = append(invalidOp, feo.OpChars0.String())
+ }
+ if feo.OpChars1 != nil {
+ invalidOp = append(invalidOp, feo.OpChars1.String())
+ }
+ if len(invalidOp) > 0 {
+ return strings.Join(invalidOp, "")
+ } else {
+ return "?? (FECompareOp)"
+ }
 }
 
 func (f *FECompareOp) OutputExpression(lhs Expression, rhs Expression) (Expression, error) {

diff --git a/filterExprParser_test.go b/filterExprParser_test.go
@@ -649,4 +649,9 @@ func TestFilterExpressionParser(t *testing.T) {
  // Discontinued
  _, _, err = NewFilterExpressionParser("SomeKey EXISTS")
  assert.NotNil(err)
+
+ // Invalid operators
+ _, fe, err = NewFilterExpressionParser("field >< \"value\"")
+ _, err = fe.OutputExpression()
+ assert.NotNil(err)
 }