sequel_core 1.0.6 → 1.0.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.0.7 (2008-02-05)
+
+* Added support for conditional filters (using if else statements) inside block filters (thanks Kee).
+
 === 1.0.6 (2008-02-05)
 
 * Removed code pollution introduced in revs 814, 817 (really bad patch, IMO).

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.0.6"
+VERS = "1.0.7"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/sequel_core/dataset/sequelizer.rb

@@ -285,7 +285,14 @@ class Sequel::Dataset
         l = e[1]
         r = eval_expr(e[2], b, opts)
         raise Sequel::Error::InvalidExpression, "#{l} = #{r}. Did you mean :#{l} == #{r}?"
-      when :if, :dstr
+      when :if
+        op, c, br1, br2 = *e
+        if ext_expr(c, b, opts)
+          eval_expr(br1, b, opts)
+        elsif br2
+          eval_expr(br2, b, opts)
+        end
+      when :dstr
         ext_expr(e, b, opts)
       else
         raise Sequel::Error::InvalidExpression, "Invalid expression tree: #{e.inspect}"
@@ -308,7 +315,7 @@ class Sequel::Dataset
         "(#{e[1..-1].map {|i| pt_expr(i, b, opts)}.join(JOIN_AND)})"
       when :or # x || y
         "(#{pt_expr(e[1], b, opts)} OR #{pt_expr(e[2], b, opts)})"
-      when :call, :vcall, :iter, :match3 # method calls, blocks
+      when :call, :vcall, :iter, :match3, :if # method calls, blocks
         eval_expr(e, b, opts)
       when :block # block of statements
         if opts[:comma_separated]

data/spec/dataset_spec.rb

@@ -1117,9 +1117,13 @@ context "Dataset#join_table" do
     proc {@d.join_table(:invalid, :a, :b)}.should raise_error(Sequel::Error)
   end
   
-  specify "should treat aliased tables correctly" do
+  specify "should support aliased tables" do
     @d.from('stats s').join('players p', :id => :player_id).sql.should ==
       'SELECT * FROM stats s INNER JOIN players p ON (p.id = s.player_id)'
+
+    ds = Sequel::Dataset.new(nil).from(:foo => :f). \
+      join_table(:inner, :bar, :id => :bar_id).sql.should ==
+      'SELECT * FROM foo f INNER JOIN bar ON (bar.id = f.bar_id)'
   end
   
   specify "should allow for arbitrary conditions in the JOIN clause" do
@@ -1133,11 +1137,11 @@ context "Dataset#join_table" do
       "SELECT * FROM items LEFT OUTER JOIN categories ON (categories.status IN (1, 2, 3))"
   end
   
-  specify "should support aliased tables" do
-    ds = Sequel::Dataset.new(nil).from(:foo => :f). \
-      join_table(:inner, :bar, :id => :bar_id).sql.should ==
-      'SELECT * FROM foo f INNER JOIN bar ON (bar.id = f.bar_id)'
+  specify "should raise error for a table without a source" do
+    proc {Sequel::Dataset.new(nil).join('players p', :id => :player_id)}. \
+      should raise_error(Sequel::Error)
   end
+
 end
 
 context "Dataset#[]=" do

data/spec/sequelizer_spec.rb

@@ -474,6 +474,17 @@ context "Proc#to_sql" do
     
     proc {:x == ("%d" % prod).lit}.sql.should == "(x = 1)"
   end
+  
+  specify "should support conditional filters" do
+    @criteria = nil
+    proc {if @criteria; :x.like @criteria; end}.sql.should == nil
+    
+    @criteria = 'blah'
+    proc {if @criteria; :x.like @criteria; end}.sql.should == "(x LIKE 'blah')"
+
+    @criteria = nil
+    proc {if @criteria; :x.like @criteria; else; :x.like 'ddd'; end}.sql.should == "(x LIKE 'ddd')"
+  end
 end
 
 context "Proc#to_sql stock" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Sharon Rosner