sparkql 1.1.17 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzI5MGFiMTAwMTgyYjkyZDQyODY4MGE3ZDFkYTQ1NjFiODYyODAxMQ==
+    YmEwMzUwNDNlYTljMmQ4YTcwMWI5Mjc5YmZkYjc5NzBlY2QyMGM3Ng==
   data.tar.gz: !binary |-
-    MGI1OTQwNWQ5OTg1MzNkYTc2MzQzM2Y1ZjRmMGViNWFlODQ5ZTE2MQ==
+    OTk3N2I0ZGQwYjc0ZmIxMzcwZTFkZjcwOGMxNzVlY2VkODMxN2QxMg==
 SHA512:
   metadata.gz: !binary |-
-    NmVhZmM2ZWQzZmI0M2EyZmNlNmE2MTE0ZTE3MGZmZDU0MWIxZDZlZmMxOTA5
-    NGViMTdjNjI0YzkwY2FkODUxY2I5M2RlMTY4OTRmNTQ2NjY5NjQzZTIyZjgx
-    ZTNmMTUzNDFiMDI0ZWNmMzk5MzcyMjQ0ZWViMDQ4ZDE3NmRlOWY=
+    ZDVkMzg2MWNhNDUxMWU0NzVjZjhmNmE2ZmQ3YTVjMWVmY2U0MmRhNGFlZWIw
+    YTdlOTZkNTliY2E5ZWMzYTViMTNkMGVmYWYwNzI5ZGQ1YzJjN2IxZDc2Njk5
+    NGQ0OGQ2ODk5ZDRlYWZmMGJmYjEzYzBhODAxOTgwYjRjZGViMTA=
   data.tar.gz: !binary |-
-    MGNiYmRhOTQ2ODlhMzM4ODRlNzdiYTg5YmNkNDZkZmIxOTc5ZTdkNTIxMjhh
-    MjgzMGY4ZmE3MDgzNTk5NGJmMTUzYjExYTNkYzhjMGNkY2IzOWNkMDU5OGEy
-    YTJkYTIxZDM5ODJkMDI5YWQxMjBmZjRlYjdhYzNlMjhiYTZkMzQ=
+    M2NjMjYxNmMyNzEyNjZjMTc5Yjc0ZjFkZjlhMjk1ZGNjYzdhMzA5YzZjOWJj
+    YTU2NGQ0N2FkNzIzM2E5ZTI1ZmY4ZDYxYTA0YWIxM2I5Mjg5NWY1ZGY1OWVk
+    YzFmY2VlNDE0ZjNmNTBkOTY5MjIwOWZjY2YzZWFlNmU0MDllZTI=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.2.0, 2018-09-24
+-------------------
+  * [IMPROVEMENT] Support Nested field functions via `field_manipulations` attribute.
+
 v1.1.17, 2018-08-01
 -------------------
   * [IMPROVEMENT] New Function: concat()

data/GRAMMAR.md

@@ -108,7 +108,7 @@ on filtering values
 ```
      condition
        : literal
-       | function
+       | literal_function
        | literal_list 
        ;
 ```
@@ -124,6 +124,10 @@ fields.
        : function_name LPAREN RPAREN 
        | function_name LPAREN function_args RPAREN 
        ;
+     literal_function
+       : function_name LPAREN RPAREN 
+       | function_name LPAREN literal_function_args RPAREN 
+       ;
      function_name
        : KEYWORD
        ;
@@ -137,12 +141,21 @@ Functions may optionally have a comma delimited list of parameters.
      function_args
        : function_arg
        | function_args COMMA function_arg 
-       ; 
+       ;
      function_arg
        : literal
        | literals
        | field 
        ;
+     literal_function_args
+       : literal_function_arg
+       | literal_function_args COMMA literal_function_arg 
+       ;
+     literal_function_arg
+       : literal
+       | literals
+       | literal_function
+       ;
 ```
 
 #### Literal List
@@ -152,7 +165,7 @@ A comma delimited list of functions and values.
 ```
      literal_list
        : literals
-       | function
+       | literal_function
        | literal_list COMMA literals 
        | literal_list COMMA function 
        ;

data/VERSION

@@ -1 +1 @@
-1.1.17
+1.2.0

data/lib/sparkql/function_resolver.rb

@@ -223,7 +223,8 @@ class Sparkql::FunctionResolver
 
     count = 0
     @args.each do |arg|
-      unless Array(total_args[count]).include?(arg[:type])
+      type = arg[:type] == :function ? arg[:return_type] : arg[:type]
+      unless Array(total_args[count]).include?(type)
         @errors << Sparkql::ParserError.new(:token => @name, 
           :message => "Function call '#{@name}' has an invalid argument at #{arg[:value]}",
           :status => :fatal )
@@ -240,6 +241,10 @@ class Sparkql::FunctionResolver
         return
       end
     end
+
+    if name == :substring && !@args[2].nil?
+      substring_index_error?(@args[2][:value])
+    end
   end
   
   def return_type
@@ -269,25 +274,47 @@ class Sparkql::FunctionResolver
     real_vals = @args.map { |i| i[:value]}
     name = @name.to_sym
 
+    field = @args.find do |i|
+      i[:type] == :field || i.key?(:field)
+    end
+
+    field = field[:type] == :function ? field[:field] : field[:value] unless field.nil?
+
     required_args = support[name][:args]
     total_args = required_args + Array(support[name][:opt_args]).collect {|args| args[:default]}
+
     fill_in_optional_args = total_args.drop(real_vals.length)
 
     fill_in_optional_args.each do |default|
       real_vals << default
     end
-    method = name
-    if support[name][:resolve_for_type]
-      method_type =  @args.first[:type]
-      method = "#{method}_#{method_type}"
+
+
+    v = if field.nil?
+      method = name
+      if support[name][:resolve_for_type]
+        method_type =  @args.first[:type]
+        method = "#{method}_#{method_type}"
+      end
+      self.send(method, *real_vals)
+    else
+      {
+        :type => :function,
+        :return_type => return_type,
+        :value => "#{name}",
+      }
     end
-    v = self.send(method, *real_vals)
 
-    unless v.nil? || v.key?(:function_name)
-      v[:function_name] = @name
-      v[:function_parameters] = real_vals
+    return if v.nil?
+
+    if !v.key?(:function_name)
+      v.merge!( function_parameters: real_vals,
+              function_name: @name)
     end
 
+    v.merge!(args: @args,
+            field: field)
+
     v
   end
   
@@ -319,14 +346,6 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def trim_field(arg)
-    {
-      :type => :function,
-      :value => "trim",
-      :args => [arg]
-    }
-  end
-
   def trim_character(arg)
     {
       :type => :character,
@@ -334,18 +353,7 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def substring_field(field, first_index, number_chars)
-    return if substring_index_error?(number_chars)
-    {
-      :type => :function,
-      :value => "substring",
-      :args => [field, first_index, number_chars]
-    }
-  end
-
   def substring_character(character, first_index, number_chars)
-    return if substring_index_error?(number_chars)
-
     second_index = if number_chars.nil?
       -1
     else
@@ -370,21 +378,21 @@ class Sparkql::FunctionResolver
     false
   end
 
-  def tolower_character(string)
+  def tolower(args)
     {
       :type => :character,
-      :value => "'#{string.to_s.downcase}'"
+      :value => "tolower"
     }
   end
 
-  def tolower_field(arg)
+  def tolower_character(string)
     {
-      :type => :function,
-      :value => "tolower",
-      :args => [arg]
+      :type => :character,
+      :value => "'#{string.to_s.downcase}'"
     }
   end
 
+
   def toupper_character(string)
     {
       :type => :character,
@@ -392,14 +400,6 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def toupper_field(arg)
-    {
-      :type => :function,
-      :value => "toupper",
-      :args => [arg]
-    }
-  end
-
   def length_character(string)
     {
       :type => :integer,
@@ -407,14 +407,6 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def length_field(arg)
-    {
-      :type => :function,
-      :value => "length",
-      :args => [arg]
-    }
-  end
-
   def startswith(string)
     # Wrap this string in quotes, as we effectively translate
     #   City Eq startswith('far')
@@ -512,14 +504,6 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def floor_field(arg)
-    {
-      :type => :function,
-      :value => "floor",
-      :args => [arg]
-    }
-  end
-
   def ceiling_decimal(arg)
     {
       :type => :integer,
@@ -527,14 +511,6 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def ceiling_field(arg)
-    {
-      :type => :function,
-      :value => "ceiling",
-      :args => [arg]
-    }
-  end
-
   def round_decimal(arg)
     {
       :type => :integer,
@@ -542,17 +518,8 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def round_field(arg)
-    {
-      :type => :function,
-      :value => "round",
-      :args => [arg]
-    }
-  end
-
   def indexof(arg1, arg2)
     {
-      :type => :function,
       :value => "indexof",
       :args => [arg1, arg2]
     }
@@ -565,86 +532,6 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def concat_field(arg1, arg2)
-    {
-      :type => :function,
-      :value => 'concat',
-      :args => [arg1, arg2]
-    }
-  end
-
-  def date_field(arg)
-    {
-      :type => :function,
-      :value => "date",
-      :args => [arg]
-    }
-  end
-  
-  def time_field(arg)
-    {
-      :type => :function,
-      :value => "time",
-      :args => [arg]
-    }
-  end
-
-  def year_field(arg)
-    {
-      :type => :function,
-      :value => "year",
-      :args => [arg]
-    }
-  end
-
-  def month_field(arg)
-    {
-      :type => :function,
-      :value => "month",
-      :args => [arg]
-    }
-  end
-
-  def day_field(arg)
-    {
-      :type => :function,
-      :value => "day",
-      :args => [arg]
-    }
-  end
-
-  def hour_field(arg)
-    {
-      :type => :function,
-      :value => "hour",
-      :args => [arg]
-    }
-  end
-
-  def minute_field(arg)
-    {
-      :type => :function,
-      :value => "minute",
-      :args => [arg]
-    }
-  end
-
-  def second_field(arg)
-    {
-      :type => :function,
-      :value => "second",
-      :args => [arg]
-    }
-  end
-
-  def fractionalseconds_field(arg)
-    {
-      :type => :function,
-      :value => "fractionalseconds",
-      :args => [arg]
-    }
-  end
-
   def date_datetime(dt)
     {
       :type => :date,
@@ -675,7 +562,6 @@ class Sparkql::FunctionResolver
     }
   end
   
-  # TODO Donuts: to extend, we'd just replace (coords) param with (linear_ring1,linear_ring2, ...)
   def polygon(coords)
     new_coords = parse_coordinates(coords)
     unless new_coords.size > 2
@@ -795,14 +681,6 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def cast_field(value, type)
-    {
-      :type => :function,
-      :value => "cast",
-      :args => [value, type]
-    }
-  end
-
   def cast(value, type)
     if value == 'NULL'
       value = nil

data/lib/sparkql/lexer.rb

@@ -16,9 +16,6 @@ class Sparkql::Lexer < StringScanner
   end
   
   # Lookup the next matching token
-  # 
-  # TODO the old implementation did value type detection conversion at a later date, we can perform
-  # this at parse time if we want!!!!
   def shift
     @token_index = self.pos