predicate 2.9.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571d712e35bc8c4144014e76e3827614fdf78191f944a10ce7a1f8f5595886de
-  data.tar.gz: c7919717e71c0a23a4c0869e8e0fa384c5e6b8e0db9af5d87ef7c9c89fa8f006
+  metadata.gz: 6fd6ea9f498fb935b7445d0486d1ff4387da5f8e9d71525c762abeb214353b13
+  data.tar.gz: f0bbf5080ea295803a10823984d5d99112033a2ea98dbaf1bdc3846fadd65db0
 SHA512:
-  metadata.gz: d511b557d1b8d05cd4f56064977ba7189faaf37ab33562962a75027ab57454eae11063f9d5444c4a938b804cc5ec3316fe2e5aa39cad7ae33dafcfdd91dc6e4d
-  data.tar.gz: cd1ddf3e4e99abb752c940db00a0627f8be5a6e39556b5c37022f884a8457bcfd75cf27d053639887f8cd5da4125ca86926670f6bc3579a38c3563a6e4e5e02c
+  metadata.gz: 4422e7cf2eda59e119df2e1aa89fc703a9dc935c1bd80a9d625d6281316786fb2e56d5ad6c4dcd2a06a77a58510df9f74b2a3cf0e735a8f5b4f6014487a6ed4e
+  data.tar.gz: 310883c2b4d6c7e8661219969097e199a7bd9f6a6cd3ef520c93026a1b42485cf52b492449320d833aa0e00ff398d17cae00f7cd2ec089edbfb3a5a90eeebf52

data/lib/predicate/nodes/or.rb

@@ -10,5 +10,37 @@ class Predicate
       sexpr_body.any?{|op| op.evaluate(tuple) }
     end
 
+    # A disjunction can be represented as a `{ attr => [values] }` hash only
+    # when every operand constrains the *same single* attribute to a literal
+    # or a set of literals, e.g. `x == 1 OR x == 2 OR x IN [3, 4]`. Operands
+    # are folded together into an IN-style hash. As soon as an operand touches
+    # another attribute, or cannot itself be represented as a hash, the whole
+    # disjunction is not representable and an ArgumentError is raised (as for
+    # any other non-representable predicate).
+    def to_hash
+      merged = sexpr_body.inject(nil) do |acc, term|
+        hash = term.to_hash
+        return super unless hash.size == 1
+
+        attr, value = hash.first
+        values = value.is_a?(Array) ? value : [value]
+
+        if acc.nil?
+          [attr, values.dup]
+        elsif acc.first == attr
+          [attr, acc.last + values]
+        else
+          return super
+        end
+      end
+
+      return super if merged.nil?
+      { merged.first => merged.last.uniq }
+    end
+
+    def to_hashes
+      [ to_hash, {} ]
+    end
+
   end
 end

data/lib/predicate/sequel/to_sequel.rb

@@ -110,11 +110,16 @@ class Predicate
         raise Error, "Unable to compile #{sexpr} to Sequel"
       end
 
+      def on_native(sexpr)
+        return sexpr.last.sql_literal if sexpr.last.respond_to?(:sql_literal)
+        return sexpr.last.sql if sexpr.last.respond_to?(:sql)
+        on_unsupported(sexpr)
+      end
+
       def on_unsupported(sexpr)
         raise NotSupportedError, "Unsupported predicate #{sexpr}"
       end
       alias :on_var :on_unsupported
-      alias :on_native :on_unsupported
       alias :on_intersect :on_unsupported
       alias :on_subset :on_unsupported
       alias :on_superset :on_unsupported

data/lib/predicate/version.rb

@@ -1,7 +1,7 @@
 class Predicate
   module Version
     MAJOR = 2
-    MINOR = 9
+    MINOR = 11
     TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

data/spec/predicate/test_to_hash.rb

@@ -36,5 +36,23 @@ class Predicate
       it{ expect(subject).to eql(x: 3, y: [2,3]) }
     end
 
+    context "or of eqs on the same attribute" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.eq(:x, 3) }
+
+      it{ expect(subject).to eql(x: [2,3]) }
+    end
+
+    context "or mixing eq and in on the same attribute" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.in(:x, [3,4]) }
+
+      it{ expect(subject).to eql(x: [2,3,4]) }
+    end
+
+    context "or on distinct attributes" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.eq(:y, 3) }
+
+      it{ expect{ subject }.to raise_error(ArgumentError) }
+    end
+
   end
 end

data/spec/predicate/test_to_hashes.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "to_hashes" do
+
+    let(:p){ Predicate }
+
+    subject{ predicate.to_hashes }
+
+    context "tautology" do
+      let(:predicate){ Predicate.tautology }
+
+      it{ expect(subject).to eql([{},{}]) }
+    end
+
+    context "contradiction" do
+      let(:predicate){ Predicate.contradiction }
+
+      it{ expect{ subject }.to raise_error(ArgumentError) }
+    end
+
+    context "eq" do
+      let(:predicate){ Predicate.eq(:x, 2) }
+
+      it{ expect(subject).to eql([{x: 2}, {}]) }
+    end
+
+    context "neq" do
+      let(:predicate){ Predicate.neq(:x, 2) }
+
+      it{ expect(subject).to eql([{},{x: 2}]) }
+    end
+
+    context "in" do
+      let(:predicate){ Predicate.in(:x, [2,3]) }
+
+      it{ expect(subject).to eql([{x: [2,3]},{}]) }
+    end
+
+    context "and" do
+      let(:predicate){ Predicate.eq(:x, 3) & Predicate.in(:y, [2,3]) }
+
+      it{ expect(subject).to eql([{x: 3, y: [2,3]},{}]) }
+    end
+
+    context "and with a neq" do
+      let(:predicate){ Predicate.neq(:x, 3) & Predicate.in(:y, [2,3]) }
+
+      it{ expect(subject).to eql([{y: [2,3]},{x: 3}]) }
+    end
+
+    context "or of eqs on the same attribute" do
+      let(:predicate){ Predicate.eq(:x, 2) | Predicate.eq(:x, 3) }
+
+      it{ expect(subject).to eql([{x: [2,3]},{}]) }
+    end
+
+    context "not nil & eq" do
+      let(:predicate){ Predicate.neq(:x, nil) & Predicate.eq(:x, [2,3]) }
+
+      it{ expect(subject).to eql([{x: [2,3]},{x: nil}]) }
+    end
+
+    ## unsupported
+
+    context "not" do
+      let(:predicate){ Predicate.not(Predicate.eq(:x, 2)) }
+
+      it{ expect{ subject }.to raise_error(ArgumentError) }
+    end
+
+    context "not-and" do
+      let(:predicate){ Predicate.not(Predicate.eq(:x, 3) & Predicate.in(:y, [2,3])) }
+
+      it{ expect{ subject }.to raise_error(ArgumentError) }
+    end
+
+  end
+end

data/spec/sequel/test_to_sequel.rb

@@ -101,21 +101,6 @@ class Predicate
       end
     end
 
-    context 'in with something responding to sql_literal' do
-      let(:operand){
-        Object.new.tap{|o|
-          def o.sql_literal(db)
-            "Hello World"
-          end
-        }
-      }
-      let(:predicate) { Predicate.in(:price, Predicate.opaque(operand)) }
-
-      it 'works as expected' do
-        expect(subject).to eql("SELECT * FROM `items` WHERE (`price` IN (Hello World))")
-      end
-    end
-
     context 'not' do
       let(:predicate) { !Predicate.in(:price, [10.0, 17.99]) }
 
@@ -220,5 +205,43 @@ class Predicate
         expect { subject }.to raise_error(NotSupportedError)
       end
     end
+
+    class SqlAble
+      def initialize(value)
+        @value = value
+      end
+
+      def sql(*args, &bl)
+        @value
+      end
+      alias :sql_literal :sql
+    end
+
+    context 'opaque in an IN' do
+      let(:operand) {
+        SqlAble.new('Hello World')
+      }
+      let(:predicate) {
+        Predicate.in(:price, Predicate.opaque(operand))
+      }
+
+      it 'works as expected' do
+        expect(subject).to eql("SELECT * FROM `items` WHERE (`price` IN (Hello World))")
+      end
+    end
+
+    context 'native' do
+      let(:operand) {
+        SqlAble.new(Sequel.lit("1=1"))
+      }
+      let(:predicate) {
+        Predicate.native(operand)
+      }
+
+      it 'works as expected' do
+        expect(subject).to eql("SELECT * FROM `items` WHERE (1=1)")
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2026-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr
@@ -251,6 +251,7 @@ files:
 - spec/predicate/test_rename.rb
 - spec/predicate/test_tautology.rb
 - spec/predicate/test_to_hash.rb
+- spec/predicate/test_to_hashes.rb
 - spec/predicate/test_to_s.rb
 - spec/predicate/test_unqualify.rb
 - spec/sequel/test_to_sequel.rb