sequel 3.21.0 → 3.39.0

data/spec/core/expression_filters_spec.rb

@@ -1,12 +1,8 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-Regexp.send(:include, Sequel::SQL::StringMethods)
-String.send(:include, Sequel::SQL::StringMethods)
-
 describe "Blockless Ruby Filters" do
   before do
     db = Sequel::Database.new
-    db.quote_identifiers = false
     @d = db[:items]
     def @d.l(*args, &block)
       literal(filter_expr(*args, &block))
@@ -20,27 +16,22 @@ describe "Blockless Ruby Filters" do
     @d.l(:x).should == 'x'
   end
   
-  it "should support NOT via Symbol#~" do
-    @d.l(~:x).should == 'NOT x'
-  end
-  
   it "should support qualified columns" do
     @d.l(:x__y).should == 'x.y'
-    @d.l(~:x__y).should == 'NOT x.y'
   end
 
   it "should support NOT with SQL functions" do
-    @d.l(~:is_blah.sql_function).should == 'NOT is_blah()'
-    @d.l(~:is_blah.sql_function(:x)).should == 'NOT is_blah(x)'
-    @d.l(~:is_blah.sql_function(:x__y)).should == 'NOT is_blah(x.y)'
-    @d.l(~:is_blah.sql_function(:x, :x__y)).should == 'NOT is_blah(x, x.y)'
+    @d.l(~Sequel.function(:is_blah)).should == 'NOT is_blah()'
+    @d.l(~Sequel.function(:is_blah, :x)).should == 'NOT is_blah(x)'
+    @d.l(~Sequel.function(:is_blah, :x__y)).should == 'NOT is_blah(x.y)'
+    @d.l(~Sequel.function(:is_blah, :x, :x__y)).should == 'NOT is_blah(x, x.y)'
   end
 
   it "should handle multiple ~" do
-    @d.l(~~:x).should == 'x'
-    @d.l(~~~:x).should == 'NOT x'
-    @d.l(~~(:x & :y)).should == '(x AND y)'
-    @d.l(~~(:x | :y)).should == '(x OR y)'
+    @d.l(~Sequel.~(:x)).should == 'x'
+    @d.l(~~Sequel.~(:x)).should == 'NOT x'
+    @d.l(~~Sequel.&(:x, :y)).should == '(x AND y)'
+    @d.l(~~Sequel.|(:x, :y)).should == '(x OR y)'
   end
 
   it "should support = via Hash" do
@@ -55,216 +46,109 @@ describe "Blockless Ruby Filters" do
   it "should use = 't' and != 't' OR IS NULL if IS TRUE is not supported" do
     @d.meta_def(:supports_is_true?){false}
     @d.l(:x => true).should == "(x = 't')"
-    @d.l(~{:x => true}).should == "((x != 't') OR (x IS NULL))"
+    @d.l(~Sequel.expr(:x => true)).should == "((x != 't') OR (x IS NULL))"
     @d.l(:x => false).should == "(x = 'f')"
-    @d.l(~{:x => false}).should == "((x != 'f') OR (x IS NULL))"
+    @d.l(~Sequel.expr(:x => false)).should == "((x != 'f') OR (x IS NULL))"
   end
   
-  it "should support != via Hash#~" do
-    @d.l(~{:x => 100}).should == '(x != 100)'
-    @d.l(~{:x => 'a'}).should == '(x != \'a\')'
-    @d.l(~{:x => true}).should == '(x IS NOT TRUE)'
-    @d.l(~{:x => false}).should == '(x IS NOT FALSE)'
-    @d.l(~{:x => nil}).should == '(x IS NOT NULL)'
+  it "should support != via inverted Hash" do
+    @d.l(~Sequel.expr(:x => 100)).should == '(x != 100)'
+    @d.l(~Sequel.expr(:x => 'a')).should == '(x != \'a\')'
+    @d.l(~Sequel.expr(:x => true)).should == '(x IS NOT TRUE)'
+    @d.l(~Sequel.expr(:x => false)).should == '(x IS NOT FALSE)'
+    @d.l(~Sequel.expr(:x => nil)).should == '(x IS NOT NULL)'
   end
   
   it "should support ~ via Hash and Regexp (if supported by database)" do
+    def @d.supports_regexp?; true end
     @d.l(:x => /blah/).should == '(x ~ \'blah\')'
   end
   
-  it "should support !~ via Hash#~ and Regexp" do
-    @d.l(~{:x => /blah/}).should == '(x !~ \'blah\')'
+  it "should support !~ via inverted Hash and Regexp" do
+    def @d.supports_regexp?; true end
+    @d.l(~Sequel.expr(:x => /blah/)).should == '(x !~ \'blah\')'
   end
   
-  it "should support LIKE via Symbol#like" do
-    @d.l(:x.like('a')).should == '(x LIKE \'a\')'
-    @d.l(:x.like(/a/)).should == '(x ~ \'a\')'
-    @d.l(:x.like('a', 'b')).should == '((x LIKE \'a\') OR (x LIKE \'b\'))'
-    @d.l(:x.like(/a/, /b/i)).should == '((x ~ \'a\') OR (x ~* \'b\'))'
-    @d.l(:x.like('a', /b/)).should == '((x LIKE \'a\') OR (x ~ \'b\'))'
-
-    @d.l('a'.like(:x)).should == "('a' LIKE x)"
-    @d.l('a'.like(:x, 'b')).should == "(('a' LIKE x) OR ('a' LIKE 'b'))"
-    @d.l('a'.like(:x, /b/)).should == "(('a' LIKE x) OR ('a' ~ 'b'))"
-    @d.l('a'.like(:x, /b/i)).should == "(('a' LIKE x) OR ('a' ~* 'b'))"
-
-    @d.l(/a/.like(:x)).should == "('a' ~ x)"
-    @d.l(/a/.like(:x, 'b')).should == "(('a' ~ x) OR ('a' ~ 'b'))"
-    @d.l(/a/.like(:x, /b/)).should == "(('a' ~ x) OR ('a' ~ 'b'))"
-    @d.l(/a/.like(:x, /b/i)).should == "(('a' ~ x) OR ('a' ~* 'b'))"
-
-    @d.l(/a/i.like(:x)).should == "('a' ~* x)"
-    @d.l(/a/i.like(:x, 'b')).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-    @d.l(/a/i.like(:x, /b/)).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-    @d.l(/a/i.like(:x, /b/i)).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-  end
-
-  it "should support NOT LIKE via Symbol#like and Symbol#~" do
-    @d.l(~:x.like('a')).should == '(x NOT LIKE \'a\')'
-    @d.l(~:x.like(/a/)).should == '(x !~ \'a\')'
-    @d.l(~:x.like('a', 'b')).should == '((x NOT LIKE \'a\') AND (x NOT LIKE \'b\'))'
-    @d.l(~:x.like(/a/, /b/i)).should == '((x !~ \'a\') AND (x !~* \'b\'))'
-    @d.l(~:x.like('a', /b/)).should == '((x NOT LIKE \'a\') AND (x !~ \'b\'))'
-
-    @d.l(~'a'.like(:x)).should == "('a' NOT LIKE x)"
-    @d.l(~'a'.like(:x, 'b')).should == "(('a' NOT LIKE x) AND ('a' NOT LIKE 'b'))"
-    @d.l(~'a'.like(:x, /b/)).should == "(('a' NOT LIKE x) AND ('a' !~ 'b'))"
-    @d.l(~'a'.like(:x, /b/i)).should == "(('a' NOT LIKE x) AND ('a' !~* 'b'))"
-
-    @d.l(~/a/.like(:x)).should == "('a' !~ x)"
-    @d.l(~/a/.like(:x, 'b')).should == "(('a' !~ x) AND ('a' !~ 'b'))"
-    @d.l(~/a/.like(:x, /b/)).should == "(('a' !~ x) AND ('a' !~ 'b'))"
-    @d.l(~/a/.like(:x, /b/i)).should == "(('a' !~ x) AND ('a' !~* 'b'))"
-
-    @d.l(~/a/i.like(:x)).should == "('a' !~* x)"
-    @d.l(~/a/i.like(:x, 'b')).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-    @d.l(~/a/i.like(:x, /b/)).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-    @d.l(~/a/i.like(:x, /b/i)).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-  end
-
-  it "should support ILIKE via Symbol#ilike" do
-    @d.l(:x.ilike('a')).should == '(x ILIKE \'a\')'
-    @d.l(:x.ilike(/a/)).should == '(x ~* \'a\')'
-    @d.l(:x.ilike('a', 'b')).should == '((x ILIKE \'a\') OR (x ILIKE \'b\'))'
-    @d.l(:x.ilike(/a/, /b/i)).should == '((x ~* \'a\') OR (x ~* \'b\'))'
-    @d.l(:x.ilike('a', /b/)).should == '((x ILIKE \'a\') OR (x ~* \'b\'))'
-
-    @d.l('a'.ilike(:x)).should == "('a' ILIKE x)"
-    @d.l('a'.ilike(:x, 'b')).should == "(('a' ILIKE x) OR ('a' ILIKE 'b'))"
-    @d.l('a'.ilike(:x, /b/)).should == "(('a' ILIKE x) OR ('a' ~* 'b'))"
-    @d.l('a'.ilike(:x, /b/i)).should == "(('a' ILIKE x) OR ('a' ~* 'b'))"
-
-    @d.l(/a/.ilike(:x)).should == "('a' ~* x)"
-    @d.l(/a/.ilike(:x, 'b')).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-    @d.l(/a/.ilike(:x, /b/)).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-    @d.l(/a/.ilike(:x, /b/i)).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-
-    @d.l(/a/i.ilike(:x)).should == "('a' ~* x)"
-    @d.l(/a/i.ilike(:x, 'b')).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-    @d.l(/a/i.ilike(:x, /b/)).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-    @d.l(/a/i.ilike(:x, /b/i)).should == "(('a' ~* x) OR ('a' ~* 'b'))"
-  end
-
-  it "should support NOT ILIKE via Symbol#ilike and Symbol#~" do
-    @d.l(~:x.ilike('a')).should == '(x NOT ILIKE \'a\')'
-    @d.l(~:x.ilike(/a/)).should == '(x !~* \'a\')'
-    @d.l(~:x.ilike('a', 'b')).should == '((x NOT ILIKE \'a\') AND (x NOT ILIKE \'b\'))'
-    @d.l(~:x.ilike(/a/, /b/i)).should == '((x !~* \'a\') AND (x !~* \'b\'))'
-    @d.l(~:x.ilike('a', /b/)).should == '((x NOT ILIKE \'a\') AND (x !~* \'b\'))'
-
-    @d.l(~'a'.ilike(:x)).should == "('a' NOT ILIKE x)"
-    @d.l(~'a'.ilike(:x, 'b')).should == "(('a' NOT ILIKE x) AND ('a' NOT ILIKE 'b'))"
-    @d.l(~'a'.ilike(:x, /b/)).should == "(('a' NOT ILIKE x) AND ('a' !~* 'b'))"
-    @d.l(~'a'.ilike(:x, /b/i)).should == "(('a' NOT ILIKE x) AND ('a' !~* 'b'))"
-
-    @d.l(~/a/.ilike(:x)).should == "('a' !~* x)"
-    @d.l(~/a/.ilike(:x, 'b')).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-    @d.l(~/a/.ilike(:x, /b/)).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-    @d.l(~/a/.ilike(:x, /b/i)).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-
-    @d.l(~/a/i.ilike(:x)).should == "('a' !~* x)"
-    @d.l(~/a/i.ilike(:x, 'b')).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-    @d.l(~/a/i.ilike(:x, /b/)).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-    @d.l(~/a/i.ilike(:x, /b/i)).should == "(('a' !~* x) AND ('a' !~* 'b'))"
-  end
-
-  it "should support negating ranges via Hash#~ and Range" do
-    @d.l(~{:x => 1..5}).should == '((x < 1) OR (x > 5))'
-    @d.l(~{:x => 1...5}).should == '((x < 1) OR (x >= 5))'
+  it "should support negating ranges" do
+    @d.l(~Sequel.expr(:x => 1..5)).should == '((x < 1) OR (x > 5))'
+    @d.l(~Sequel.expr(:x => 1...5)).should == '((x < 1) OR (x >= 5))'
   end
   
-  it "should support negating NOT IN via Hash#~ and Dataset or Array" do
-    @d.l(~{:x => @d.select(:i)}).should == '(x NOT IN (SELECT i FROM items))'
-    @d.l(~{:x => [1,2,3]}).should == '(x NOT IN (1, 2, 3))'
+  it "should support negating IN with Dataset or Array" do
+    @d.l(~Sequel.expr(:x => @d.select(:i))).should == '(x NOT IN (SELECT i FROM items))'
+    @d.l(~Sequel.expr(:x => [1,2,3])).should == '(x NOT IN (1, 2, 3))'
   end
 
-  it "should support + - * / via Symbol#+,-,*,/" do
-    @d.l(:x + 1 > 100).should == '((x + 1) > 100)'
-    @d.l((:x * :y) < 100.01).should == '((x * y) < 100.01)'
-    @d.l((:x - :y/2) >= 100000000000000000000000000000000000).should == '((x - (y / 2)) >= 100000000000000000000000000000000000)'
-    @d.l((((:x - :y)/(:x + :y))*:z) <= 100).should == '((((x - y) / (x + y)) * z) <= 100)'
-    @d.l(~((((:x - :y)/(:x + :y))*:z) <= 100)).should == '((((x - y) / (x + y)) * z) > 100)'
-  end
-  
-  it "should not allow negation of string expressions" do
-    proc{~:x.sql_string}.should raise_error
-    proc{~([:x, :y].sql_string_join)}.should raise_error
+  it "should not add ~ method to string expressions" do
+    proc{~Sequel.expr(:x).sql_string}.should raise_error(NoMethodError) 
   end
 
-  it "should not allow mathematical or string operations on true, false, or nil" do
-    proc{:x + 1}.should_not raise_error
-    proc{:x - true}.should raise_error(Sequel::Error)
-    proc{:x / false}.should raise_error(Sequel::Error)
-    proc{:x * nil}.should raise_error(Sequel::Error)
-    proc{[:x, nil].sql_string_join}.should raise_error(Sequel::Error)
+  it "should allow mathematical or string operations on true, false, or nil" do
+    @d.lit(Sequel.expr(:x) + 1).should == '(x + 1)'
+    @d.lit(Sequel.expr(:x) - true).should == "(x - 't')"
+    @d.lit(Sequel.expr(:x) / false).should == "(x / 'f')"
+    @d.lit(Sequel.expr(:x) * nil).should == '(x * NULL)'
+    @d.lit(Sequel.join([:x, nil])).should == '(x || NULL)'
   end
 
-  it "should not allow mathematical or string operations on boolean complex expressions" do
-    proc{:x + (:y + 1)}.should_not raise_error
-    proc{:x - (~:y)}.should raise_error(Sequel::Error)
-    proc{:x / (:y & :z)}.should raise_error(Sequel::Error)
-    proc{:x * (:y | :z)}.should raise_error(Sequel::Error)
-    proc{:x + :y.like('a')}.should raise_error(Sequel::Error)
-    proc{:x - :y.like(/a/)}.should raise_error(Sequel::Error)
-    proc{:x * :y.like(/a/i)}.should raise_error(Sequel::Error)
-    proc{:x + ~:y.like('a')}.should raise_error(Sequel::Error)
-    proc{:x - ~:y.like(/a/)}.should raise_error(Sequel::Error)
-    proc{:x * ~:y.like(/a/i)}.should raise_error(Sequel::Error)
-    proc{[:x, ~:y.like(/a/i)].sql_string_join}.should raise_error(Sequel::Error)
+  it "should allow mathematical or string operations on boolean complex expressions" do
+    @d.lit(Sequel.expr(:x) + (Sequel.expr(:y) + 1)).should == '(x + y + 1)'
+    @d.lit(Sequel.expr(:x) - ~Sequel.expr(:y)).should == '(x - NOT y)'
+    @d.lit(Sequel.expr(:x) / (Sequel.expr(:y) & :z)).should == '(x / (y AND z))'
+    @d.lit(Sequel.expr(:x) * (Sequel.expr(:y) | :z)).should == '(x * (y OR z))'
+    @d.lit(Sequel.expr(:x) + Sequel.expr(:y).like('a')).should == "(x + (y LIKE 'a'))"
+    @d.lit(Sequel.expr(:x) - ~Sequel.expr(:y).like('a')).should == "(x - (y NOT LIKE 'a'))"
+    @d.lit(Sequel.join([:x, ~Sequel.expr(:y).like('a')])).should == "(x || (y NOT LIKE 'a'))"
   end
 
   it "should support AND conditions via &" do
-    @d.l(:x & :y).should == '(x AND y)'
-    @d.l(:x.sql_boolean & :y).should == '(x AND y)'
-    @d.l(:x & :y & :z).should == '(x AND y AND z)'
-    @d.l(:x & {:y => :z}).should == '(x AND (y = z))'
-    @d.l({:y => :z} & :x).should == '((y = z) AND x)'
-    @d.l({:x => :a} & {:y => :z}).should == '((x = a) AND (y = z))'
-    @d.l((:x + 200 < 0) & (:y - 200 < 0)).should == '(((x + 200) < 0) AND ((y - 200) < 0))'
-    @d.l(:x & ~:y).should == '(x AND NOT y)'
-    @d.l(~:x & :y).should == '(NOT x AND y)'
-    @d.l(~:x & ~:y).should == '(NOT x AND NOT y)'
+    @d.l(Sequel.expr(:x) & :y).should == '(x AND y)'
+    @d.l(Sequel.expr(:x).sql_boolean & :y).should == '(x AND y)'
+    @d.l(Sequel.expr(:x) & :y & :z).should == '(x AND y AND z)'
+    @d.l(Sequel.expr(:x) & {:y => :z}).should == '(x AND (y = z))'
+    @d.l((Sequel.expr(:x) + 200 < 0) & (Sequel.expr(:y) - 200 < 0)).should == '(((x + 200) < 0) AND ((y - 200) < 0))'
+    @d.l(Sequel.expr(:x) & ~Sequel.expr(:y)).should == '(x AND NOT y)'
+    @d.l(~Sequel.expr(:x) & :y).should == '(NOT x AND y)'
+    @d.l(~Sequel.expr(:x) & ~Sequel.expr(:y)).should == '(NOT x AND NOT y)'
   end
   
   it "should support OR conditions via |" do
-    @d.l(:x | :y).should == '(x OR y)'
-    @d.l(:x.sql_boolean | :y).should == '(x OR y)'
-    @d.l(:x | :y | :z).should == '(x OR y OR z)'
-    @d.l(:x | {:y => :z}).should == '(x OR (y = z))'
-    @d.l({:y => :z} | :x).should == '((y = z) OR x)'
-    @d.l({:x => :a} | {:y => :z}).should == '((x = a) OR (y = z))'
-    @d.l((:x.sql_number > 200) | (:y.sql_number < 200)).should == '((x > 200) OR (y < 200))'
+    @d.l(Sequel.expr(:x) | :y).should == '(x OR y)'
+    @d.l(Sequel.expr(:x).sql_boolean | :y).should == '(x OR y)'
+    @d.l(Sequel.expr(:x) | :y | :z).should == '(x OR y OR z)'
+    @d.l(Sequel.expr(:x) | {:y => :z}).should == '(x OR (y = z))'
+    @d.l((Sequel.expr(:x).sql_number > 200) | (Sequel.expr(:y).sql_number < 200)).should == '((x > 200) OR (y < 200))'
   end
   
   it "should support & | combinations" do
-    @d.l((:x | :y) & :z).should == '((x OR y) AND z)'
-    @d.l(:x | (:y & :z)).should == '(x OR (y AND z))'
-    @d.l((:x & :w) | (:y & :z)).should == '((x AND w) OR (y AND z))'
+    @d.l((Sequel.expr(:x) | :y) & :z).should == '((x OR y) AND z)'
+    @d.l(Sequel.expr(:x) | (Sequel.expr(:y) & :z)).should == '(x OR (y AND z))'
+    @d.l((Sequel.expr(:x) & :w) | (Sequel.expr(:y) & :z)).should == '((x AND w) OR (y AND z))'
   end
   
   it "should support & | with ~" do
-    @d.l(~((:x | :y) & :z)).should == '((NOT x AND NOT y) OR NOT z)'
-    @d.l(~(:x | (:y & :z))).should == '(NOT x AND (NOT y OR NOT z))'
-    @d.l(~((:x & :w) | (:y & :z))).should == '((NOT x OR NOT w) AND (NOT y OR NOT z))'
-    @d.l(~((:x.sql_number > 200) | (:y & :z))).should == '((x <= 200) AND (NOT y OR NOT z))'
+    @d.l(~((Sequel.expr(:x) | :y) & :z)).should == '((NOT x AND NOT y) OR NOT z)'
+    @d.l(~(Sequel.expr(:x) | (Sequel.expr(:y) & :z))).should == '(NOT x AND (NOT y OR NOT z))'
+    @d.l(~((Sequel.expr(:x) & :w) | (Sequel.expr(:y) & :z))).should == '((NOT x OR NOT w) AND (NOT y OR NOT z))'
+    @d.l(~((Sequel.expr(:x).sql_number > 200) | (Sequel.expr(:y) & :z))).should == '((x <= 200) AND (NOT y OR NOT z))'
   end
   
   it "should support LiteralString" do
-    @d.l('x'.lit).should == '(x)'
-    @d.l(~'x'.lit).should == 'NOT x'
-    @d.l(~~'x'.lit).should == 'x'
-    @d.l(~(('x'.lit | :y) & :z)).should == '((NOT x AND NOT y) OR NOT z)'
-    @d.l(~(:x | 'y'.lit)).should == '(NOT x AND NOT y)'
-    @d.l(~('x'.lit & 'y'.lit)).should == '(NOT x OR NOT y)'
-    @d.l({'y'.lit => 'z'.lit} & 'x'.lit).should == '((y = z) AND x)'
-    @d.l(('x'.lit > 200) & ('y'.lit < 200)).should == '((x > 200) AND (y < 200))'
-    @d.l(~('x'.lit + 1 > 100)).should == '((x + 1) <= 100)'
-    @d.l('x'.lit.like(/a/)).should == '(x ~ \'a\')'
-    @d.l('x'.lit + 1 > 100).should == '((x + 1) > 100)'
-    @d.l(('x'.lit * :y) < 100.01).should == '((x * y) < 100.01)'
-    @d.l(('x'.lit - :y/2) >= 100000000000000000000000000000000000).should == '((x - (y / 2)) >= 100000000000000000000000000000000000)'
-    @d.l(('z'.lit * (('x'.lit / :y)/(:x + :y))) <= 100).should == '((z * (x / y / (x + y))) <= 100)'
-    @d.l(~(((('x'.lit - :y)/(:x + :y))*:z) <= 100)).should == '((((x - y) / (x + y)) * z) > 100)'
+    @d.l(Sequel.lit('x')).should == '(x)'
+    @d.l(~Sequel.lit('x')).should == 'NOT x'
+    @d.l(~~Sequel.lit('x')).should == 'x'
+    @d.l(~((Sequel.lit('x') | :y) & :z)).should == '((NOT x AND NOT y) OR NOT z)'
+    @d.l(~(Sequel.expr(:x) | Sequel.lit('y'))).should == '(NOT x AND NOT y)'
+    @d.l(~(Sequel.lit('x') & Sequel.lit('y'))).should == '(NOT x OR NOT y)'
+    @d.l(Sequel.expr(Sequel.lit('y') => Sequel.lit('z')) & Sequel.lit('x')).should == '((y = z) AND x)'
+    @d.l((Sequel.lit('x') > 200) & (Sequel.lit('y') < 200)).should == '((x > 200) AND (y < 200))'
+    @d.l(~(Sequel.lit('x') + 1 > 100)).should == '((x + 1) <= 100)'
+    @d.l(Sequel.lit('x').like('a')).should == '(x LIKE \'a\')'
+    @d.l(Sequel.lit('x') + 1 > 100).should == '((x + 1) > 100)'
+    @d.l((Sequel.lit('x') * :y) < 100.01).should == '((x * y) < 100.01)'
+    @d.l((Sequel.lit('x') - Sequel.expr(:y)/2) >= 100000000000000000000000000000000000).should == '((x - (y / 2)) >= 100000000000000000000000000000000000)'
+    @d.l((Sequel.lit('z') * ((Sequel.lit('x') / :y)/(Sequel.expr(:x) + :y))) <= 100).should == '((z * (x / y / (x + y))) <= 100)'
+    @d.l(~((((Sequel.lit('x') - :y)/(Sequel.expr(:x) + :y))*:z) <= 100)).should == '((((x - y) / (x + y)) * z) > 100)'
   end
 
   it "should support hashes by ANDing the conditions" do
@@ -273,134 +157,71 @@ describe "Blockless Ruby Filters" do
     @d.l(:x => nil, :y => [1,2,3])[1...-1].split(' AND ').sort.should == ['(x IS NULL)', '(y IN (1, 2, 3))']
   end
   
-  it "should support sql_expr on hashes" do
-    @d.l({:x => 100, :y => 'a'}.sql_expr)[1...-1].split(' AND ').sort.should == ['(x = 100)', '(y = \'a\')']
-    @d.l({:x => true, :y => false}.sql_expr)[1...-1].split(' AND ').sort.should == ['(x IS TRUE)', '(y IS FALSE)']
-    @d.l({:x => nil, :y => [1,2,3]}.sql_expr)[1...-1].split(' AND ').sort.should == ['(x IS NULL)', '(y IN (1, 2, 3))']
-  end
-  
-  it "should support sql_negate on hashes" do
-    @d.l({:x => 100, :y => 'a'}.sql_negate)[1...-1].split(' AND ').sort.should == ['(x != 100)', '(y != \'a\')']
-    @d.l({:x => true, :y => false}.sql_negate)[1...-1].split(' AND ').sort.should == ['(x IS NOT TRUE)', '(y IS NOT FALSE)']
-    @d.l({:x => nil, :y => [1,2,3]}.sql_negate)[1...-1].split(' AND ').sort.should == ['(x IS NOT NULL)', '(y NOT IN (1, 2, 3))']
-  end
-  
-  it "should support ~ on hashes" do
-    @d.l(~{:x => 100, :y => 'a'})[1...-1].split(' OR ').sort.should == ['(x != 100)', '(y != \'a\')']
-    @d.l(~{:x => true, :y => false})[1...-1].split(' OR ').sort.should == ['(x IS NOT TRUE)', '(y IS NOT FALSE)']
-    @d.l(~{:x => nil, :y => [1,2,3]})[1...-1].split(' OR ').sort.should == ['(x IS NOT NULL)', '(y NOT IN (1, 2, 3))']
-  end
-  
-  it "should support sql_or on hashes" do
-    @d.l({:x => 100, :y => 'a'}.sql_or)[1...-1].split(' OR ').sort.should == ['(x = 100)', '(y = \'a\')']
-    @d.l({:x => true, :y => false}.sql_or)[1...-1].split(' OR ').sort.should == ['(x IS TRUE)', '(y IS FALSE)']
-    @d.l({:x => nil, :y => [1,2,3]}.sql_or)[1...-1].split(' OR ').sort.should == ['(x IS NULL)', '(y IN (1, 2, 3))']
-  end
-  
   it "should support arrays with all two pairs the same as hashes" do
     @d.l([[:x, 100],[:y, 'a']]).should == '((x = 100) AND (y = \'a\'))'
     @d.l([[:x, true], [:y, false]]).should == '((x IS TRUE) AND (y IS FALSE))'
     @d.l([[:x, nil], [:y, [1,2,3]]]).should == '((x IS NULL) AND (y IN (1, 2, 3)))'
   end
   
-  it "should support sql_expr on arrays with all two pairs" do
-    @d.l([[:x, 100],[:y, 'a']].sql_expr).should == '((x = 100) AND (y = \'a\'))'
-    @d.l([[:x, true], [:y, false]].sql_expr).should == '((x IS TRUE) AND (y IS FALSE))'
-    @d.l([[:x, nil], [:y, [1,2,3]]].sql_expr).should == '((x IS NULL) AND (y IN (1, 2, 3)))'
-  end
-  
-  it "should support sql_negate on arrays with all two pairs" do
-    @d.l([[:x, 100],[:y, 'a']].sql_negate).should == '((x != 100) AND (y != \'a\'))'
-    @d.l([[:x, true], [:y, false]].sql_negate).should == '((x IS NOT TRUE) AND (y IS NOT FALSE))'
-    @d.l([[:x, nil], [:y, [1,2,3]]].sql_negate).should == '((x IS NOT NULL) AND (y NOT IN (1, 2, 3)))'
-  end
-  
-  it "should support ~ on arrays with all two pairs" do
-    @d.l(~[[:x, 100],[:y, 'a']]).should == '((x != 100) OR (y != \'a\'))'
-    @d.l(~[[:x, true], [:y, false]]).should == '((x IS NOT TRUE) OR (y IS NOT FALSE))'
-    @d.l(~[[:x, nil], [:y, [1,2,3]]]).should == '((x IS NOT NULL) OR (y NOT IN (1, 2, 3)))'
-  end
-  
-  it "should support sql_or on arrays with all two pairs" do
-    @d.l([[:x, 100],[:y, 'a']].sql_or).should == '((x = 100) OR (y = \'a\'))'
-    @d.l([[:x, true], [:y, false]].sql_or).should == '((x IS TRUE) OR (y IS FALSE))'
-    @d.l([[:x, nil], [:y, [1,2,3]]].sql_or).should == '((x IS NULL) OR (y IN (1, 2, 3)))'
-  end
-  
   it "should emulate columns for array values" do
-    @d.l([:x, :y]=>[[1,2], [3,4]].sql_array).should == '((x, y) IN ((1, 2), (3, 4)))'
+    @d.l([:x, :y]=>Sequel.value_list([[1,2], [3,4]])).should == '((x, y) IN ((1, 2), (3, 4)))'
     @d.l([:x, :y, :z]=>[[1,2,5], [3,4,6]]).should == '((x, y, z) IN ((1, 2, 5), (3, 4, 6)))'
   end
   
   it "should emulate multiple column in if not supported" do
     @d.meta_def(:supports_multiple_column_in?){false}
-    @d.l([:x, :y]=>[[1,2], [3,4]].sql_array).should == '(((x = 1) AND (y = 2)) OR ((x = 3) AND (y = 4)))'
+    @d.l([:x, :y]=>Sequel.value_list([[1,2], [3,4]])).should == '(((x = 1) AND (y = 2)) OR ((x = 3) AND (y = 4)))'
     @d.l([:x, :y, :z]=>[[1,2,5], [3,4,6]]).should == '(((x = 1) AND (y = 2) AND (z = 5)) OR ((x = 3) AND (y = 4) AND (z = 6)))'
   end
   
-  it "should support Array#sql_string_join for concatenation of SQL strings" do
-    @d.lit([:x].sql_string_join).should == '(x)'
-    @d.lit([:x].sql_string_join(', ')).should == '(x)'
-    @d.lit([:x, :y].sql_string_join).should == '(x || y)'
-    @d.lit([:x, :y].sql_string_join(', ')).should == "(x || ', ' || y)"
-    @d.lit([:x.sql_function(1), :y.sql_subscript(1)].sql_string_join).should == '(x(1) || y[1])'
-    @d.lit([:x.sql_function(1), 'y.z'.lit].sql_string_join(', ')).should == "(x(1) || ', ' || y.z)"
-    @d.lit([:x, 1, :y].sql_string_join).should == "(x || '1' || y)"
-    @d.lit([:x, 1, :y].sql_string_join(', ')).should == "(x || ', ' || '1' || ', ' || y)"
-    @d.lit([:x, 1, :y].sql_string_join(:y__z)).should == "(x || y.z || '1' || y.z || y)"
-    @d.lit([:x, 1, :y].sql_string_join(1)).should == "(x || '1' || '1' || '1' || y)"
-    @d.lit([:x, :y].sql_string_join('y.x || x.y'.lit)).should == "(x || y.x || x.y || y)"
-    @d.lit([[:x, :y].sql_string_join, [:a, :b].sql_string_join].sql_string_join).should == "(x || y || a || b)"
-  end
-
   it "should support StringExpression#+ for concatenation of SQL strings" do
-    @d.lit(:x.sql_string + :y).should == '(x || y)'
-    @d.lit([:x].sql_string_join + :y).should == '(x || y)'
-    @d.lit([:x, :z].sql_string_join(' ') + :y).should == "(x || ' ' || z || y)"
+    @d.lit(Sequel.expr(:x).sql_string + :y).should == '(x || y)'
+    @d.lit(Sequel.join([:x]) + :y).should == '(x || y)'
+    @d.lit(Sequel.join([:x, :z], ' ') + :y).should == "(x || ' ' || z || y)"
   end
 
   it "should be supported inside blocks" do
-    @d.l{[[:x, nil], [:y, [1,2,3]]].sql_or}.should == '((x IS NULL) OR (y IN (1, 2, 3)))'
-    @d.l{~[[:x, nil], [:y, [1,2,3]]]}.should == '((x IS NOT NULL) OR (y NOT IN (1, 2, 3)))'
-    @d.l{~(((('x'.lit - :y)/(:x + :y))*:z) <= 100)}.should == '((((x - y) / (x + y)) * z) > 100)'
-    @d.l{{:x => :a} & {:y => :z}}.should == '((x = a) AND (y = z))'
+    @d.l{Sequel.or([[:x, nil], [:y, [1,2,3]]])}.should == '((x IS NULL) OR (y IN (1, 2, 3)))'
+    @d.l{Sequel.~([[:x, nil], [:y, [1,2,3]]])}.should == '((x IS NOT NULL) OR (y NOT IN (1, 2, 3)))'
+    @d.l{~((((Sequel.lit('x') - :y)/(Sequel.expr(:x) + :y))*:z) <= 100)}.should == '((((x - y) / (x + y)) * z) > 100)'
+    @d.l{Sequel.&({:x => :a}, {:y => :z})}.should == '((x = a) AND (y = z))'
   end
 
   it "should support &, |, ^, ~, <<, and >> for NumericExpressions" do
-    @d.l(:x.sql_number & 1 > 100).should == '((x & 1) > 100)'
-    @d.l(:x.sql_number | 1 > 100).should == '((x | 1) > 100)'
-    @d.l(:x.sql_number ^ 1 > 100).should == '((x ^ 1) > 100)'
-    @d.l(~:x.sql_number > 100).should == '(~x > 100)'
-    @d.l(:x.sql_number << 1 > 100).should == '((x << 1) > 100)'
-    @d.l(:x.sql_number >> 1 > 100).should == '((x >> 1) > 100)'
-    @d.l((:x + 1) & 1 > 100).should == '(((x + 1) & 1) > 100)'
-    @d.l((:x + 1) | 1 > 100).should == '(((x + 1) | 1) > 100)'
-    @d.l((:x + 1) ^ 1 > 100).should == '(((x + 1) ^ 1) > 100)'
-    @d.l(~(:x + 1) > 100).should == '(~(x + 1) > 100)'
-    @d.l((:x + 1) << 1 > 100).should == '(((x + 1) << 1) > 100)'
-    @d.l((:x + 1) >> 1 > 100).should == '(((x + 1) >> 1) > 100)'
-    @d.l((:x + 1) & (:x + 2) > 100).should == '(((x + 1) & (x + 2)) > 100)'
+    @d.l(Sequel.expr(:x).sql_number & 1 > 100).should == '((x & 1) > 100)'
+    @d.l(Sequel.expr(:x).sql_number | 1 > 100).should == '((x | 1) > 100)'
+    @d.l(Sequel.expr(:x).sql_number ^ 1 > 100).should == '((x ^ 1) > 100)'
+    @d.l(~Sequel.expr(:x).sql_number > 100).should == '(~x > 100)'
+    @d.l(Sequel.expr(:x).sql_number << 1 > 100).should == '((x << 1) > 100)'
+    @d.l(Sequel.expr(:x).sql_number >> 1 > 100).should == '((x >> 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) & 1 > 100).should == '(((x + 1) & 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) | 1 > 100).should == '(((x + 1) | 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) ^ 1 > 100).should == '(((x + 1) ^ 1) > 100)'
+    @d.l(~(Sequel.expr(:x) + 1) > 100).should == '(~(x + 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) << 1 > 100).should == '(((x + 1) << 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) >> 1 > 100).should == '(((x + 1) >> 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) & (Sequel.expr(:x) + 2) > 100).should == '(((x + 1) & (x + 2)) > 100)'
   end
 
-  it "should raise an error if use a Bitwise method on a ComplexExpression that isn't a NumericExpression" do
-    proc{(:x + 1) & (:x & 2)}.should raise_error(Sequel::Error)
+  it "should allow using a Bitwise method on a ComplexExpression that isn't a NumericExpression" do
+    @d.lit((Sequel.expr(:x) + 1) & (Sequel.expr(:x) + '2')).should == "((x + 1) & (x || '2'))"
   end
 
-  it "should raise an error if use a Boolean method on a ComplexExpression that isn't a BooleanExpression" do
-    proc{:x & (:x + 2)}.should raise_error(Sequel::Error)
+  it "should allow using a Boolean method on a ComplexExpression that isn't a BooleanExpression" do
+    @d.l(Sequel.expr(:x) & (Sequel.expr(:x) + '2')).should == "(x AND (x || '2'))"
   end
 
   it "should raise an error if attempting to invert a ComplexExpression that isn't a BooleanExpression" do
-    proc{Sequel::SQL::BooleanExpression.invert(:x + 2)}.should raise_error(Sequel::Error)
+    proc{Sequel::SQL::BooleanExpression.invert(Sequel.expr(:x) + 2)}.should raise_error(Sequel::Error)
   end
 
   it "should return self on .lit" do
-    y = :x + 1
+    y = Sequel.expr(:x) + 1
     y.lit.should == y
   end
 
   it "should return have .sql_literal operate like .to_s" do
-    y = :x + 1
+    y = Sequel.expr(:x) + 1
     y.sql_literal(@d).should == '(x + 1)'
     y.sql_literal(@d).should == y.to_s(@d)
     y.sql_literal(@d).should == @d.literal(y)
@@ -416,68 +237,159 @@ describe "Blockless Ruby Filters" do
   end
   
   it "should support negation of SQL::Constants" do
-    @d.l(~{:x => Sequel::NULL}).should == '(x IS NOT NULL)'
-    @d.l(~{:x => Sequel::NOTNULL}).should == '(x IS NULL)'
-    @d.l(~{:x => Sequel::TRUE}).should == '(x IS NOT TRUE)'
-    @d.l(~{:x => Sequel::FALSE}).should == '(x IS NOT FALSE)'
-    @d.l(~{:x => Sequel::SQLTRUE}).should == '(x IS NOT TRUE)'
-    @d.l(~{:x => Sequel::SQLFALSE}).should == '(x IS NOT FALSE)'
+    @d.l(Sequel.~(:x => Sequel::NULL)).should == '(x IS NOT NULL)'
+    @d.l(Sequel.~(:x => Sequel::NOTNULL)).should == '(x IS NULL)'
+    @d.l(Sequel.~(:x => Sequel::TRUE)).should == '(x IS NOT TRUE)'
+    @d.l(Sequel.~(:x => Sequel::FALSE)).should == '(x IS NOT FALSE)'
+    @d.l(Sequel.~(:x => Sequel::SQLTRUE)).should == '(x IS NOT TRUE)'
+    @d.l(Sequel.~(:x => Sequel::SQLFALSE)).should == '(x IS NOT FALSE)'
+  end
+  
+  it "should support direct negation of SQL::Constants" do
+    @d.l({:x => ~Sequel::NULL}).should == '(x IS NOT NULL)'
+    @d.l({:x => ~Sequel::NOTNULL}).should == '(x IS NULL)'
+    @d.l({:x => ~Sequel::TRUE}).should == '(x IS FALSE)'
+    @d.l({:x => ~Sequel::FALSE}).should == '(x IS TRUE)'
+    @d.l({:x => ~Sequel::SQLTRUE}).should == '(x IS FALSE)'
+    @d.l({:x => ~Sequel::SQLFALSE}).should == '(x IS TRUE)'
   end
   
+  it "should raise an error if trying to invert an invalid SQL::Constant" do
+    proc{~Sequel::CURRENT_DATE}.should raise_error(Sequel::Error)
+  end
+
   it "should raise an error if trying to create an invalid complex expression" do
     proc{Sequel::SQL::ComplexExpression.new(:BANG, 1, 2)}.should raise_error(Sequel::Error)
   end
 
+  it "should use a string concatentation for + if given a string" do
+    @d.lit(Sequel.expr(:x) + '1').should == "(x || '1')"
+    @d.lit(Sequel.expr(:x) + '1' + '1').should == "(x || '1' || '1')"
+  end
+
+  it "should use an addition for + if given a literal string" do
+    @d.lit(Sequel.expr(:x) + Sequel.lit('1')).should == "(x + 1)"
+    @d.lit(Sequel.expr(:x) + Sequel.lit('1') + Sequel.lit('1')).should == "(x + 1 + 1)"
+  end
+
+  it "should use a bitwise operator for & and | if given an integer" do
+    @d.lit(Sequel.expr(:x) & 1).should == "(x & 1)"
+    @d.lit(Sequel.expr(:x) | 1).should == "(x | 1)"
+    @d.lit(Sequel.expr(:x) & 1 & 1).should == "(x & 1 & 1)"
+    @d.lit(Sequel.expr(:x) | 1 | 1).should == "(x | 1 | 1)"
+  end
+  
+  it "should allow adding a string to an integer expression" do
+    @d.lit(Sequel.expr(:x) + 1 + 'a').should == "(x + 1 + 'a')"
+  end
+
+  it "should allow adding an integer to an string expression" do
+    @d.lit(Sequel.expr(:x) + 'a' + 1).should == "(x || 'a' || 1)"
+  end
+
+  it "should allow adding a boolean to an integer expression" do
+    @d.lit(Sequel.expr(:x) + 1 + true).should == "(x + 1 + 't')"
+  end
+
+  it "should allow adding a boolean to an string expression" do
+    @d.lit(Sequel.expr(:x) + 'a' + true).should == "(x || 'a' || 't')"
+  end
+
+  it "should allow using a boolean operation with an integer on an boolean expression" do
+    @d.lit(Sequel.expr(:x) & :a & 1).should == "(x AND a AND 1)"
+  end
+
+  it "should allow using a boolean operation with a string on an boolean expression" do
+    @d.lit(Sequel.expr(:x) & :a & 'a').should == "(x AND a AND 'a')"
+  end
+
+  it "should allowing AND of boolean expression and literal string" do
+   @d.lit(Sequel.expr(:x) & :a & Sequel.lit('a')).should == "(x AND a AND a)"
+  end
+
+  it "should allowing + of integer expression and literal string" do
+   @d.lit(Sequel.expr(:x) + :a + Sequel.lit('a')).should == "(x + a + a)"
+  end
+
+  it "should allowing + of string expression and literal string" do
+   @d.lit(Sequel.expr(:x) + 'a' + Sequel.lit('a')).should == "(x || 'a' || a)"
+  end
+
+  it "should allow sql_{string,boolean,number} methods on numeric expressions" do
+   @d.lit((Sequel.expr(:x) + 1).sql_string + 'a').should == "((x + 1) || 'a')"
+   @d.lit((Sequel.expr(:x) + 1).sql_boolean & 1).should == "((x + 1) AND 1)"
+   @d.lit((Sequel.expr(:x) + 1).sql_number + 'a').should == "(x + 1 + 'a')"
+  end
+
+  it "should allow sql_{string,boolean,number} methods on string expressions" do
+   @d.lit((Sequel.expr(:x) + 'a').sql_string + 'a').should == "(x || 'a' || 'a')"
+   @d.lit((Sequel.expr(:x) + 'a').sql_boolean & 1).should == "((x || 'a') AND 1)"
+   @d.lit((Sequel.expr(:x) + 'a').sql_number + 'a').should == "((x || 'a') + 'a')"
+  end
+
+  it "should allow sql_{string,boolean,number} methods on boolean expressions" do
+   @d.lit((Sequel.expr(:x) & :y).sql_string + 'a').should == "((x AND y) || 'a')"
+   @d.lit((Sequel.expr(:x) & :y).sql_boolean & 1).should == "(x AND y AND 1)"
+   @d.lit((Sequel.expr(:x) & :y).sql_number + 'a').should == "((x AND y) + 'a')"
+  end
+
   it "should raise an error if trying to literalize an invalid complex expression" do
-    ce = :x + 1
+    ce = Sequel.+(:x, 1)
     ce.instance_variable_set(:@op, :BANG)
     proc{@d.lit(ce)}.should raise_error(Sequel::Error)
   end
 
   it "should support equality comparison of two expressions" do
-    e1 = ~:comment.like('%:hidden:%')
-    e2 = ~:comment.like('%:hidden:%')
+    e1 = ~Sequel.like(:comment, '%:hidden:%')
+    e2 = ~Sequel.like(:comment, '%:hidden:%')
     e1.should == e2
   end
-  
-  if RUBY_VERSION < '1.9.0'
-    it "should not allow inequality operations on true, false, or nil" do
-      proc{:x > 1}.should_not raise_error
-      proc{:x < true}.should raise_error(Sequel::Error)
-      proc{:x >= false}.should raise_error(Sequel::Error)
-      proc{:x <= nil}.should raise_error(Sequel::Error)
-    end
 
-    it "should not allow inequality operations on boolean complex expressions" do
-      proc{:x > (:y > 5)}.should raise_error(Sequel::Error)
-      proc{:x < (:y < 5)}.should raise_error(Sequel::Error)
-      proc{:x >= (:y >= 5)}.should raise_error(Sequel::Error)
-      proc{:x <= (:y <= 5)}.should raise_error(Sequel::Error)
-      proc{:x > {:y => nil}}.should raise_error(Sequel::Error)
-      proc{:x < ~{:y => nil}}.should raise_error(Sequel::Error)
-      proc{:x >= {:y => 5}}.should raise_error(Sequel::Error)
-      proc{:x <= ~{:y => 5}}.should raise_error(Sequel::Error)
-      proc{:x >= {:y => [1,2,3]}}.should raise_error(Sequel::Error)
-      proc{:x <= ~{:y => [1,2,3]}}.should raise_error(Sequel::Error)
-    end
-    
-    it "should support >, <, >=, and <= via Symbol#>,<,>=,<=" do
-      @d.l(:x > 100).should == '(x > 100)'
-      @d.l(:x < 100.01).should == '(x < 100.01)'
-      @d.l(:x >= 100000000000000000000000000000000000).should == '(x >= 100000000000000000000000000000000000)'
-      @d.l(:x <= 100).should == '(x <= 100)'
-    end
-    
-    it "should support negation of >, <, >=, and <= via Symbol#~" do
-      @d.l(~(:x > 100)).should == '(x <= 100)'
-      @d.l(~(:x < 100.01)).should == '(x >= 100.01)'
-      @d.l(~(:x >= 100000000000000000000000000000000000)).should == '(x < 100000000000000000000000000000000000)'
-      @d.l(~(:x <= 100)).should == '(x > 100)'
-    end
-    
-    it "should support double negation via ~" do
-      @d.l(~~(:x > 100)).should == '(x > 100)'
-    end
+  it "should support expression filter methods on Datasets" do
+    d = @d.select(:a)
+
+    @d.lit(d + 1).should == '((SELECT a FROM items) + 1)'
+    @d.lit(d - 1).should == '((SELECT a FROM items) - 1)'
+    @d.lit(d * 1).should == '((SELECT a FROM items) * 1)'
+    @d.lit(d / 1).should == '((SELECT a FROM items) / 1)'
+
+    @d.lit(d => 1).should == '((SELECT a FROM items) = 1)'
+    @d.lit(Sequel.~(d => 1)).should == '((SELECT a FROM items) != 1)'
+    @d.lit(d > 1).should == '((SELECT a FROM items) > 1)'
+    @d.lit(d < 1).should == '((SELECT a FROM items) < 1)'
+    @d.lit(d >= 1).should == '((SELECT a FROM items) >= 1)'
+    @d.lit(d <= 1).should == '((SELECT a FROM items) <= 1)'
+
+    @d.lit(d.as(:b)).should == '(SELECT a FROM items) AS b'
+
+    @d.lit(d & :b).should == '((SELECT a FROM items) AND b)'
+    @d.lit(d | :b).should == '((SELECT a FROM items) OR b)'
+    @d.lit(~d).should == 'NOT (SELECT a FROM items)'
+
+    @d.lit(d.cast(Integer)).should == 'CAST((SELECT a FROM items) AS integer)'
+    @d.lit(d.cast_numeric).should == 'CAST((SELECT a FROM items) AS integer)'
+    @d.lit(d.cast_string).should == 'CAST((SELECT a FROM items) AS varchar(255))'
+    @d.lit(d.cast_numeric << :b).should == '(CAST((SELECT a FROM items) AS integer) << b)'
+    @d.lit(d.cast_string + :b).should == '(CAST((SELECT a FROM items) AS varchar(255)) || b)'
+
+    @d.lit(d.extract(:year)).should == 'extract(year FROM (SELECT a FROM items))'
+    @d.lit(d.sql_boolean & :b).should == '((SELECT a FROM items) AND b)'
+    @d.lit(d.sql_number << :b).should == '((SELECT a FROM items) << b)'
+    @d.lit(d.sql_string + :b).should == '((SELECT a FROM items) || b)'
+
+    @d.lit(d.asc).should == '(SELECT a FROM items) ASC'
+    @d.lit(d.desc).should == '(SELECT a FROM items) DESC'
+
+    @d.lit(d.like(:b)).should == '((SELECT a FROM items) LIKE b)'
+    @d.lit(d.ilike(:b)).should == '((SELECT a FROM items) ILIKE b)'
+  end
+
+  it "should handled emulated char_length function" do
+    @d.lit(Sequel.char_length(:a)).should == 'char_length(a)'
+  end
+
+  it "should handled emulated trim function" do
+    @d.lit(Sequel.trim(:a)).should == 'trim(a)'
   end
 end
 
@@ -553,7 +465,7 @@ describe Sequel::SQL::VirtualRow do
   end
 
   it "should support :frame=>:rows option for window function calls" do
-    @d.l{rank(:over, :frame=>:rows){}}.should == 'rank() OVER (ROWS UNBOUNDED PRECEDING)'
+    @d.l{rank(:over, :frame=>:rows){}}.should == 'rank() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
   end
 
   it "should support :frame=>'some string' option for window function calls" do
@@ -565,7 +477,7 @@ describe Sequel::SQL::VirtualRow do
   end
 
   it "should support all these options together" do
-    @d.l{count(:over, :* =>true, :partition=>a, :order=>b, :window=>:win, :frame=>:rows){}}.should == 'count(*) OVER ("win" PARTITION BY "a" ORDER BY "b" ROWS UNBOUNDED PRECEDING)'
+    @d.l{count(:over, :* =>true, :partition=>a, :order=>b, :window=>:win, :frame=>:rows){}}.should == 'count(*) OVER ("win" PARTITION BY "a" ORDER BY "b" ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
   end
 
   it "should raise an error if window functions are not supported" do
@@ -596,4 +508,448 @@ describe Sequel::SQL::VirtualRow do
     Sequel::BasicObject.remove_methods!
     @d.l{a > adsoiwemlsdaf2}.should == '("a" > "adsoiwemlsdaf2")'
   end
+
+  it "should have operator methods defined that produce Sequel expression objects" do
+    @d.l{|o| o.&({:a=>1}, :b)}.should == '(("a" = 1) AND "b")'
+    @d.l{|o| o.|({:a=>1}, :b)}.should == '(("a" = 1) OR "b")'
+    @d.l{|o| o.+(1, :b) > 2}.should == '((1 + "b") > 2)'
+    @d.l{|o| o.-(1, :b) < 2}.should == '((1 - "b") < 2)'
+    @d.l{|o| o.*(1, :b) >= 2}.should == '((1 * "b") >= 2)'
+    @d.l{|o| o./(1, :b) <= 2}.should == '((1 / "b") <= 2)'
+    @d.l{|o| o.~(:a=>1)}.should == '("a" != 1)'
+    @d.l{|o| o.~([[:a, 1], [:b, 2]])}.should == '(("a" != 1) OR ("b" != 2))'
+    @d.l{|o| o.<(1, :b)}.should == '(1 < "b")'
+    @d.l{|o| o.>(1, :b)}.should == '(1 > "b")'
+    @d.l{|o| o.<=(1, :b)}.should == '(1 <= "b")'
+    @d.l{|o| o.>=(1, :b)}.should == '(1 >= "b")'
+  end
+
+  it "should have have ` produce literal strings" do
+    @d.l{a > `some SQL`}.should == '("a" > some SQL)'
+    @d.l{|o| o.a > o.`('some SQL')}.should == '("a" > some SQL)' #`
+  end
+end
+
+describe "Sequel core extension replacements" do
+  before do
+    @db = Sequel::Database.new
+    @ds = @db.dataset 
+    def @ds.supports_regexp?; true end
+    @o = Object.new
+    def @o.sql_literal(ds) 'foo' end
+  end
+
+  def l(arg, should)
+    @ds.literal(arg).should == should
+  end
+
+  it "Sequel.expr should return items wrapped in Sequel objects" do
+    Sequel.expr(1).should be_a_kind_of(Sequel::SQL::NumericExpression)
+    Sequel.expr('a').should be_a_kind_of(Sequel::SQL::StringExpression)
+    Sequel.expr(true).should be_a_kind_of(Sequel::SQL::BooleanExpression)
+    Sequel.expr(nil).should be_a_kind_of(Sequel::SQL::Wrapper)
+    Sequel.expr({1=>2}).should be_a_kind_of(Sequel::SQL::BooleanExpression)
+    Sequel.expr([[1, 2]]).should be_a_kind_of(Sequel::SQL::BooleanExpression)
+    Sequel.expr([1]).should be_a_kind_of(Sequel::SQL::Wrapper)
+    Sequel.expr{|o| o.should be_a_kind_of(Sequel::SQL::VirtualRow)}
+    Sequel.expr{self.should be_a_kind_of(Sequel::SQL::VirtualRow)}
+    Sequel.expr(:a).should be_a_kind_of(Sequel::SQL::Identifier)
+    Sequel.expr(:a__b).should be_a_kind_of(Sequel::SQL::QualifiedIdentifier)
+    Sequel.expr(:a___c).should be_a_kind_of(Sequel::SQL::AliasedExpression)
+    Sequel.expr(:a___c).expression.should be_a_kind_of(Sequel::SQL::Identifier)
+    Sequel.expr(:a__b___c).should be_a_kind_of(Sequel::SQL::AliasedExpression)
+    Sequel.expr(:a__b___c).expression.should be_a_kind_of(Sequel::SQL::QualifiedIdentifier)
+  end
+
+  it "Sequel.expr should return an appropriate wrapped object" do
+    l(Sequel.expr(1) + 1, "(1 + 1)")
+    l(Sequel.expr('a') + 'b', "('a' || 'b')")
+    l(Sequel.expr(:b) & nil, "(b AND NULL)")
+    l(Sequel.expr(nil) & true, "(NULL AND 't')")
+    l(Sequel.expr(false) & true, "('f' AND 't')")
+    l(Sequel.expr(true) | false, "('t' OR 'f')")
+    l(Sequel.expr(@o) + 1, "(foo + 1)")
+  end
+
+  it "Sequel.expr should handle condition specifiers" do
+    l(Sequel.expr(:a=>1) & nil, "((a = 1) AND NULL)")
+    l(Sequel.expr([[:a, 1]]) & nil, "((a = 1) AND NULL)")
+    l(Sequel.expr([[:a, 1], [:b, 2]]) & nil, "((a = 1) AND (b = 2) AND NULL)")
+  end
+
+  it "Sequel.expr should handle arrays that are not condition specifiers" do
+    l(Sequel.expr([1]), "(1)")
+    l(Sequel.expr([1, 2]), "(1, 2)")
+  end
+
+  it "Sequel.expr should treat blocks/procs as virtual rows and wrap the output" do
+    l(Sequel.expr{1} + 1, "(1 + 1)")
+    l(Sequel.expr{o__a} + 1, "(o.a + 1)")
+    l(Sequel.expr{[[:a, 1]]} & nil, "((a = 1) AND NULL)")
+    l(Sequel.expr{|v| @o} + 1, "(foo + 1)")
+
+    l(Sequel.expr(proc{1}) + 1, "(1 + 1)")
+    l(Sequel.expr(proc{o__a}) + 1, "(o.a + 1)")
+    l(Sequel.expr(proc{[[:a, 1]]}) & nil, "((a = 1) AND NULL)")
+    l(Sequel.expr(proc{|v| @o}) + 1, "(foo + 1)")
+  end
+
+  it "Sequel.expr should raise an error if given an argument and a block" do
+    proc{Sequel.expr(nil){}}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.expr should raise an error if given neither an argument nor a block" do
+    proc{Sequel.expr}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.expr should return existing Sequel expressions directly" do
+    o = Sequel.expr(1)
+    Sequel.expr(o).should equal(o)
+    o = Sequel.lit('1')
+    Sequel.expr(o).should equal(o)
+  end
+
+  it "Sequel.~ should invert the given object" do
+    l(Sequel.~(nil), 'NOT NULL')
+    l(Sequel.~(:a=>1), "(a != 1)")
+    l(Sequel.~([[:a, 1]]), "(a != 1)")
+    l(Sequel.~([[:a, 1], [:b, 2]]), "((a != 1) OR (b != 2))")
+    l(Sequel.~(Sequel.expr([[:a, 1], [:b, 2]]) & nil), "((a != 1) OR (b != 2) OR NOT NULL)")
+  end
+
+  it "Sequel.case should use a CASE expression" do
+    l(Sequel.case({:a=>1}, 2), "(CASE WHEN a THEN 1 ELSE 2 END)")
+    l(Sequel.case({:a=>1}, 2, :b), "(CASE b WHEN a THEN 1 ELSE 2 END)")
+    l(Sequel.case([[:a, 1]], 2), "(CASE WHEN a THEN 1 ELSE 2 END)")
+    l(Sequel.case([[:a, 1]], 2, :b), "(CASE b WHEN a THEN 1 ELSE 2 END)")
+    l(Sequel.case([[:a, 1], [:c, 3]], 2), "(CASE WHEN a THEN 1 WHEN c THEN 3 ELSE 2 END)")
+    l(Sequel.case([[:a, 1], [:c, 3]], 2, :b), "(CASE b WHEN a THEN 1 WHEN c THEN 3 ELSE 2 END)")
+  end
+
+  it "Sequel.case should raise an error if not given a condition specifier" do
+    proc{Sequel.case(1, 2)}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.value_list should use an SQL value list" do
+    l(Sequel.value_list([[1, 2]]), "((1, 2))")
+  end
+
+  it "Sequel.value_list raise an error if not given an array" do
+    proc{Sequel.value_list(1)}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.negate should negate all entries in conditions specifier and join with AND" do
+    l(Sequel.negate(:a=>1), "(a != 1)")
+    l(Sequel.negate([[:a, 1]]), "(a != 1)")
+    l(Sequel.negate([[:a, 1], [:b, 2]]), "((a != 1) AND (b != 2))")
+  end
+
+  it "Sequel.negate should raise an error if not given a conditions specifier" do
+    proc{Sequel.negate(1)}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.or should join all entries in conditions specifier with OR" do
+    l(Sequel.or(:a=>1), "(a = 1)")
+    l(Sequel.or([[:a, 1]]), "(a = 1)")
+    l(Sequel.or([[:a, 1], [:b, 2]]), "((a = 1) OR (b = 2))")
+  end
+
+  it "Sequel.or should raise an error if not given a conditions specifier" do
+    proc{Sequel.or(1)}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.join should should use SQL string concatenation to join array" do
+    l(Sequel.join([]), "''")
+    l(Sequel.join(['a']), "('a')")
+    l(Sequel.join(['a', 'b']), "('a' || 'b')")
+    l(Sequel.join(['a', 'b'], 'c'), "('a' || 'c' || 'b')")
+    l(Sequel.join([true, :b], :c), "('t' || c || b)")
+    l(Sequel.join([false, nil], Sequel.lit('c')), "('f' || c || NULL)")
+    l(Sequel.join([Sequel.expr('a'), Sequel.lit('d')], 'c'), "('a' || 'c' || d)")
+  end
+
+  it "Sequel.join should raise an error if not given an array" do
+    proc{Sequel.join(1)}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.& should join all arguments given with AND" do
+    l(Sequel.&(:a), "(a)")
+    l(Sequel.&(:a, :b=>:c), "(a AND (b = c))")
+    l(Sequel.&(:a, {:b=>:c}, Sequel.lit('d')), "(a AND (b = c) AND d)")
+  end
+
+  it "Sequel.& should raise an error if given no arguments" do
+    proc{Sequel.&}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.| should join all arguments given with OR" do
+    l(Sequel.|(:a), "(a)")
+    l(Sequel.|(:a, :b=>:c), "(a OR (b = c))")
+    l(Sequel.|(:a, {:b=>:c}, Sequel.lit('d')), "(a OR (b = c) OR d)")
+  end
+
+  it "Sequel.| should raise an error if given no arguments" do
+    proc{Sequel.|}.should raise_error(Sequel::Error)
+  end
+
+  it "Sequel.as should return an aliased expression" do
+    l(Sequel.as(:a, :b), "a AS b")
+  end
+
+  it "Sequel.cast should return a CAST expression" do
+    l(Sequel.cast(:a, :int), "CAST(a AS int)")
+    l(Sequel.cast(:a, Integer), "CAST(a AS integer)")
+  end
+
+  it "Sequel.cast_numeric should return a CAST expression treated as a number" do
+    l(Sequel.cast_numeric(:a), "CAST(a AS integer)")
+    l(Sequel.cast_numeric(:a, :int), "CAST(a AS int)")
+    l(Sequel.cast_numeric(:a) << 2, "(CAST(a AS integer) << 2)")
+  end
+
+  it "Sequel.cast_string should return a CAST expression treated as a string" do
+    l(Sequel.cast_string(:a), "CAST(a AS varchar(255))")
+    l(Sequel.cast_string(:a, :text), "CAST(a AS text)")
+    l(Sequel.cast_string(:a) + 'a', "(CAST(a AS varchar(255)) || 'a')")
+  end
+
+  it "Sequel.lit should return a literal string" do
+    l(Sequel.lit('a'), "a")
+  end
+
+  it "Sequel.lit should return the argument if given a single literal string" do
+    o = Sequel.lit('a')
+    Sequel.lit(o).should equal(o)
+  end
+
+  it "Sequel.lit should accept multiple arguments for a placeholder literal string" do
+    l(Sequel.lit('a = ?', 1), "a = 1")
+    l(Sequel.lit('? = ?', :a, 1), "a = 1")
+    l(Sequel.lit('a = :a', :a=>1), "a = 1")
+  end
+
+  it "Sequel.lit should work with an array for the placeholder string" do
+    l(Sequel.lit(['a = '], 1), "a = 1")
+    l(Sequel.lit(['', ' = '], :a, 1), "a = 1")
+  end
+
+  it "Sequel.blob should return an SQL::Blob" do
+    l(Sequel.blob('a'), "'a'")
+    Sequel.blob('a').should be_a_kind_of(Sequel::SQL::Blob)
+  end
+
+  it "Sequel.blob should return the given argument if given a blob" do
+    o = Sequel.blob('a')
+    Sequel.blob(o).should equal(o)
+  end
+
+  it "Sequel.qualify should return a qualified identifier" do
+    l(Sequel.qualify(:t, :c), "t.c")
+  end
+
+  it "Sequel.identifier should return an identifier" do
+    l(Sequel.identifier(:t__c), "t__c")
+  end
+
+  it "Sequel.asc should return an ASC ordered expression" do
+    l(Sequel.asc(:a), "a ASC")
+    l(Sequel.asc(:a, :nulls=>:first), "a ASC NULLS FIRST")
+  end
+
+  it "Sequel.desc should return a DESC ordered expression " do
+    l(Sequel.desc(:a), "a DESC")
+    l(Sequel.desc(:a, :nulls=>:last), "a DESC NULLS LAST")
+  end
+
+  it "Sequel.{+,-,*,/} should accept arguments and use the appropriate operator" do
+    %w'+ - * /'.each do |op|
+      l(Sequel.send(op, 1), '(1)')
+      l(Sequel.send(op, 1, 2), "(1 #{op} 2)")
+      l(Sequel.send(op, 1, 2, 3), "(1 #{op} 2 #{op} 3)")
+    end
+  end
+
+  it "Sequel.{+,-,*,/} should raise if given no arguments" do
+    %w'+ - * /'.each do |op|
+      proc{Sequel.send(op)}.should raise_error(Sequel::Error)
+    end
+  end
+
+  it "Sequel.like should use a LIKE expression" do
+    l(Sequel.like('a', 'b'), "('a' LIKE 'b')")
+    l(Sequel.like(:a, :b), "(a LIKE b)")
+    l(Sequel.like(:a, /b/), "(a ~ 'b')")
+    l(Sequel.like(:a, 'c', /b/), "((a LIKE 'c') OR (a ~ 'b'))")
+  end
+
+  it "Sequel.ilike should use an ILIKE expression" do
+    l(Sequel.ilike('a', 'b'), "('a' ILIKE 'b')")
+    l(Sequel.ilike(:a, :b), "(a ILIKE b)")
+    l(Sequel.ilike(:a, /b/), "(a ~* 'b')")
+    l(Sequel.ilike(:a, 'c', /b/), "((a ILIKE 'c') OR (a ~* 'b'))")
+  end
+
+  it "Sequel.subscript should use an SQL subscript" do
+    l(Sequel.subscript(:a, 1), 'a[1]')
+    l(Sequel.subscript(:a, 1, 2), 'a[1, 2]')
+    l(Sequel.subscript(:a, [1, 2]), 'a[1, 2]')
+  end
+
+  it "Sequel.function should return an SQL function" do
+    l(Sequel.function(:a), 'a()')
+    l(Sequel.function(:a, 1), 'a(1)')
+    l(Sequel.function(:a, :b, 2), 'a(b, 2)')
+  end
+
+  it "Sequel.extract should use a date/time extraction" do
+    l(Sequel.extract(:year, :a), 'extract(year FROM a)')
+  end
+
+  it "#* with no arguments should use a ColumnAll for Identifier and QualifiedIdentifier" do
+    l(Sequel.expr(:a).*, 'a.*')
+    l(Sequel.expr(:a__b).*, 'a.b.*')
+  end
+
+  it "SQL::Blob should be aliasable and castable by default" do
+    b = Sequel.blob('a')
+    l(b.as(:a), "'a' AS a")
+    l(b.cast(Integer), "CAST('a' AS integer)")
+  end
+
+  it "SQL::Blob should be convertable to a literal string by default" do
+    b = Sequel.blob('a ?')
+    l(b.lit, "a ?")
+    l(b.lit(1), "a 1")
+  end
+end
+
+describe "Sequel::SQL::Function#==" do
+  specify "should be true for functions with the same name and arguments, false otherwise" do
+    a = Sequel.function(:date, :t)
+    b = Sequel.function(:date, :t)
+    a.should == b
+    (a == b).should == true
+    c = Sequel.function(:date, :c)
+    a.should_not == c
+    (a == c).should == false
+    d = Sequel.function(:time, :c)
+    a.should_not == d
+    c.should_not == d
+    (a == d).should == false
+    (c == d).should == false
+  end
+end
+
+describe "Sequel::SQL::OrderedExpression" do
+  specify "should #desc" do
+    @oe = Sequel.asc(:column)
+    @oe.descending.should == false
+    @oe.desc.descending.should == true
+  end
+
+  specify "should #asc" do
+    @oe = Sequel.desc(:column)
+    @oe.descending.should == true
+    @oe.asc.descending.should == false
+  end
+
+  specify "should #invert" do
+    @oe = Sequel.desc(:column)
+    @oe.invert.descending.should == false
+    @oe.invert.invert.descending.should == true
+  end
+end
+
+describe "Expression" do
+  specify "should consider objects == only if they have the same attributes" do
+    Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.should == Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc
+    Sequel.qualify(:table, :other_column).cast(:type).*(:numeric_column).asc.should_not == Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc
+
+    Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.should eql(Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc)
+    Sequel.qualify(:table, :other_column).cast(:type).*(:numeric_column).asc.should_not eql(Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc)
+  end
+
+  specify "should use the same hash value for objects that have the same attributes" do
+    Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.hash.should == Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.hash
+    Sequel.qualify(:table, :other_column).cast(:type).*(:numeric_column).asc.hash.should_not == Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.hash
+
+    h = {}
+    a = Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc
+    b = Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc
+    h[a] = 1
+    h[b] = 2
+    h[a].should == 2
+    h[b].should == 2
+  end
+end
+
+describe "Sequel::SQLTime" do
+  before do
+    @db = Sequel.mock
+  end
+
+  specify ".create should create from hour, minutes, seconds and optional microseconds" do
+    @db.literal(Sequel::SQLTime.create(1, 2, 3)).should == "'01:02:03.000000'"
+    @db.literal(Sequel::SQLTime.create(1, 2, 3, 500000)).should == "'01:02:03.500000'"
+  end
+end
+
+describe "Sequel::SQL::Wrapper" do
+  before do
+    @ds = Sequel.mock.dataset
+  end
+
+  specify "should wrap objects so they can be used by the Sequel DSL" do
+    o = Object.new
+    def o.sql_literal(ds) 'foo' end
+    s = Sequel::SQL::Wrapper.new(o)
+    @ds.literal(s).should == "foo"
+    @ds.literal(s+1).should == "(foo + 1)"
+    @ds.literal(s & true).should == "(foo AND 't')"
+    @ds.literal(s < 1).should == "(foo < 1)"
+    @ds.literal(s.sql_subscript(1)).should == "foo[1]"
+    @ds.literal(s.like('a')).should == "(foo LIKE 'a')"
+    @ds.literal(s.as(:a)).should == "foo AS a"
+    @ds.literal(s.cast(Integer)).should == "CAST(foo AS integer)"
+    @ds.literal(s.desc).should == "foo DESC"
+    @ds.literal(s.sql_string + '1').should == "(foo || '1')"
+  end
+end
+
+describe "Sequel::SQL::Blob#to_sequel_blob" do
+  specify "should return self" do
+    c = Sequel::SQL::Blob.new('a')
+    c.to_sequel_blob.should equal(c)
+  end
+end
+
+describe Sequel::SQL::Subscript do
+  before do
+    @s = Sequel::SQL::Subscript.new(:a, [1])
+    @ds = Sequel::Dataset.new(nil)
+  end
+
+  specify "should have | return a new non-nested subscript" do
+    s = (@s | 2)
+    s.should_not equal(@s)
+    @ds.literal(s).should == 'a[1, 2]'
+  end
+
+  specify "should have [] return a new nested subscript" do
+    s = @s[2]
+    s.should_not equal(@s)
+    @ds.literal(s).should == 'a[1][2]'
+  end
+end
+
+describe "Sequel.recursive_map" do
+  specify "should recursively convert an array using a callable" do
+    Sequel.recursive_map(['1'], proc{|s| s.to_i}).should == [1]
+    Sequel.recursive_map([['1']], proc{|s| s.to_i}).should == [[1]]
+  end
+
+  specify "should not call callable if value is nil" do
+    Sequel.recursive_map([nil], proc{|s| s.to_i}).should == [nil]
+    Sequel.recursive_map([[nil]], proc{|s| s.to_i}).should == [[nil]]
+  end
 end