Merge pull request #34 from joshcom/API-2831

Handle SparkQL strings that begin with "Not (Not ...)"

Author: wlmcewen

CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.3.24, 2016-01-05 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.23...v0.3.24))
+-------------------
+
+  * [BUGFIX] Support opening Not operator for "Not (Not ...)" expressions.
+
 v0.3.23, 2015-10-09 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.22...v0.3.23))
 -------------------
 

VERSION

@@ -1 +1 @@
-0.3.23
+0.3.24

lib/sparkql/parser_tools.rb

@@ -7,6 +7,7 @@ module Sparkql::ParserTools
 
   def parse(str)
     @lexer = Sparkql::Lexer.new(str)
+    @expression_count = 0
     results = do_parse
     return if results.nil?
     validate_expressions results
@@ -33,6 +34,7 @@ def tokenize_expression(field, op, val)
       tokenizer_error(:token => op, :expression => expression,
         :message => "Operator not supported for this type and value string", :status => :fatal )
     end
+    @expression_count += 1
     [expression]
   end
 
@@ -43,6 +45,14 @@ def tokenize_conjunction(exp1, conj, exp2)
   end
 
   def tokenize_unary_conjunction(conj, exp)
+
+    # Handles the case when a SparkQL filter string
+    # begins with a unary operator, and is nested, such as:
+    # Not (Not Field Eq 1)
+    if @expression_count == 1 && @lexer.level > 0
+      exp.first[:conjunction] = conj 
+    end
+
     exp.first[:unary] = conj
     exp.first[:unary_level] = @lexer.level
     exp

test/unit/parser_test.rb

@@ -409,6 +409,7 @@ def test_not_unary_expression
     expression = expressions.first
     assert_equal 10.to_s, expression[:value]
     assert_equal "Not", expression[:unary]
+    assert_equal "And", expression[:conjunction]
     assert_equal expression[:level], expression[:unary_level]
   end
 
@@ -434,6 +435,40 @@ def test_not_unary_expression_keeps_conjunction
     assert_equal 0, expression[:conjunction_level]
   end
 
+  def test_not_not_expression
+    @parser = Parser.new
+    filter = "Not (Not ListPrice Eq 1) Not (Not BathsTotal Eq 2) And " +
+             "(Not TotalRooms Eq 3) Or (HasPool Eq true)"
+
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.inspect
+
+    e1 = expressions.first
+    e2 = expressions[1]
+    e3 = expressions[2]
+    e4 = expressions[3]
+
+    assert_equal "Not", e1[:unary]
+    assert_equal "Not", e1[:conjunction]
+    assert_equal "Not", e2[:unary]
+    assert_equal "Not", e2[:conjunction]
+    assert_equal "Not", e3[:unary]
+    assert_equal "And", e3[:conjunction]
+    assert_nil e4[:unary]
+    assert_equal "Or", e4[:conjunction]
+
+    @parser = Parser.new
+    filter = "Not (ListPrice Eq 1)"
+
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.inspect
+
+    e1 = expressions.first
+
+    assert_equal "Not", e1[:unary]
+    assert_equal "And", e1[:conjunction]
+  end
+
   def test_expression_conditions_attribute
     conditions = [
       "1",