sparkql 1.1.16 → 1.1.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDI5NzJhMzM4MGY2MWFlNGM0YjE3N2Y1OWI2NDBhYzhhYTA5ODU2NQ==
+    MzI5MGFiMTAwMTgyYjkyZDQyODY4MGE3ZDFkYTQ1NjFiODYyODAxMQ==
   data.tar.gz: !binary |-
-    MmJlZTY5NzRlZGEwY2RkYTcyNzU1NDUyMzBiZGY1MDdjN2IwZjI1OA==
+    MGI1OTQwNWQ5OTg1MzNkYTc2MzQzM2Y1ZjRmMGViNWFlODQ5ZTE2MQ==
 SHA512:
   metadata.gz: !binary |-
-    NWY3MDFkNWIyYmM2ZjNmODMwMTA3MWQzZTZlN2NhMmEzNTA2YzE5M2Q4NzEw
-    MmE0YWJhM2ZlYTkxZWE5ZDAyYWU0NDNiZTVlZjZlM2FkMzgwZTA0ZTI0OTEy
-    ZDAxNzc5NzdmNTgzMWYxN2U4MjAzZDJkYmJjMTdlMGMyNDE2ZmY=
+    NmVhZmM2ZWQzZmI0M2EyZmNlNmE2MTE0ZTE3MGZmZDU0MWIxZDZlZmMxOTA5
+    NGViMTdjNjI0YzkwY2FkODUxY2I5M2RlMTY4OTRmNTQ2NjY5NjQzZTIyZjgx
+    ZTNmMTUzNDFiMDI0ZWNmMzk5MzcyMjQ0ZWViMDQ4ZDE3NmRlOWY=
   data.tar.gz: !binary |-
-    YTI4YmQwYzFkNjllNDc0Yzg0YWFiYzVjMGZmNDJkNDNlODc5MTcyMzVhYzcy
-    MjhmMjUyMTQwYmUwMjY4N2U1MzIzNzI5MWVjMmFjNmI0MDg3ZDBmMmZiZDFl
-    YzZhNjkxYTAxZTJiZGI1MTZjY2NlMjlmNjYyZGExNmRkMDdjYTU=
+    MGNiYmRhOTQ2ODlhMzM4ODRlNzdiYTg5YmNkNDZkZmIxOTc5ZTdkNTIxMjhh
+    MjgzMGY4ZmE3MDgzNTk5NGJmMTUzYjExYTNkYzhjMGNkY2IzOWNkMDU5OGEy
+    YTJkYTIxZDM5ODJkMDI5YWQxMjBmZjRlYjdhYzNlMjhiYTZkMzQ=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.17, 2018-08-01
+-------------------
+  * [IMPROVEMENT] New Function: concat()
+
 v1.1.16, 2018-07-26
 -------------------
   * [IMPROVEMENT] New Function: cast()

data/VERSION

@@ -1 +1 @@
-1.1.16
+1.1.17

data/lib/sparkql/function_resolver.rb

@@ -71,6 +71,11 @@ class Sparkql::FunctionResolver
       :args => [[:field, :character], :character],
       :return_type => :integer
     },
+    :concat => {
+      :args => [[:field, :character], :character],
+      :resolve_for_type => true,
+      :return_type => :character
+    },
     :cast => {
       :args => [[:field, :character, :decimal, :integer, :null], :character],
       :resolve_for_type => true,
@@ -553,6 +558,21 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def concat_character(arg1, arg2)
+    {
+      :type => :character,
+      :value => "'#{arg1}#{arg2}'"
+    }
+  end
+
+  def concat_field(arg1, arg2)
+    {
+      :type => :function,
+      :value => 'concat',
+      :args => [arg1, arg2]
+    }
+  end
+
   def date_field(arg)
     {
       :type => :function,

data/test/unit/parser_test.rb

@@ -753,6 +753,30 @@ class ParserTest < Test::Unit::TestCase
     assert_equal(["FieldName"], expression[:function_parameters])
   end
 
+  def test_concat_with_field
+    filter = "City Eq concat(City, 'b')"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :function, expression[:type]
+    assert_equal 'concat', expression[:function_name]
+    assert_equal(["City", 'b'], expression[:function_parameters])
+    assert_equal("City", expression[:field])
+  end
+
+  def test_concat_with_literal
+    filter = "City Eq concat('a', 'b')"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal 'concat', expression[:function_name]
+    assert_equal :character, expression[:type]
+    assert_equal "'ab'", expression[:value]
+    assert_equal ["a", "b"], expression[:function_parameters]
+  end
+
   def test_cast_with_field
     filter = "cast(ListPrice, 'character') Eq '100000'"
     @parser = Parser.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby