sparkql 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee4b94747c3d671e7ceac9675caaebaf3d8661a4a9316327719e7221f439b3bc
-  data.tar.gz: '09a7eddd5cd21a23d2083c8312f0a1bec48a0f21938c0871538cdb08ef52d1d3'
+  metadata.gz: 6c51d91b09c229564b83503e11d3ca453c91f5c280307effd1120d6a33b74010
+  data.tar.gz: ea90a995aa3dbd06ae7f187437c24abb81590ff396e837ec45e531ea25408f69
 SHA512:
-  metadata.gz: 67b098969f33bf5eaa19277d3d202687c8ceddf4183d4f54cb703cdb7b5ed3aff934a201a3e238226a27bfcecce9b2c58e31e2ce64f76fa0f03babf23b980291
-  data.tar.gz: 42db5ca0692fca37b627562870641af084f539c64909fb8858e8bc872d4371d365621fe502cbba8289dbd0ea47e13cdc80df24c83172ebc3d88a92ec1291e64c
+  metadata.gz: c10a6629cc9606cdb49de2f60c64e6d0a38879c7abf4118e91fb23070eea06efa81b951a4f76daf185f5904efcbaa1b2ef4edb09a6124f24833e77865ecdd295
+  data.tar.gz: 9e073aa1c7963578f2ecf8e0a65230e7210c329a365a57e6b3fd7d4d0c7aa60e281b186e3c507ffe8f59a91fbefd16dbc9e99a9d97e8b603f4da6b1bb859c0e4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v1.3.6, 2026-06-23
+  * [BUGFIX] Parser crash when days()/weekdays() exceed max offset
+
 v1.3.5, 2026-04-30
  * [IMPROVEMENT] add date_date() function
 

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/lib/sparkql/parser_tools.rb

@@ -171,6 +171,16 @@ module Sparkql::ParserTools
   end
 
   def tokenize_multiple(lit1, lit2)
+    if lit1.nil? || lit2.nil?
+      return nil if errors?
+
+      tokenizer_error(token: @lexer.last_field,
+                      message: 'Invalid value in field list.',
+                      status: :fatal,
+                      syntax: true)
+      return nil
+    end
+
     final_type = lit1[:type]
     if lit1[:type] != lit2[:type]
       final_type = coercible_types(lit1[:type], lit2[:type])
@@ -224,15 +234,17 @@ module Sparkql::ParserTools
     resolver = function_resolver(name, args)
     resolver.validate
     if resolver.errors?
-      tokenizer_error(token: @lexer.last_field,
-                      message: "Error parsing function #{resolver.errors.join(',')}",
-                      status: :fatal,
-                      syntax: true)
-      nil
-    else
-      result = resolver.call
-      result.nil? ? result : result.merge(condition: "#{name}(#{condition_list.join(',')})")
+      report_function_resolver_errors(resolver)
+      return nil
     end
+
+    result = resolver.call
+    if result.nil?
+      report_function_resolver_errors(resolver) if resolver.errors?
+      return nil
+    end
+
+    result.merge(condition: "#{name}(#{condition_list.join(',')})")
   end
 
   def tokenize_arithmetic(lhs, operator, rhs)
@@ -448,4 +460,16 @@ module Sparkql::ParserTools
   def offset
     @offset ||= current_timestamp.strftime('%:z')
   end
+
+  private
+
+  def report_function_resolver_errors(resolver)
+    resolver.errors.each do |error|
+      tokenizer_error(token: error.token || @lexer.last_field,
+                      message: error.message,
+                      status: error.status,
+                      syntax: error.syntax?,
+                      constraint: error.constraint?)
+    end
+  end
 end

data/test/unit/parser_test.rb

@@ -1232,6 +1232,18 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 0, expressions.last[:block_group]
   end
 
+  test 'oversized days() in Bt range returns parser error instead of raising' do
+    [
+      'OriginalEntryTimestamp Bt days(0),days(365001)',
+      'OpenHouses Bt days(0),days(9223372036854775807)'
+    ].each do |filter|
+      @parser = Parser.new
+      assert_nothing_raised { @parser.parse(filter) }
+      assert @parser.fatal_errors?, "Expected fatal error for #{filter}"
+      assert_match(/max offset/i, @parser.errors.first.message)
+    end
+  end
+
   private
 
   def parser_errors(filter)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Wade McEwen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-14 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby