sequel 4.22.0 → 4.23.0

data/spec/core/deprecated_spec.rb

@@ -20,51 +20,51 @@ describe "Sequel::Deprecated" do
     @d.backtrace_filter = @prev_backtrace_filter
   end
 
-  specify "should output full messages to the given output" do
+  it "should output full messages to the given output" do
     @d.deprecate("foo")
-    @output.should == ['foo']
+    @output.must_equal ['foo']
   end
 
-  specify "should consider two arguments to be a method name and additional text" do
+  it "should consider two arguments to be a method name and additional text" do
     @d.deprecate("foo", "Use bar instead")
-    @output.should == ['foo is deprecated and will be removed in a future version of Sequel.  Use bar instead.']
+    @output.must_equal ['foo is deprecated and will be removed in a future version of Sequel.  Use bar instead.']
   end
 
-  specify "should include a prefix if set" do
+  it "should include a prefix if set" do
     @d.prefix = "DEPWARN: "
     @d.deprecate("foo")
-    @output.should == ['DEPWARN: foo']
+    @output.must_equal ['DEPWARN: foo']
   end
 
-  specify "should not output anything if output is false" do
+  it "should not output anything if output is false" do
     @d.output = false
-    proc{@d.deprecate("foo")}.should_not raise_error
+    @d.deprecate("foo")
   end
 
-  specify "should include full backtrace if backtrace_filter is true" do
+  it "should include full backtrace if backtrace_filter is true" do
     @d.backtrace_filter = true
     @d.deprecate("foo")
-    @output.first.should == 'foo'
-    (4..100).should include(@output.count)
+    @output.first.must_equal 'foo'
+    (4..100).must_include(@output.count)
   end
 
-  specify "should include given lines of backtrace if backtrace_filter is an integer" do
+  it "should include given lines of backtrace if backtrace_filter is an integer" do
     @d.backtrace_filter = 1
     @d.deprecate("foo")
-    @output.first.should == 'foo'
-    @output.count.should == 2
+    @output.first.must_equal 'foo'
+    @output.count.must_equal 2
     
     @output.clear
     @d.backtrace_filter = 3
     @d.deprecate("foo")
-    @output.first.should == 'foo'
-    @output.count.should == 4
+    @output.first.must_equal 'foo'
+    @output.count.must_equal 4
   end
 
-  specify "should select backtrace lines if backtrace_filter is a proc" do
+  it "should select backtrace lines if backtrace_filter is a proc" do
     @d.backtrace_filter = lambda{|line, line_no| line_no < 3 && line =~ /./}
     @d.deprecate("foo")
-    @output.first.should == 'foo'
-    @output.count.should == 4
+    @output.first.must_equal 'foo'
+    @output.count.must_equal 4
   end
 end

data/spec/core/expression_filters_spec.rb

@@ -13,416 +13,418 @@ describe "Blockless Ruby Filters" do
   end
   
   it "should support boolean columns directly" do
-    @d.l(:x).should == 'x'
+    @d.l(:x).must_equal 'x'
   end
   
   it "should support qualified columns" do
-    @d.l(:x__y).should == 'x.y'
+    @d.l(:x__y).must_equal 'x.y'
   end
 
   it "should support NOT with SQL functions" do
-    @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)'
+    @d.l(~Sequel.function(:is_blah)).must_equal 'NOT is_blah()'
+    @d.l(~Sequel.function(:is_blah, :x)).must_equal 'NOT is_blah(x)'
+    @d.l(~Sequel.function(:is_blah, :x__y)).must_equal 'NOT is_blah(x.y)'
+    @d.l(~Sequel.function(:is_blah, :x, :x__y)).must_equal 'NOT is_blah(x, x.y)'
   end
 
   it "should handle multiple ~" do
-    @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)'
+    @d.l(~Sequel.~(:x)).must_equal 'x'
+    @d.l(~~Sequel.~(:x)).must_equal 'NOT x'
+    @d.l(~~Sequel.&(:x, :y)).must_equal '(x AND y)'
+    @d.l(~~Sequel.|(:x, :y)).must_equal '(x OR y)'
   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 TRUE)'
-    @d.l(:x => false).should == '(x IS FALSE)'
-    @d.l(:x => nil).should == '(x IS NULL)'
-    @d.l(:x => [1,2,3]).should == '(x IN (1, 2, 3))'
+    @d.l(:x => 100).must_equal '(x = 100)'
+    @d.l(:x => 'a').must_equal '(x = \'a\')'
+    @d.l(:x => true).must_equal '(x IS TRUE)'
+    @d.l(:x => false).must_equal '(x IS FALSE)'
+    @d.l(:x => nil).must_equal '(x IS NULL)'
+    @d.l(:x => [1,2,3]).must_equal '(x IN (1, 2, 3))'
   end
 
   it "should use = 't' and != 't' OR IS NULL if IS TRUE is not supported" do
     meta_def(@d, :supports_is_true?){false}
-    @d.l(:x => true).should == "(x = 't')"
-    @d.l(~Sequel.expr(:x => true)).should == "((x != 't') OR (x IS NULL))"
-    @d.l(:x => false).should == "(x = 'f')"
-    @d.l(~Sequel.expr(:x => false)).should == "((x != 'f') OR (x IS NULL))"
+    @d.l(:x => true).must_equal "(x = 't')"
+    @d.l(~Sequel.expr(:x => true)).must_equal "((x != 't') OR (x IS NULL))"
+    @d.l(:x => false).must_equal "(x = 'f')"
+    @d.l(~Sequel.expr(:x => false)).must_equal "((x != 'f') OR (x IS NULL))"
   end
   
   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)'
+    @d.l(~Sequel.expr(:x => 100)).must_equal '(x != 100)'
+    @d.l(~Sequel.expr(:x => 'a')).must_equal '(x != \'a\')'
+    @d.l(~Sequel.expr(:x => true)).must_equal '(x IS NOT TRUE)'
+    @d.l(~Sequel.expr(:x => false)).must_equal '(x IS NOT FALSE)'
+    @d.l(~Sequel.expr(:x => nil)).must_equal '(x IS NOT NULL)'
   end
   
   it "should support = and similar operations via =~ method" do
-    @d.l{x =~ 100}.should == '(x = 100)'
-    @d.l{x =~ 'a'}.should == '(x = \'a\')'
-    @d.l{x =~ true}.should == '(x IS TRUE)'
-    @d.l{x =~ false}.should == '(x IS FALSE)'
-    @d.l{x =~ nil}.should == '(x IS NULL)'
-    @d.l{x =~ (1...5)}.should == '((x >= 1) AND (x < 5))'
-    @d.l{x =~ [1,2,3]}.should == '(x IN (1, 2, 3))'
+    @d.l{x =~ 100}.must_equal '(x = 100)'
+    @d.l{x =~ 'a'}.must_equal '(x = \'a\')'
+    @d.l{x =~ true}.must_equal '(x IS TRUE)'
+    @d.l{x =~ false}.must_equal '(x IS FALSE)'
+    @d.l{x =~ nil}.must_equal '(x IS NULL)'
+    @d.l{x =~ (1...5)}.must_equal '((x >= 1) AND (x < 5))'
+    @d.l{x =~ [1,2,3]}.must_equal '(x IN (1, 2, 3))'
 
     def @d.supports_regexp?; true end
-    @d.l{x =~ /blah/}.should == '(x ~ \'blah\')'
+    @d.l{x =~ /blah/}.must_equal '(x ~ \'blah\')'
   end
 
   if RUBY_VERSION >= '1.9'
     it "should support != and similar inversions via !~ method" 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)'
-      @d.l{x !~ (1...5)}.should == '((x < 1) OR (x >= 5))'
-      @d.l{x !~ [1,2,3]}.should == '(x NOT IN (1, 2, 3))'
+      @d.l{x !~ 100}.must_equal '(x != 100)'
+      @d.l{x !~ 'a'}.must_equal '(x != \'a\')'
+      @d.l{x !~ true}.must_equal '(x IS NOT TRUE)'
+      @d.l{x !~ false}.must_equal '(x IS NOT FALSE)'
+      @d.l{x !~ nil}.must_equal '(x IS NOT NULL)'
+      @d.l{x !~ (1...5)}.must_equal '((x < 1) OR (x >= 5))'
+      @d.l{x !~ [1,2,3]}.must_equal '(x NOT IN (1, 2, 3))'
 
       def @d.supports_regexp?; true end
-      @d.l{x !~ /blah/}.should == '(x !~ \'blah\')'
+      @d.l{x !~ /blah/}.must_equal '(x !~ \'blah\')'
     end
   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\')'
+    @d.l(:x => /blah/).must_equal '(x ~ \'blah\')'
   end
   
   it "should support !~ via inverted Hash and Regexp" do
     def @d.supports_regexp?; true end
-    @d.l(~Sequel.expr(:x => /blah/)).should == '(x !~ \'blah\')'
+    @d.l(~Sequel.expr(:x => /blah/)).must_equal '(x !~ \'blah\')'
   end
   
   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))'
+    @d.l(~Sequel.expr(:x => 1..5)).must_equal '((x < 1) OR (x > 5))'
+    @d.l(~Sequel.expr(:x => 1...5)).must_equal '((x < 1) OR (x >= 5))'
   end
   
   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))'
+    @d.l(~Sequel.expr(:x => @d.select(:i))).must_equal '(x NOT IN (SELECT i FROM items))'
+    @d.l(~Sequel.expr(:x => [1,2,3])).must_equal '(x NOT IN (1, 2, 3))'
   end
 
   it "should not add ~ method to string expressions" do
-    proc{~Sequel.expr(:x).sql_string}.should raise_error(NoMethodError) 
+    proc{~Sequel.expr(:x).sql_string}.must_raise(NoMethodError) 
   end
 
   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)'
+    @d.lit(Sequel.expr(:x) + 1).must_equal '(x + 1)'
+    @d.lit(Sequel.expr(:x) - true).must_equal "(x - 't')"
+    @d.lit(Sequel.expr(:x) / false).must_equal "(x / 'f')"
+    @d.lit(Sequel.expr(:x) * nil).must_equal '(x * NULL)'
+    @d.lit(Sequel.join([:x, nil])).must_equal '(x || NULL)'
   end
 
   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' ESCAPE '\\'))"
-    @d.lit(Sequel.expr(:x) - ~Sequel.expr(:y).like('a')).should == "(x - (y NOT LIKE 'a' ESCAPE '\\'))"
-    @d.lit(Sequel.join([:x, ~Sequel.expr(:y).like('a')])).should == "(x || (y NOT LIKE 'a' ESCAPE '\\'))"
+    @d.lit(Sequel.expr(:x) + (Sequel.expr(:y) + 1)).must_equal '(x + y + 1)'
+    @d.lit(Sequel.expr(:x) - ~Sequel.expr(:y)).must_equal '(x - NOT y)'
+    @d.lit(Sequel.expr(:x) / (Sequel.expr(:y) & :z)).must_equal '(x / (y AND z))'
+    @d.lit(Sequel.expr(:x) * (Sequel.expr(:y) | :z)).must_equal '(x * (y OR z))'
+    @d.lit(Sequel.expr(:x) + Sequel.expr(:y).like('a')).must_equal "(x + (y LIKE 'a' ESCAPE '\\'))"
+    @d.lit(Sequel.expr(:x) - ~Sequel.expr(:y).like('a')).must_equal "(x - (y NOT LIKE 'a' ESCAPE '\\'))"
+    @d.lit(Sequel.join([:x, ~Sequel.expr(:y).like('a')])).must_equal "(x || (y NOT LIKE 'a' ESCAPE '\\'))"
   end
 
   it "should support AND conditions via &" do
-    @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)'
+    @d.l(Sequel.expr(:x) & :y).must_equal '(x AND y)'
+    @d.l(Sequel.expr(:x).sql_boolean & :y).must_equal '(x AND y)'
+    @d.l(Sequel.expr(:x) & :y & :z).must_equal '(x AND y AND z)'
+    @d.l(Sequel.expr(:x) & {:y => :z}).must_equal '(x AND (y = z))'
+    @d.l((Sequel.expr(:x) + 200 < 0) & (Sequel.expr(:y) - 200 < 0)).must_equal '(((x + 200) < 0) AND ((y - 200) < 0))'
+    @d.l(Sequel.expr(:x) & ~Sequel.expr(:y)).must_equal '(x AND NOT y)'
+    @d.l(~Sequel.expr(:x) & :y).must_equal '(NOT x AND y)'
+    @d.l(~Sequel.expr(:x) & ~Sequel.expr(:y)).must_equal '(NOT x AND NOT y)'
   end
   
   it "should support OR conditions via |" do
-    @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))'
+    @d.l(Sequel.expr(:x) | :y).must_equal '(x OR y)'
+    @d.l(Sequel.expr(:x).sql_boolean | :y).must_equal '(x OR y)'
+    @d.l(Sequel.expr(:x) | :y | :z).must_equal '(x OR y OR z)'
+    @d.l(Sequel.expr(:x) | {:y => :z}).must_equal '(x OR (y = z))'
+    @d.l((Sequel.expr(:x).sql_number > 200) | (Sequel.expr(:y).sql_number < 200)).must_equal '((x > 200) OR (y < 200))'
   end
   
   it "should support & | combinations" do
-    @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))'
+    @d.l((Sequel.expr(:x) | :y) & :z).must_equal '((x OR y) AND z)'
+    @d.l(Sequel.expr(:x) | (Sequel.expr(:y) & :z)).must_equal '(x OR (y AND z))'
+    @d.l((Sequel.expr(:x) & :w) | (Sequel.expr(:y) & :z)).must_equal '((x AND w) OR (y AND z))'
   end
   
   it "should support & | with ~" do
-    @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))'
+    @d.l(~((Sequel.expr(:x) | :y) & :z)).must_equal '((NOT x AND NOT y) OR NOT z)'
+    @d.l(~(Sequel.expr(:x) | (Sequel.expr(:y) & :z))).must_equal '(NOT x AND (NOT y OR NOT z))'
+    @d.l(~((Sequel.expr(:x) & :w) | (Sequel.expr(:y) & :z))).must_equal '((NOT x OR NOT w) AND (NOT y OR NOT z))'
+    @d.l(~((Sequel.expr(:x).sql_number > 200) | (Sequel.expr(:y) & :z))).must_equal '((x <= 200) AND (NOT y OR NOT z))'
   end
   
   it "should support LiteralString" do
-    @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\' ESCAPE \'\\\')'
-    @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)'
+    @d.l(Sequel.lit('x')).must_equal '(x)'
+    @d.l(~Sequel.lit('x')).must_equal 'NOT x'
+    @d.l(~~Sequel.lit('x')).must_equal 'x'
+    @d.l(~((Sequel.lit('x') | :y) & :z)).must_equal '((NOT x AND NOT y) OR NOT z)'
+    @d.l(~(Sequel.expr(:x) | Sequel.lit('y'))).must_equal '(NOT x AND NOT y)'
+    @d.l(~(Sequel.lit('x') & Sequel.lit('y'))).must_equal '(NOT x OR NOT y)'
+    @d.l(Sequel.expr(Sequel.lit('y') => Sequel.lit('z')) & Sequel.lit('x')).must_equal '((y = z) AND x)'
+    @d.l((Sequel.lit('x') > 200) & (Sequel.lit('y') < 200)).must_equal '((x > 200) AND (y < 200))'
+    @d.l(~(Sequel.lit('x') + 1 > 100)).must_equal '((x + 1) <= 100)'
+    @d.l(Sequel.lit('x').like('a')).must_equal '(x LIKE \'a\' ESCAPE \'\\\')'
+    @d.l(Sequel.lit('x') + 1 > 100).must_equal '((x + 1) > 100)'
+    @d.l((Sequel.lit('x') * :y) < 100.01).must_equal '((x * y) < 100.01)'
+    @d.l((Sequel.lit('x') - Sequel.expr(:y)/2) >= 100000000000000000000000000000000000).must_equal '((x - (y / 2)) >= 100000000000000000000000000000000000)'
+    @d.l((Sequel.lit('z') * ((Sequel.lit('x') / :y)/(Sequel.expr(:x) + :y))) <= 100).must_equal '((z * (x / y / (x + y))) <= 100)'
+    @d.l(~((((Sequel.lit('x') - :y)/(Sequel.expr(:x) + :y))*:z) <= 100)).must_equal '((((x - y) / (x + y)) * z) > 100)'
   end
 
   it "should support hashes by ANDing the conditions" do
-    @d.l(:x => 100, :y => 'a')[1...-1].split(' AND ').sort.should == ['(x = 100)', '(y = \'a\')']
-    @d.l(:x => true, :y => false)[1...-1].split(' AND ').sort.should == ['(x IS TRUE)', '(y IS FALSE)']
-    @d.l(:x => nil, :y => [1,2,3])[1...-1].split(' AND ').sort.should == ['(x IS NULL)', '(y IN (1, 2, 3))']
+    @d.l(:x => 100, :y => 'a')[1...-1].split(' AND ').sort.must_equal ['(x = 100)', '(y = \'a\')']
+    @d.l(:x => true, :y => false)[1...-1].split(' AND ').sort.must_equal ['(x IS TRUE)', '(y IS FALSE)']
+    @d.l(:x => nil, :y => [1,2,3])[1...-1].split(' AND ').sort.must_equal ['(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)))'
+    @d.l([[:x, 100],[:y, 'a']]).must_equal '((x = 100) AND (y = \'a\'))'
+    @d.l([[:x, true], [:y, false]]).must_equal '((x IS TRUE) AND (y IS FALSE))'
+    @d.l([[:x, nil], [:y, [1,2,3]]]).must_equal '((x IS NULL) AND (y IN (1, 2, 3)))'
   end
   
   it "should emulate columns for array values" do
-    @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)))'
+    @d.l([:x, :y]=>Sequel.value_list([[1,2], [3,4]])).must_equal '((x, y) IN ((1, 2), (3, 4)))'
+    @d.l([:x, :y, :z]=>[[1,2,5], [3,4,6]]).must_equal '((x, y, z) IN ((1, 2, 5), (3, 4, 6)))'
   end
   
   it "should emulate multiple column in if not supported" do
     meta_def(@d, :supports_multiple_column_in?){false}
-    @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)))'
+    @d.l([:x, :y]=>Sequel.value_list([[1,2], [3,4]])).must_equal '(((x = 1) AND (y = 2)) OR ((x = 3) AND (y = 4)))'
+    @d.l([:x, :y, :z]=>[[1,2,5], [3,4,6]]).must_equal '(((x = 1) AND (y = 2) AND (z = 5)) OR ((x = 3) AND (y = 4) AND (z = 6)))'
   end
   
   it "should support StringExpression#+ for concatenation of SQL strings" do
-    @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)"
+    @d.lit(Sequel.expr(:x).sql_string + :y).must_equal '(x || y)'
+    @d.lit(Sequel.join([:x]) + :y).must_equal '(x || y)'
+    @d.lit(Sequel.join([:x, :z], ' ') + :y).must_equal "(x || ' ' || z || y)"
   end
 
   it "should be supported inside blocks" do
-    @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))'
+    @d.l{Sequel.or([[:x, nil], [:y, [1,2,3]]])}.must_equal '((x IS NULL) OR (y IN (1, 2, 3)))'
+    @d.l{Sequel.~([[:x, nil], [:y, [1,2,3]]])}.must_equal '((x IS NOT NULL) OR (y NOT IN (1, 2, 3)))'
+    @d.l{~((((Sequel.lit('x') - :y)/(Sequel.expr(:x) + :y))*:z) <= 100)}.must_equal '((((x - y) / (x + y)) * z) > 100)'
+    @d.l{Sequel.&({:x => :a}, {:y => :z})}.must_equal '((x = a) AND (y = z))'
   end
 
   it "should support &, |, ^, ~, <<, and >> for NumericExpressions" do
-    @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)'
+    @d.l(Sequel.expr(:x).sql_number & 1 > 100).must_equal '((x & 1) > 100)'
+    @d.l(Sequel.expr(:x).sql_number | 1 > 100).must_equal '((x | 1) > 100)'
+    @d.l(Sequel.expr(:x).sql_number ^ 1 > 100).must_equal '((x ^ 1) > 100)'
+    @d.l(~Sequel.expr(:x).sql_number > 100).must_equal '(~x > 100)'
+    @d.l(Sequel.expr(:x).sql_number << 1 > 100).must_equal '((x << 1) > 100)'
+    @d.l(Sequel.expr(:x).sql_number >> 1 > 100).must_equal '((x >> 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) & 1 > 100).must_equal '(((x + 1) & 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) | 1 > 100).must_equal '(((x + 1) | 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) ^ 1 > 100).must_equal '(((x + 1) ^ 1) > 100)'
+    @d.l(~(Sequel.expr(:x) + 1) > 100).must_equal '(~(x + 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) << 1 > 100).must_equal '(((x + 1) << 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) >> 1 > 100).must_equal '(((x + 1) >> 1) > 100)'
+    @d.l((Sequel.expr(:x) + 1) & (Sequel.expr(:x) + 2) > 100).must_equal '(((x + 1) & (x + 2)) > 100)'
   end
 
   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'))"
+    @d.lit((Sequel.expr(:x) + 1) & (Sequel.expr(:x) + '2')).must_equal "((x + 1) & (x || '2'))"
   end
 
   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'))"
+    @d.l(Sequel.expr(:x) & (Sequel.expr(:x) + '2')).must_equal "(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(Sequel.expr(:x) + 2)}.should raise_error(Sequel::Error)
+    proc{Sequel::SQL::BooleanExpression.invert(Sequel.expr(:x) + 2)}.must_raise(Sequel::Error)
   end
 
   it "should return self on .lit" do
     y = Sequel.expr(:x) + 1
-    y.lit.should == y
+    y.lit.must_equal y
   end
 
   it "should return have .sql_literal return the literal SQL for the expression" do
     y = Sequel.expr(:x) + 1
-    y.sql_literal(@d).should == '(x + 1)'
-    y.sql_literal(@d).should == @d.literal(y)
+    y.sql_literal(@d).must_equal '(x + 1)'
+    y.sql_literal(@d).must_equal @d.literal(y)
   end
 
   it "should support SQL::Constants" do
-    @d.l({:x => Sequel::NULL}).should == '(x IS NULL)'
-    @d.l({:x => Sequel::NOTNULL}).should == '(x IS NOT NULL)'
-    @d.l({:x => Sequel::TRUE}).should == '(x IS TRUE)'
-    @d.l({:x => Sequel::FALSE}).should == '(x IS FALSE)'
-    @d.l({:x => Sequel::SQLTRUE}).should == '(x IS TRUE)'
-    @d.l({:x => Sequel::SQLFALSE}).should == '(x IS FALSE)'
+    @d.l({:x => Sequel::NULL}).must_equal '(x IS NULL)'
+    @d.l({:x => Sequel::NOTNULL}).must_equal '(x IS NOT NULL)'
+    @d.l({:x => Sequel::TRUE}).must_equal '(x IS TRUE)'
+    @d.l({:x => Sequel::FALSE}).must_equal '(x IS FALSE)'
+    @d.l({:x => Sequel::SQLTRUE}).must_equal '(x IS TRUE)'
+    @d.l({:x => Sequel::SQLFALSE}).must_equal '(x IS FALSE)'
   end
   
   it "should support negation of SQL::Constants" do
-    @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)'
+    @d.l(Sequel.~(:x => Sequel::NULL)).must_equal '(x IS NOT NULL)'
+    @d.l(Sequel.~(:x => Sequel::NOTNULL)).must_equal '(x IS NULL)'
+    @d.l(Sequel.~(:x => Sequel::TRUE)).must_equal '(x IS NOT TRUE)'
+    @d.l(Sequel.~(:x => Sequel::FALSE)).must_equal '(x IS NOT FALSE)'
+    @d.l(Sequel.~(:x => Sequel::SQLTRUE)).must_equal '(x IS NOT TRUE)'
+    @d.l(Sequel.~(:x => Sequel::SQLFALSE)).must_equal '(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)'
+    @d.l({:x => ~Sequel::NULL}).must_equal '(x IS NOT NULL)'
+    @d.l({:x => ~Sequel::NOTNULL}).must_equal '(x IS NULL)'
+    @d.l({:x => ~Sequel::TRUE}).must_equal '(x IS FALSE)'
+    @d.l({:x => ~Sequel::FALSE}).must_equal '(x IS TRUE)'
+    @d.l({:x => ~Sequel::SQLTRUE}).must_equal '(x IS FALSE)'
+    @d.l({:x => ~Sequel::SQLFALSE}).must_equal '(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)
+    proc{~Sequel::CURRENT_DATE}.must_raise(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)
+    proc{Sequel::SQL::ComplexExpression.new(:BANG, 1, 2)}.must_raise(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')"
+    @d.lit(Sequel.expr(:x) + '1').must_equal "(x || '1')"
+    @d.lit(Sequel.expr(:x) + '1' + '1').must_equal "(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)"
+    @d.lit(Sequel.expr(:x) + Sequel.lit('1')).must_equal "(x + 1)"
+    @d.lit(Sequel.expr(:x) + Sequel.lit('1') + Sequel.lit('1')).must_equal "(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)"
+    @d.lit(Sequel.expr(:x) & 1).must_equal "(x & 1)"
+    @d.lit(Sequel.expr(:x) | 1).must_equal "(x | 1)"
+    @d.lit(Sequel.expr(:x) & 1 & 1).must_equal "(x & 1 & 1)"
+    @d.lit(Sequel.expr(:x) | 1 | 1).must_equal "(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')"
+    @d.lit(Sequel.expr(:x) + 1 + 'a').must_equal "(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)"
+    @d.lit(Sequel.expr(:x) + 'a' + 1).must_equal "(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')"
+    @d.lit(Sequel.expr(:x) + 1 + true).must_equal "(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')"
+    @d.lit(Sequel.expr(:x) + 'a' + true).must_equal "(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)"
+    @d.lit(Sequel.expr(:x) & :a & 1).must_equal "(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')"
+    @d.lit(Sequel.expr(:x) & :a & 'a').must_equal "(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)"
+   @d.lit(Sequel.expr(:x) & :a & Sequel.lit('a')).must_equal "(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)"
+   @d.lit(Sequel.expr(:x) + :a + Sequel.lit('a')).must_equal "(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)"
+   @d.lit(Sequel.expr(:x) + 'a' + Sequel.lit('a')).must_equal "(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')"
+   @d.lit((Sequel.expr(:x) + 1).sql_string + 'a').must_equal "((x + 1) || 'a')"
+   @d.lit((Sequel.expr(:x) + 1).sql_boolean & 1).must_equal "((x + 1) AND 1)"
+   @d.lit((Sequel.expr(:x) + 1).sql_number + 'a').must_equal "(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')"
+   @d.lit((Sequel.expr(:x) + 'a').sql_string + 'a').must_equal "(x || 'a' || 'a')"
+   @d.lit((Sequel.expr(:x) + 'a').sql_boolean & 1).must_equal "((x || 'a') AND 1)"
+   @d.lit((Sequel.expr(:x) + 'a').sql_number + 'a').must_equal "((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')"
+   @d.lit((Sequel.expr(:x) & :y).sql_string + 'a').must_equal "((x AND y) || 'a')"
+   @d.lit((Sequel.expr(:x) & :y).sql_boolean & 1).must_equal "(x AND y AND 1)"
+   @d.lit((Sequel.expr(:x) & :y).sql_number + 'a').must_equal "((x AND y) + 'a')"
   end
 
   it "should raise an error if trying to literalize an invalid complex expression" do
     ce = Sequel.+(:x, 1)
     ce.instance_variable_set(:@op, :BANG)
-    proc{@d.lit(ce)}.should raise_error(Sequel::Error)
+    proc{@d.lit(ce)}.must_raise(Sequel::InvalidOperation)
   end
 
   it "should support equality comparison of two expressions" do
     e1 = ~Sequel.like(:comment, '%:hidden:%')
     e2 = ~Sequel.like(:comment, '%:hidden:%')
-    e1.should == e2
+    e1.must_equal e2
   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).must_equal '((SELECT a FROM items) + 1)'
+    @d.lit(d - 1).must_equal '((SELECT a FROM items) - 1)'
+    @d.lit(d * 1).must_equal '((SELECT a FROM items) * 1)'
+    @d.lit(d / 1).must_equal '((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 => 1).must_equal '((SELECT a FROM items) = 1)'
+    @d.lit(Sequel.~(d => 1)).must_equal '((SELECT a FROM items) != 1)'
+    @d.lit(d > 1).must_equal '((SELECT a FROM items) > 1)'
+    @d.lit(d < 1).must_equal '((SELECT a FROM items) < 1)'
+    @d.lit(d >= 1).must_equal '((SELECT a FROM items) >= 1)'
+    @d.lit(d <= 1).must_equal '((SELECT a FROM items) <= 1)'
 
-    @d.lit(d.as(:b)).should == '(SELECT a FROM items) AS b'
+    @d.lit(d.as(:b)).must_equal '(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 & :b).must_equal '((SELECT a FROM items) AND b)'
+    @d.lit(d | :b).must_equal '((SELECT a FROM items) OR b)'
+    @d.lit(~d).must_equal '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.cast(Integer)).must_equal 'CAST((SELECT a FROM items) AS integer)'
+    @d.lit(d.cast_numeric).must_equal 'CAST((SELECT a FROM items) AS integer)'
+    @d.lit(d.cast_string).must_equal 'CAST((SELECT a FROM items) AS varchar(255))'
+    @d.lit(d.cast_numeric << :b).must_equal '(CAST((SELECT a FROM items) AS integer) << b)'
+    @d.lit(d.cast_string + :b).must_equal '(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.extract(:year)).must_equal 'extract(year FROM (SELECT a FROM items))'
+    @d.lit(d.sql_boolean & :b).must_equal '((SELECT a FROM items) AND b)'
+    @d.lit(d.sql_number << :b).must_equal '((SELECT a FROM items) << b)'
+    @d.lit(d.sql_string + :b).must_equal '((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.asc).must_equal '(SELECT a FROM items) ASC'
+    @d.lit(d.desc).must_equal '(SELECT a FROM items) DESC'
 
-    @d.lit(d.like(:b)).should == '((SELECT a FROM items) LIKE b ESCAPE \'\\\')'
-    @d.lit(d.ilike(:b)).should == '(UPPER((SELECT a FROM items)) LIKE UPPER(b) ESCAPE \'\\\')'
+    @d.lit(d.like(:b)).must_equal '((SELECT a FROM items) LIKE b ESCAPE \'\\\')'
+    @d.lit(d.ilike(:b)).must_equal '(UPPER((SELECT a FROM items)) LIKE UPPER(b) ESCAPE \'\\\')'
   end
 
   it "should handled emulated char_length function" do
-    @d.lit(Sequel.char_length(:a)).should == 'char_length(a)'
+    @d.lit(Sequel.char_length(:a)).must_equal 'char_length(a)'
   end
 
   it "should handled emulated trim function" do
-    @d.lit(Sequel.trim(:a)).should == 'trim(a)'
+    @d.lit(Sequel.trim(:a)).must_equal 'trim(a)'
   end
 
   it "should handled emulated function where only name is emulated" do
     dsc = Class.new(Sequel::Dataset)
+    efm = dsc::EMULATED_FUNCTION_MAP.dup
     dsc::EMULATED_FUNCTION_MAP[:trim] = :foo
-    dsc.new(@d.db).literal(Sequel.trim(:a)).should == 'foo(a)'
+    dsc.new(@d.db).literal(Sequel.trim(:a)).must_equal 'foo(a)'
+    dsc::EMULATED_FUNCTION_MAP.replace(efm)
   end
 
   it "should handled emulated function needing full emulation" do
@@ -432,7 +434,7 @@ describe "Blockless Ruby Filters" do
         sql << "#{f.name}FOO(lower(#{f.args.first}))"
       end
     end
-    dsc.new(@d.db).literal(Sequel.trim(:a)).should == 'trimFOO(lower(a))'
+    dsc.new(@d.db).literal(Sequel.trim(:a)).must_equal 'trimFOO(lower(a))'
   end
 end
 
@@ -448,174 +450,174 @@ describe Sequel::SQL::VirtualRow do
   end
 
   it "should treat methods without arguments as identifiers" do
-    @d.l{column}.should == '"column"'
+    @d.l{column}.must_equal '"column"'
   end
 
   it "should treat methods without arguments that have embedded double underscores as qualified identifiers" do
-    @d.l{table__column}.should == '"table"."column"'
+    @d.l{table__column}.must_equal '"table"."column"'
   end
 
   it "should treat methods with arguments as functions with the arguments" do
-    @d.l{function(arg1, 10, 'arg3')}.should == 'function("arg1", 10, \'arg3\')'
+    @d.l{function(arg1, 10, 'arg3')}.must_equal 'function("arg1", 10, \'arg3\')'
   end
 
   it "should treat methods with a block and no arguments as a function call with no arguments" do
-    @d.l{version{}}.should == 'version()'
+    @d.l{version{}}.must_equal 'version()'
   end
 
   it "should treat methods with a block and a leading argument :* as a function call with the SQL wildcard" do
-    @d.l{count(:*){}}.should == 'count(*)'
+    @d.l{count(:*){}}.must_equal 'count(*)'
   end
 
   it "should support * method on functions to raise error if function already has an argument" do
-    proc{@d.l{count(1).*}}.should raise_error(Sequel::Error)
+    proc{@d.l{count(1).*}}.must_raise(Sequel::Error)
   end
 
   it "should support * method on functions to use * as the argument" do
-    @d.l{count{}.*}.should == 'count(*)'
-    @d.literal(Sequel.expr{sum(1) * 2}).should == '(sum(1) * 2)'
+    @d.l{count{}.*}.must_equal 'count(*)'
+    @d.literal(Sequel.expr{sum(1) * 2}).must_equal '(sum(1) * 2)'
   end
 
   it "should treat methods with a block and a leading argument :distinct as a function call with DISTINCT and the additional method arguments" do
-    @d.l{count(:distinct, column1){}}.should == 'count(DISTINCT "column1")'
-    @d.l{count(:distinct, column1, column2){}}.should == 'count(DISTINCT "column1", "column2")'
+    @d.l{count(:distinct, column1){}}.must_equal 'count(DISTINCT "column1")'
+    @d.l{count(:distinct, column1, column2){}}.must_equal 'count(DISTINCT "column1", "column2")'
   end
 
   it "should support distinct methods on functions to use DISTINCT before the arguments" do
-    @d.l{count(column1).distinct}.should == 'count(DISTINCT "column1")'
-    @d.l{count(column1, column2).distinct}.should == 'count(DISTINCT "column1", "column2")'
+    @d.l{count(column1).distinct}.must_equal 'count(DISTINCT "column1")'
+    @d.l{count(column1, column2).distinct}.must_equal 'count(DISTINCT "column1", "column2")'
   end
 
   it "should raise an error if an unsupported argument is used with a block" do
-    proc{@d.where{count(:blah){}}}.should raise_error(Sequel::Error)
+    proc{@d.where{count(:blah){}}}.must_raise(Sequel::Error)
   end
 
   it "should treat methods with a block and a leading argument :over as a window function call" do
-    @d.l{rank(:over){}}.should == 'rank() OVER ()'
+    @d.l{rank(:over){}}.must_equal 'rank() OVER ()'
   end
 
   it "should support :partition options for window function calls" do
-    @d.l{rank(:over, :partition=>column1){}}.should == 'rank() OVER (PARTITION BY "column1")'
-    @d.l{rank(:over, :partition=>[column1, column2]){}}.should == 'rank() OVER (PARTITION BY "column1", "column2")'
+    @d.l{rank(:over, :partition=>column1){}}.must_equal 'rank() OVER (PARTITION BY "column1")'
+    @d.l{rank(:over, :partition=>[column1, column2]){}}.must_equal 'rank() OVER (PARTITION BY "column1", "column2")'
   end
 
   it "should support :args options for window function calls" do
-    @d.l{avg(:over, :args=>column1){}}.should == 'avg("column1") OVER ()'
-    @d.l{avg(:over, :args=>[column1, column2]){}}.should == 'avg("column1", "column2") OVER ()'
+    @d.l{avg(:over, :args=>column1){}}.must_equal 'avg("column1") OVER ()'
+    @d.l{avg(:over, :args=>[column1, column2]){}}.must_equal 'avg("column1", "column2") OVER ()'
   end
 
   it "should support :order option for window function calls" do
-    @d.l{rank(:over, :order=>column1){}}.should == 'rank() OVER (ORDER BY "column1")'
-    @d.l{rank(:over, :order=>[column1, column2]){}}.should == 'rank() OVER (ORDER BY "column1", "column2")'
+    @d.l{rank(:over, :order=>column1){}}.must_equal 'rank() OVER (ORDER BY "column1")'
+    @d.l{rank(:over, :order=>[column1, column2]){}}.must_equal 'rank() OVER (ORDER BY "column1", "column2")'
   end
 
   it "should support :window option for window function calls" do
-    @d.l{rank(:over, :window=>:win){}}.should == 'rank() OVER ("win")'
+    @d.l{rank(:over, :window=>:win){}}.must_equal 'rank() OVER ("win")'
   end
 
   it "should support :*=>true option for window function calls" do
-    @d.l{count(:over, :* =>true){}}.should == 'count(*) OVER ()'
+    @d.l{count(:over, :* =>true){}}.must_equal 'count(*) OVER ()'
   end
 
   it "should support :frame=>:all option for window function calls" do
-    @d.l{rank(:over, :frame=>:all){}}.should == 'rank() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)'
+    @d.l{rank(:over, :frame=>:all){}}.must_equal 'rank() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)'
   end
 
   it "should support :frame=>:rows option for window function calls" do
-    @d.l{rank(:over, :frame=>:rows){}}.should == 'rank() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
+    @d.l{rank(:over, :frame=>:rows){}}.must_equal 'rank() OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
   end
 
   it "should support :frame=>'some string' option for window function calls" do
-    @d.l{rank(:over, :frame=>'RANGE BETWEEN 3 PRECEDING AND CURRENT ROW'){}}.should == 'rank() OVER (RANGE BETWEEN 3 PRECEDING AND CURRENT ROW)'
+    @d.l{rank(:over, :frame=>'RANGE BETWEEN 3 PRECEDING AND CURRENT ROW'){}}.must_equal 'rank() OVER (RANGE BETWEEN 3 PRECEDING AND CURRENT ROW)'
   end
 
   it "should raise an error if an invalid :frame option is used" do
-    proc{@d.l{rank(:over, :frame=>:blah){}}}.should raise_error(Sequel::Error)
+    proc{@d.l{rank(:over, :frame=>:blah){}}}.must_raise(Sequel::Error)
   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 BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
+    @d.l{count(:over, :* =>true, :partition=>a, :order=>b, :window=>:win, :frame=>:rows){}}.must_equal 'count(*) OVER ("win" PARTITION BY "a" ORDER BY "b" ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
   end
 
   it "should support over method on functions to create window functions" do
-    @d.l{rank{}.over}.should == 'rank() OVER ()'
-    @d.l{sum(c).over(:partition=>a, :order=>b, :window=>:win, :frame=>:rows)}.should == 'sum("c") OVER ("win" PARTITION BY "a" ORDER BY "b" ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
+    @d.l{rank{}.over}.must_equal 'rank() OVER ()'
+    @d.l{sum(c).over(:partition=>a, :order=>b, :window=>:win, :frame=>:rows)}.must_equal 'sum("c") OVER ("win" PARTITION BY "a" ORDER BY "b" ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
   end
 
   it "should support over method with a Window argument" do
-    @d.l{sum(c).over(Sequel::SQL::Window.new(:partition=>a, :order=>b, :window=>:win, :frame=>:rows))}.should == 'sum("c") OVER ("win" PARTITION BY "a" ORDER BY "b" ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
+    @d.l{sum(c).over(Sequel::SQL::Window.new(:partition=>a, :order=>b, :window=>:win, :frame=>:rows))}.must_equal 'sum("c") OVER ("win" PARTITION BY "a" ORDER BY "b" ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
   end
 
   it "should raise error if over is called on a function that already has a window " do
-    proc{@d.l{rank{}.over.over}}.should raise_error(Sequel::Error)
+    proc{@d.l{rank{}.over.over}}.must_raise(Sequel::Error)
   end
 
   it "should raise an error if window functions are not supported" do
     class << @d; remove_method :supports_window_functions? end
     meta_def(@d, :supports_window_functions?){false}
-    proc{@d.l{count(:over, :* =>true, :partition=>a, :order=>b, :window=>:win, :frame=>:rows){}}}.should raise_error(Sequel::Error)
-    proc{Sequel.mock.dataset.filter{count(:over, :* =>true, :partition=>a, :order=>b, :window=>:win, :frame=>:rows){}}.sql}.should raise_error(Sequel::Error)
+    proc{@d.l{count(:over, :* =>true, :partition=>a, :order=>b, :window=>:win, :frame=>:rows){}}}.must_raise(Sequel::Error)
+    proc{Sequel.mock.dataset.filter{count(:over, :* =>true, :partition=>a, :order=>b, :window=>:win, :frame=>:rows){}}.sql}.must_raise(Sequel::Error)
   end
   
   it "should handle lateral function calls" do
-    @d.l{rank{}.lateral}.should == 'LATERAL rank()' 
+    @d.l{rank{}.lateral}.must_equal 'LATERAL rank()' 
   end
 
   it "should handle ordered-set and hypothetical-set function calls" do
-    @d.l{mode{}.within_group(:a)}.should == 'mode() WITHIN GROUP (ORDER BY "a")' 
-    @d.l{mode{}.within_group(:a, :b)}.should == 'mode() WITHIN GROUP (ORDER BY "a", "b")' 
+    @d.l{mode{}.within_group(:a)}.must_equal 'mode() WITHIN GROUP (ORDER BY "a")' 
+    @d.l{mode{}.within_group(:a, :b)}.must_equal 'mode() WITHIN GROUP (ORDER BY "a", "b")' 
   end
 
   it "should handle filtered aggregate function calls" do
-    @d.l{count{}.*.filter(:a, :b)}.should == 'count(*) FILTER (WHERE ("a" AND "b"))' 
-    @d.l{count{}.*.filter(:a=>1)}.should == 'count(*) FILTER (WHERE ("a" = 1))'
-    @d.l{count{}.*.filter{b > 1}}.should == 'count(*) FILTER (WHERE ("b" > 1))'
-    @d.l{count{}.*.filter(:a=>1){b > 1}}.should == 'count(*) FILTER (WHERE (("a" = 1) AND ("b" > 1)))'
+    @d.l{count{}.*.filter(:a, :b)}.must_equal 'count(*) FILTER (WHERE ("a" AND "b"))' 
+    @d.l{count{}.*.filter(:a=>1)}.must_equal 'count(*) FILTER (WHERE ("a" = 1))'
+    @d.l{count{}.*.filter{b > 1}}.must_equal 'count(*) FILTER (WHERE ("b" > 1))'
+    @d.l{count{}.*.filter(:a=>1){b > 1}}.must_equal 'count(*) FILTER (WHERE (("a" = 1) AND ("b" > 1)))'
   end
 
   it "should handle fitlered ordered-set and hypothetical-set function calls" do
-    @d.l{mode{}.within_group(:a).filter(:a=>1)}.should == 'mode() WITHIN GROUP (ORDER BY "a") FILTER (WHERE ("a" = 1))' 
+    @d.l{mode{}.within_group(:a).filter(:a=>1)}.must_equal 'mode() WITHIN GROUP (ORDER BY "a") FILTER (WHERE ("a" = 1))' 
   end
 
   it "should handle function calls with ordinality" do
-    @d.l{foo{}.with_ordinality}.should == 'foo() WITH ORDINALITY' 
+    @d.l{foo{}.with_ordinality}.must_equal 'foo() WITH ORDINALITY' 
   end
 
   it "should support function method on identifiers to create functions" do
-    @d.l{rank.function}.should == 'rank()' 
-    @d.l{sum.function(c)}.should == 'sum("c")'
-    @d.l{sum.function(c, 1)}.should == 'sum("c", 1)'
+    @d.l{rank.function}.must_equal 'rank()' 
+    @d.l{sum.function(c)}.must_equal 'sum("c")'
+    @d.l{sum.function(c, 1)}.must_equal 'sum("c", 1)'
   end
 
   it "should support function method on qualified identifiers to create functions" do
-    @d.l{sch__rank.function}.should == 'sch.rank()' 
-    @d.l{sch__sum.function(c)}.should == 'sch.sum("c")'
-    @d.l{sch__sum.function(c, 1)}.should == 'sch.sum("c", 1)'
-    @d.l{Sequel.qualify(sch__sum, :x__y).function(c, 1)}.should == 'sch.sum.x.y("c", 1)'
+    @d.l{sch__rank.function}.must_equal 'sch.rank()' 
+    @d.l{sch__sum.function(c)}.must_equal 'sch.sum("c")'
+    @d.l{sch__sum.function(c, 1)}.must_equal 'sch.sum("c", 1)'
+    @d.l{Sequel.qualify(sch__sum, :x__y).function(c, 1)}.must_equal 'sch.sum.x.y("c", 1)'
   end
 
   it "should handle quoted function names" do
     def @d.supports_quoted_function_names?; true; end
-    @d.l{rank.function}.should == '"rank"()' 
-    @d.l{sch__rank.function}.should == '"sch"."rank"()' 
+    @d.l{rank.function}.must_equal '"rank"()' 
+    @d.l{sch__rank.function}.must_equal '"sch"."rank"()' 
   end
 
   it "should quote function names if a quoted function is used and database supports quoted function names" do
     def @d.supports_quoted_function_names?; true; end
-    @d.l{rank{}.quoted}.should == '"rank"()' 
-    @d.l{sch__rank{}.quoted}.should == '"sch__rank"()' 
+    @d.l{rank{}.quoted}.must_equal '"rank"()' 
+    @d.l{sch__rank{}.quoted}.must_equal '"sch__rank"()' 
   end
 
   it "should not quote function names if an unquoted function is used" do
     def @d.supports_quoted_function_names?; true; end
-    @d.l{rank.function.unquoted}.should == 'rank()' 
-    @d.l{sch__rank.function.unquoted}.should == 'sch.rank()' 
+    @d.l{rank.function.unquoted}.must_equal 'rank()' 
+    @d.l{sch__rank.function.unquoted}.must_equal 'sch.rank()' 
   end
 
   it "should deal with classes without requiring :: prefix" do
-    @d.l{date < Date.today}.should == "(\"date\" < '#{Date.today}')"
-    @d.l{date < Sequel::CURRENT_DATE}.should == "(\"date\" < CURRENT_DATE)"
-    @d.l{num < Math::PI.to_i}.should == "(\"num\" < 3)"
+    @d.l{date < Date.today}.must_equal "(\"date\" < '#{Date.today}')"
+    @d.l{date < Sequel::CURRENT_DATE}.must_equal "(\"date\" < CURRENT_DATE)"
+    @d.l{num < Math::PI.to_i}.must_equal "(\"num\" < 3)"
   end
   
   it "should deal with methods added to Object after requiring Sequel" do
@@ -623,7 +625,7 @@ describe Sequel::SQL::VirtualRow do
       def adsoiwemlsdaf; 42; end
     end
     Sequel::BasicObject.remove_methods!
-    @d.l{a > adsoiwemlsdaf}.should == '("a" > "adsoiwemlsdaf")'
+    @d.l{a > adsoiwemlsdaf}.must_equal '("a" > "adsoiwemlsdaf")'
   end
   
   it "should deal with private methods added to Kernel after requiring Sequel" do
@@ -632,27 +634,27 @@ describe Sequel::SQL::VirtualRow do
       def adsoiwemlsdaf2; 42; end
     end
     Sequel::BasicObject.remove_methods!
-    @d.l{a > adsoiwemlsdaf2}.should == '("a" > "adsoiwemlsdaf2")'
+    @d.l{a > adsoiwemlsdaf2}.must_equal '("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")'
+    @d.l{|o| o.&({:a=>1}, :b)}.must_equal '(("a" = 1) AND "b")'
+    @d.l{|o| o.|({:a=>1}, :b)}.must_equal '(("a" = 1) OR "b")'
+    @d.l{|o| o.+(1, :b) > 2}.must_equal '((1 + "b") > 2)'
+    @d.l{|o| o.-(1, :b) < 2}.must_equal '((1 - "b") < 2)'
+    @d.l{|o| o.*(1, :b) >= 2}.must_equal '((1 * "b") >= 2)'
+    @d.l{|o| o./(1, :b) <= 2}.must_equal '((1 / "b") <= 2)'
+    @d.l{|o| o.~(:a=>1)}.must_equal '("a" != 1)'
+    @d.l{|o| o.~([[:a, 1], [:b, 2]])}.must_equal '(("a" != 1) OR ("b" != 2))'
+    @d.l{|o| o.<(1, :b)}.must_equal '(1 < "b")'
+    @d.l{|o| o.>(1, :b)}.must_equal '(1 > "b")'
+    @d.l{|o| o.<=(1, :b)}.must_equal '(1 <= "b")'
+    @d.l{|o| o.>=(1, :b)}.must_equal '(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)' #`
+    @d.l{a > `some SQL`}.must_equal '("a" > some SQL)'
+    @d.l{|o| o.a > o.`('some SQL')}.must_equal '("a" > some SQL)' #`
   end
 end
 
@@ -666,25 +668,25 @@ describe "Sequel core extension replacements" do
   end
 
   def l(arg, should)
-    @ds.literal(arg).should == should
+    @ds.literal(arg).must_equal 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.a}.should be_a_kind_of(Sequel::SQL::Identifier)
-    Sequel.expr{a}.should be_a_kind_of(Sequel::SQL::Identifier)
-    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)
+    Sequel.expr(1).must_be_kind_of(Sequel::SQL::NumericExpression)
+    Sequel.expr('a').must_be_kind_of(Sequel::SQL::StringExpression)
+    Sequel.expr(true).must_be_kind_of(Sequel::SQL::BooleanExpression)
+    Sequel.expr(nil).must_be_kind_of(Sequel::SQL::Wrapper)
+    Sequel.expr({1=>2}).must_be_kind_of(Sequel::SQL::BooleanExpression)
+    Sequel.expr([[1, 2]]).must_be_kind_of(Sequel::SQL::BooleanExpression)
+    Sequel.expr([1]).must_be_kind_of(Sequel::SQL::Wrapper)
+    Sequel.expr{|o| o.a}.must_be_kind_of(Sequel::SQL::Identifier)
+    Sequel.expr{a}.must_be_kind_of(Sequel::SQL::Identifier)
+    Sequel.expr(:a).must_be_kind_of(Sequel::SQL::Identifier)
+    Sequel.expr(:a__b).must_be_kind_of(Sequel::SQL::QualifiedIdentifier)
+    Sequel.expr(:a___c).must_be_kind_of(Sequel::SQL::AliasedExpression)
+    Sequel.expr(:a___c).expression.must_be_kind_of(Sequel::SQL::Identifier)
+    Sequel.expr(:a__b___c).must_be_kind_of(Sequel::SQL::AliasedExpression)
+    Sequel.expr(:a__b___c).expression.must_be_kind_of(Sequel::SQL::QualifiedIdentifier)
   end
 
   it "Sequel.expr should return an appropriate wrapped object" do
@@ -726,18 +728,18 @@ describe "Sequel core extension replacements" do
   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)
+    proc{Sequel.expr(nil){}}.must_raise(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)
+    proc{Sequel.expr}.must_raise(Sequel::Error)
   end
 
   it "Sequel.expr should return existing Sequel expressions directly" do
     o = Sequel.expr(1)
-    Sequel.expr(o).should equal(o)
+    Sequel.expr(o).must_be_same_as(o)
     o = Sequel.lit('1')
-    Sequel.expr(o).should equal(o)
+    Sequel.expr(o).must_be_same_as(o)
   end
 
   it "Sequel.~ should invert the given object" do
@@ -758,7 +760,7 @@ describe "Sequel core extension replacements" do
   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)
+    proc{Sequel.case(1, 2)}.must_raise(Sequel::Error)
   end
 
   it "Sequel.value_list should use an SQL value list" do
@@ -766,7 +768,7 @@ describe "Sequel core extension replacements" do
   end
 
   it "Sequel.value_list raise an error if not given an array" do
-    proc{Sequel.value_list(1)}.should raise_error(Sequel::Error)
+    proc{Sequel.value_list(1)}.must_raise(Sequel::Error)
   end
 
   it "Sequel.negate should negate all entries in conditions specifier and join with AND" do
@@ -776,7 +778,7 @@ describe "Sequel core extension replacements" do
   end
 
   it "Sequel.negate should raise an error if not given a conditions specifier" do
-    proc{Sequel.negate(1)}.should raise_error(Sequel::Error)
+    proc{Sequel.negate(1)}.must_raise(Sequel::Error)
   end
 
   it "Sequel.or should join all entries in conditions specifier with OR" do
@@ -786,7 +788,7 @@ describe "Sequel core extension replacements" do
   end
 
   it "Sequel.or should raise an error if not given a conditions specifier" do
-    proc{Sequel.or(1)}.should raise_error(Sequel::Error)
+    proc{Sequel.or(1)}.must_raise(Sequel::Error)
   end
 
   it "Sequel.join should should use SQL string concatenation to join array" do
@@ -800,7 +802,7 @@ describe "Sequel core extension replacements" do
   end
 
   it "Sequel.join should raise an error if not given an array" do
-    proc{Sequel.join(1)}.should raise_error(Sequel::Error)
+    proc{Sequel.join(1)}.must_raise(Sequel::Error)
   end
 
   it "Sequel.& should join all arguments given with AND" do
@@ -810,7 +812,7 @@ describe "Sequel core extension replacements" do
   end
 
   it "Sequel.& should raise an error if given no arguments" do
-    proc{Sequel.&}.should raise_error(Sequel::Error)
+    proc{Sequel.&}.must_raise(Sequel::Error)
   end
 
   it "Sequel.| should join all arguments given with OR" do
@@ -820,7 +822,7 @@ describe "Sequel core extension replacements" do
   end
 
   it "Sequel.| should raise an error if given no arguments" do
-    proc{Sequel.|}.should raise_error(Sequel::Error)
+    proc{Sequel.|}.must_raise(Sequel::Error)
   end
 
   it "Sequel.as should return an aliased expression" do
@@ -850,7 +852,7 @@ describe "Sequel core extension replacements" do
 
   it "Sequel.lit should return the argument if given a single literal string" do
     o = Sequel.lit('a')
-    Sequel.lit(o).should equal(o)
+    Sequel.lit(o).must_be_same_as(o)
   end
 
   it "Sequel.lit should accept multiple arguments for a placeholder literal string" do
@@ -866,12 +868,12 @@ describe "Sequel core extension replacements" do
 
   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)
+    Sequel.blob('a').must_be_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)
+    Sequel.blob(o).must_be_same_as(o)
   end
 
   it "Sequel.deep_qualify should do a deep qualification into nested structors" do
@@ -906,7 +908,7 @@ describe "Sequel core extension replacements" do
 
   it "Sequel.{+,-,*,/} should raise if given no arguments" do
     %w'+ - * /'.each do |op|
-      proc{Sequel.send(op)}.should raise_error(Sequel::Error)
+      proc{Sequel.send(op)}.must_raise(Sequel::Error)
     end
   end
 
@@ -961,62 +963,62 @@ describe "Sequel core extension replacements" do
 end
 
 describe "Sequel::SQL::Function#==" do
-  specify "should be true for functions with the same name and arguments, false otherwise" do
+  it "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
+    a.must_equal b
+    (a == b).must_equal true
     c = Sequel.function(:date, :c)
-    a.should_not == c
-    (a == c).should == false
+    a.wont_equal c
+    (a == c).must_equal false
     d = Sequel.function(:time, :c)
-    a.should_not == d
-    c.should_not == d
-    (a == d).should == false
-    (c == d).should == false
+    a.wont_equal d
+    c.wont_equal d
+    (a == d).must_equal false
+    (c == d).must_equal false
   end
 end
 
 describe "Sequel::SQL::OrderedExpression" do
-  specify "should #desc" do
+  it "should #desc" do
     @oe = Sequel.asc(:column)
-    @oe.descending.should == false
-    @oe.desc.descending.should == true
+    @oe.descending.must_equal false
+    @oe.desc.descending.must_equal true
   end
 
-  specify "should #asc" do
+  it "should #asc" do
     @oe = Sequel.desc(:column)
-    @oe.descending.should == true
-    @oe.asc.descending.should == false
+    @oe.descending.must_equal true
+    @oe.asc.descending.must_equal false
   end
 
-  specify "should #invert" do
+  it "should #invert" do
     @oe = Sequel.desc(:column)
-    @oe.invert.descending.should == false
-    @oe.invert.invert.descending.should == true
+    @oe.invert.descending.must_equal false
+    @oe.invert.invert.descending.must_equal 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
+  it "should consider objects == only if they have the same attributes" do
+    Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.must_equal Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc
+    Sequel.qualify(:table, :other_column).cast(:type).*(:numeric_column).asc.wont_equal 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)
+    Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.must_equal(Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc)
+    Sequel.qualify(:table, :other_column).cast(:type).*(:numeric_column).asc.wont_equal(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
+  it "should use the same hash value for objects that have the same attributes" do
+    Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.hash.must_equal Sequel.qualify(:table, :column).cast(:type).*(:numeric_column).asc.hash
+    Sequel.qualify(:table, :other_column).cast(:type).*(:numeric_column).asc.hash.wont_equal 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
+    h[a].must_equal 2
+    h[b].must_equal 2
   end
 end
 
@@ -1025,24 +1027,24 @@ describe "Sequel::SQLTime" 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'"
+  it ".create should create from hour, minutes, seconds and optional microseconds" do
+    @db.literal(Sequel::SQLTime.create(1, 2, 3)).must_equal "'01:02:03.000000'"
+    @db.literal(Sequel::SQLTime.create(1, 2, 3, 500000)).must_equal "'01:02:03.500000'"
   end
 
-  specify "#to_s should include hour, minute, and second by default" do
-    Sequel::SQLTime.create(1, 2, 3).to_s.should == "01:02:03"
-    Sequel::SQLTime.create(1, 2, 3, 500000).to_s.should == "01:02:03"
+  it "#to_s should include hour, minute, and second by default" do
+    Sequel::SQLTime.create(1, 2, 3).to_s.must_equal "01:02:03"
+    Sequel::SQLTime.create(1, 2, 3, 500000).to_s.must_equal "01:02:03"
   end
 
-  specify "#to_s should handle arguments with super" do
+  it "#to_s should handle arguments with super" do
     t = Sequel::SQLTime.create(1, 2, 3)
     begin
       Time.now.to_s('%F')
     rescue
-      proc{t.to_s('%F')}.should raise_error
+      proc{t.to_s('%F')}.must_raise ArgumentError
     else
-      proc{t.to_s('%F')}.should_not raise_error
+      t.to_s('%F')
     end
   end
 end
@@ -1052,27 +1054,27 @@ describe "Sequel::SQL::Wrapper" do
     @ds = Sequel.mock.dataset
   end
 
-  specify "should wrap objects so they can be used by the Sequel DSL" do
+  it "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' ESCAPE '\\')"
-    @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')"
+    @ds.literal(s).must_equal "foo"
+    @ds.literal(s+1).must_equal "(foo + 1)"
+    @ds.literal(s & true).must_equal "(foo AND 't')"
+    @ds.literal(s < 1).must_equal "(foo < 1)"
+    @ds.literal(s.sql_subscript(1)).must_equal "foo[1]"
+    @ds.literal(s.like('a')).must_equal "(foo LIKE 'a' ESCAPE '\\')"
+    @ds.literal(s.as(:a)).must_equal "foo AS a"
+    @ds.literal(s.cast(Integer)).must_equal "CAST(foo AS integer)"
+    @ds.literal(s.desc).must_equal "foo DESC"
+    @ds.literal(s.sql_string + '1').must_equal "(foo || '1')"
   end
 end
 
 describe "Sequel::SQL::Blob#to_sequel_blob" do
-  specify "should return self" do
+  it "should return self" do
     c = Sequel::SQL::Blob.new('a')
-    c.to_sequel_blob.should equal(c)
+    c.to_sequel_blob.must_be_same_as(c)
   end
 end
 
@@ -1082,41 +1084,39 @@ describe Sequel::SQL::Subscript do
     @ds = Sequel.mock.dataset
   end
 
-  specify "should have | return a new non-nested subscript" do
+  it "should have | return a new non-nested subscript" do
     s = (@s | 2)
-    s.should_not equal(@s)
-    @ds.literal(s).should == 'a[1, 2]'
+    @ds.literal(s).must_equal 'a[1, 2]'
   end
 
-  specify "should have [] return a new nested subscript" do
+  it "should have [] return a new nested subscript" do
     s = @s[2]
-    s.should_not equal(@s)
-    @ds.literal(s).should == 'a[1][2]'
+    @ds.literal(s).must_equal 'a[1][2]'
   end
 end
 
 describe Sequel::SQL::CaseExpression, "#with_merged_expression" do
-  specify "should return self if it has no expression" do
+  it "should return self if it has no expression" do
     c = Sequel.case({1=>0}, 3)
-    c.with_merged_expression.should equal(c)
+    c.with_merged_expression.must_be_same_as(c)
   end
 
-  specify "should merge expression into conditions if it has an expression" do
+  it "should merge expression into conditions if it has an expression" do
     db = Sequel::Database.new
     c = Sequel.case({1=>0}, 3, 4)
-    db.literal(c.with_merged_expression).should == db.literal(Sequel.case({{4=>1}=>0}, 3))
+    db.literal(c.with_merged_expression).must_equal db.literal(Sequel.case({{4=>1}=>0}, 3))
   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]]
+  it "should recursively convert an array using a callable" do
+    Sequel.recursive_map(['1'], proc{|s| s.to_i}).must_equal [1]
+    Sequel.recursive_map([['1']], proc{|s| s.to_i}).must_equal [[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]]
+  it "should not call callable if value is nil" do
+    Sequel.recursive_map([nil], proc{|s| s.to_i}).must_equal [nil]
+    Sequel.recursive_map([[nil]], proc{|s| s.to_i}).must_equal [[nil]]
   end
 end
 
@@ -1135,38 +1135,38 @@ describe "Sequel.delay" do
     end.new
   end
 
-  specify "should delay calling the block until literalization" do
+  it "should delay calling the block until literalization" do
     ds = Sequel.mock[:b].where(:a=>Sequel.delay{@o.a})
-    @o._a.should be_nil
-    ds.sql.should == "SELECT * FROM b WHERE (a = 1)"
-    @o._a.should == 1
-    ds.sql.should == "SELECT * FROM b WHERE (a = 2)"
-    @o._a.should == 2
+    @o._a.must_equal nil
+    ds.sql.must_equal "SELECT * FROM b WHERE (a = 1)"
+    @o._a.must_equal 1
+    ds.sql.must_equal "SELECT * FROM b WHERE (a = 2)"
+    @o._a.must_equal 2
   end
 
-  specify "should call the block with the current dataset if it accepts one argument" do
+  it "should call the block with the current dataset if it accepts one argument" do
     ds = Sequel.mock[:b].where(Sequel.delay{|x| x.first_source})
-    ds.sql.should == "SELECT * FROM b WHERE b"
-    ds.from(:c).sql.should == "SELECT * FROM c WHERE c"
+    ds.sql.must_equal "SELECT * FROM b WHERE b"
+    ds.from(:c).sql.must_equal "SELECT * FROM c WHERE c"
   end
 
-  specify "should have the condition specifier handling respect delayed evaluations" do
+  it "should have the condition specifier handling respect delayed evaluations" do
     ds = Sequel.mock[:b].where(:a=>Sequel.delay{@o.b})
-    ds.sql.should == "SELECT * FROM b WHERE (a IS NULL)"
+    ds.sql.must_equal "SELECT * FROM b WHERE (a IS NULL)"
     @o.b = 1
-    ds.sql.should == "SELECT * FROM b WHERE (a = 1)"
+    ds.sql.must_equal "SELECT * FROM b WHERE (a = 1)"
     @o.b = [1, 2]
-    ds.sql.should == "SELECT * FROM b WHERE (a IN (1, 2))"
+    ds.sql.must_equal "SELECT * FROM b WHERE (a IN (1, 2))"
   end
 
-  specify "should have the condition specifier handling call block with the current dataset if it accepts one argument" do
+  it "should have the condition specifier handling call block with the current dataset if it accepts one argument" do
     ds = Sequel.mock[:b].where(:a=>Sequel.delay{|x| x.first_source})
-    ds.sql.should == "SELECT * FROM b WHERE (a = b)"
-    ds.from(:c).sql.should == "SELECT * FROM c WHERE (a = c)"
+    ds.sql.must_equal "SELECT * FROM b WHERE (a = b)"
+    ds.from(:c).sql.must_equal "SELECT * FROM c WHERE (a = c)"
   end
 
-  specify "should raise if called without a block" do
-    proc{Sequel.delay}.should raise_error(Sequel::Error)
+  it "should raise if called without a block" do
+    proc{Sequel.delay}.must_raise(Sequel::Error)
   end
 end
 
@@ -1183,18 +1183,18 @@ describe Sequel do
     Sequel.send(:remove_const, :JSON)
   end
 
-  specify ".parse_json should parse json correctly" do
-    Sequel.parse_json('[]').should == ['[]', {:create_additions=>false}]
+  it ".parse_json should parse json correctly" do
+    Sequel.parse_json('[]').must_equal ['[]', {:create_additions=>false}]
   end
 
-  specify ".json_parser_error_class should return the related parser error class" do
-    Sequel.json_parser_error_class.should == Sequel
+  it ".json_parser_error_class should return the related parser error class" do
+    Sequel.json_parser_error_class.must_equal Sequel
   end
 
-  specify ".object_to_json should return a json version of the object" do
+  it ".object_to_json should return a json version of the object" do
     o = Object.new
     def o.to_json(*args); [1, args]; end
-    Sequel.object_to_json(o, :foo).should == [1, [:foo]]
+    Sequel.object_to_json(o, :foo).must_equal [1, [:foo]]
   end
 end
 
@@ -1203,23 +1203,23 @@ describe "Sequel::LiteralString" do
     @s = Sequel::LiteralString.new("? = ?")
   end
 
-  specify "should have lit return self if no arguments" do
-    @s.lit.should equal(@s)
+  it "should have lit return self if no arguments" do
+    @s.lit.must_be_same_as(@s)
   end
 
-  specify "should have lit return self if return a placeholder literal string if arguments" do
-    @s.lit(1, 2).should be_a_kind_of(Sequel::SQL::PlaceholderLiteralString)
-    Sequel.mock.literal(@s.lit(1, :a)).should == '1 = a'
+  it "should have lit return self if return a placeholder literal string if arguments" do
+    @s.lit(1, 2).must_be_kind_of(Sequel::SQL::PlaceholderLiteralString)
+    Sequel.mock.literal(@s.lit(1, :a)).must_equal '1 = a'
   end
 
-  specify "should have to_sequel_blob convert to blob" do
-    @s.to_sequel_blob.should == @s
-    @s.to_sequel_blob.should be_a_kind_of(Sequel::SQL::Blob)
+  it "should have to_sequel_blob convert to blob" do
+    @s.to_sequel_blob.must_equal @s
+    @s.to_sequel_blob.must_be_kind_of(Sequel::SQL::Blob)
   end
 end
 
 describe "Sequel core extensions" do
-  specify "should have Sequel.core_extensions? be false by default" do
-    Sequel.core_extensions?.should == false
+  it "should have Sequel.core_extensions? be false by default" do
+    Sequel.core_extensions?.must_equal false
   end
 end