sparkql 1.1.7 → 1.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzkxMTYxNjk1NThkMGYwNDVlMjgwNzI0NTEyZThkMWQ0YWFmNGY0Ng==
+    YTQ3NzU1YTIzZGVjZWUwZGY1ZjUyODE1YzI1MWMwOGZkNzQ4ZjU1Nw==
   data.tar.gz: !binary |-
-    MDcyNmE5YjE5ZjJmZDdmNzUxNmIzNmUzMzMzZjdiNTFiZDhjYzc0Yg==
+    OTY2OWE0NDNkOWE0M2Q5NWQzOWZhZTA2N2FiMTQxZDQ0MmFlNzRjYw==
 SHA512:
   metadata.gz: !binary |-
-    NjQwMzcwYzcyM2U2N2IyMTk0NTNjM2JmZWIyYWM0ZmY0MTQwN2ZiOTM5NWQy
-    NzZhMTAyN2IxOThiZDg0ZTgwOGM0YzYxMzhhZjZmNGQwYzFiOTg1ZmFiYWQx
-    OTllYTVlMTJjNzEzNTlhOWY1NTM1NDFkMjQ3ZjllOTJhYWY5NWI=
+    MjlhOWZhMGY4MzY5MzRkZTFlMWVjYjU2MDljYzlmMGIwYzE2ZDk3Zjk4ZmJh
+    NDhiZWFkNWY1NmI2ZTI0YzhmODM5NDZiNjFlZDhjYjYyMGVkZTFlNDUyNjg3
+    NTEzNjViYjBlNGI3MzM0YWQzNTU1OWUyNmUwNTIzOTIxZTY5YjA=
   data.tar.gz: !binary |-
-    NjAyMTExOWE1ODE3YTU1ZWM2NDNkNDVmYTgzNzc5MDZiNWQ5OTQyNTgyMjc3
-    YjQyNWNkYmViNjYyYTQ3ZjFmODUwMTM3Y2YyYzc4MGVhYzcyNzcyNWY5MTc5
-    NTBmMjM5ZDgwMTAwN2Y2NmYwNjM4MzJjYWJmMmUxZjY1MjExYjM=
+    NTE3ZmQwMTNhMzM0YWM4OWE4Y2RlMzZmZTU2OGU0YWQ3MjFlMTIxNGU5OGUy
+    NDk1MTUzMDE0ZmZlZWMwMWFiMjE1ZmZkZjExZGQ2NzVmOTMzMjA2MWJjMWM3
+    MGU1NmYwYzJmOGJlNzczYzUwN2QwMjliMjJlODY1YTVlMzAyOWQ=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v1.1.7, 2017-11-30 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.7...v1.1.8))
+-------------------
+  * [BUGFIX] Properly coerce integer values to decimals when a function is used
+    prior to the operator
+
 v1.1.7, 2017-03-31 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.6...v1.1.7))
 -------------------
   * [BUGFIX] Add missing require for StringScanner

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/sparkql/parser_compatibility.rb

@@ -223,6 +223,15 @@ module Sparkql::ParserCompatibility
     if expected == expression[:type] || check_function_type?(expression, expected) ||
       (supports_nulls && expression[:type] == :null)
       return true
+    # If the field will be passed into a function,
+    # check the type of the return value (:field_function_type),
+    # and coerce if necessary.
+    elsif expression[:field_function_type] &&
+          expression[:type] == :integer && 
+          expression[:field_function_type] == :decimal
+      expression[:type] = :decimal
+      expression[:cast] = :integer
+      return true
     elsif expected == :datetime && expression[:type] == :date
       expression[:type] = :datetime
       expression[:cast] = :date
@@ -259,6 +268,7 @@ module Sparkql::ParserCompatibility
     # Lookup the function arguments
     function = Sparkql::FunctionResolver::SUPPORTED_FUNCTIONS[expression[:field_function].to_sym]
     return false if function.nil?
+
     Array(function[:args].first).include?(expected)
   end
 

data/test/unit/parser_compatability_test.rb

@@ -514,6 +514,13 @@ class ParserCompatabilityTest < Test::Unit::TestCase
     assert_equal 100.0, parser.escape_value(expression)
   end
 
+  test "integer type coercion with function" do
+    parser = Parser.new
+    expression = parser.tokenize("fractionalseconds(SomeDate) Le 1").first
+    assert parser.send(:check_type!, expression, :date)
+    assert_equal 1.0, parser.escape_value(expression)
+  end
+
   test "datetime->date type coercion" do
     t = Time.now
     parser = Parser.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby