predicate 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571d712e35bc8c4144014e76e3827614fdf78191f944a10ce7a1f8f5595886de
-  data.tar.gz: c7919717e71c0a23a4c0869e8e0fa384c5e6b8e0db9af5d87ef7c9c89fa8f006
+  metadata.gz: ba74ff534d4a9b58d4fdc9dc671d17275d9d01d65b391b509be68fd6500fb75b
+  data.tar.gz: 964c06320295c968a80547e7af048bfd6382638414e724734f7b79ab9c739ac1
 SHA512:
-  metadata.gz: d511b557d1b8d05cd4f56064977ba7189faaf37ab33562962a75027ab57454eae11063f9d5444c4a938b804cc5ec3316fe2e5aa39cad7ae33dafcfdd91dc6e4d
-  data.tar.gz: cd1ddf3e4e99abb752c940db00a0627f8be5a6e39556b5c37022f884a8457bcfd75cf27d053639887f8cd5da4125ca86926670f6bc3579a38c3563a6e4e5e02c
+  metadata.gz: e4ac5d9e093b57a77ca942c11f602e13460d9e9154d6f5b271651c3ea7972c6fc0fb01a19b66c1a462e2c2d0d8760b7479ec75db566ef83fa7c63c1b3ab62db9
+  data.tar.gz: 275ebdd55119eca9b6ef5513f90ba0a2e9664cf2a70fa3fa28da342fcbb0ce91ade41154cbc04e187c89c33b34473d0a83fe98828aec40c1573dc465f1031518

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 = 10
     TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

data/spec/predicate/test_to_hashes.rb

@@ -0,0 +1,72 @@
+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 "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.10.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2026-04-24 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