sequel 4.5.0 → 4.6.0

data/lib/sequel/database/dataset_defaults.rb

@@ -31,7 +31,7 @@ module Sequel
     # Change the default identifier output method to use for all databases,
     def self.identifier_output_method=(v)
       @identifier_output_method = v.nil? ? false : v
-     end
+    end
 
     # The class to use for creating datasets.  Should respond to
     # new with the Database argument as the first argument, and

data/lib/sequel/model/associations.rb

@@ -2229,7 +2229,7 @@ module Sequel
         # and/or load other associations if #eager was used.
         def post_load(all_records)
           eager_graph_build_associations(all_records) if @opts[:eager_graph]
-          eager_load(all_records) if @opts[:eager]
+          eager_load(all_records) if @opts[:eager] && (row_proc || @opts[:eager_graph])
           super
         end
       end

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 4
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 5
+  MINOR = 6
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/mssql_spec.rb

@@ -643,3 +643,38 @@ describe "MSSQL optimistic locking plugin" do
     proc{o2.save}.should raise_error(Sequel::NoExistingObject)
   end
 end unless DB.adapter_scheme == :odbc
+
+describe "MSSQL Stored Procedure support" do
+  before do
+    @db = DB
+    @now = DateTime.now.to_s
+    @db.execute('CREATE PROCEDURE dbo.SequelTest
+      (@Input varchar(25), @IntegerInput int, @Output varchar(25) OUTPUT, @IntegerOutput int OUTPUT) AS
+      BEGIN SET @Output = @Input SET @IntegerOutput = @IntegerInput RETURN @IntegerInput END')
+  end
+  after do
+    @db.execute('DROP PROCEDURE dbo.SequelTest')
+  end
+
+  it "should return a hash of output variables" do
+    r = @db.call_mssql_sproc(:SequelTest, {:args => [@now, 1, :output, :output]})
+    r.should be_a_kind_of(Hash)
+    r.values_at(:var2, :var3).should == [@now, '1']
+  end
+
+  it "should support typed output variables" do
+    @db.call_mssql_sproc(:SequelTest, {:args => [@now, 1, :output, [:output, 'int']]})[:var3].should == 1
+  end
+
+  it "should support named output variables" do
+    @db.call_mssql_sproc(:SequelTest, {:args => [@now, 1, [:output, nil, 'output'], :output]})[:output].should == @now
+  end
+
+  it "should return the number of Affected Rows" do
+    @db.call_mssql_sproc(:SequelTest, {:args => [@now, 1, :output, :output]})[:numrows].should == 1
+  end
+
+  it "should return the Result Code" do
+    @db.call_mssql_sproc(:SequelTest, {:args => [@now, 1, :output, :output]})[:result].should == 1
+  end
+end unless DB.adapter_scheme == :odbc

data/spec/adapters/oracle_spec.rb

@@ -60,15 +60,15 @@ describe "An Oracle database" do
 
   specify "should have working view_exists?" do
     begin
-      DB.view_exists?(:cats).should be_false
+      DB.view_exists?(:cats).should == false
       DB.create_view(:cats, DB[:categories])
-      DB.view_exists?(:cats).should be_true
+      DB.view_exists?(:cats).should == true
       om = DB.identifier_output_method
       im = DB.identifier_input_method
       DB.identifier_output_method = :reverse
       DB.identifier_input_method = :reverse
-      DB.view_exists?(:STAC).should be_true
-      DB.view_exists?(:cats).should be_false
+      DB.view_exists?(:STAC).should == true
+      DB.view_exists?(:cats).should == false
     ensure
       DB.identifier_output_method = om
       DB.identifier_input_method = im

data/spec/adapters/postgres_spec.rb

@@ -32,21 +32,21 @@ describe "PostgreSQL", '#create_table' do
     @db.transaction do
       @db.create_table(:some_table, :temp => true, :on_commit => :drop){text :name}
     end
-    @db.table_exists?(:some_table).should be_false
+    @db.table_exists?(:some_table).should == false
 
     @db.transaction do
       @db.create_table(:some_table, :temp => true, :on_commit => :delete_rows){text :name}
       @db[:some_table].insert('a')
     end
-    @db.table_exists?(:some_table).should be_true
-    @db[:some_table].empty?.should be_true
+    @db.table_exists?(:some_table).should == true
+    @db[:some_table].empty?.should == true
 
     @db.drop_table(:some_table)
     @db.transaction do
       @db.create_table(:some_table, :temp => true, :on_commit => :preserve_rows){text :name}
       @db[:some_table].insert('a')
     end
-    @db.table_exists?(:some_table).should be_true
+    @db.table_exists?(:some_table).should == true
     @db[:some_table].count.should == 1
     @db.drop_table(:some_table)
   end
@@ -56,7 +56,7 @@ describe "PostgreSQL", '#create_table' do
     @db.transaction do
       @db.create_table(:some_table, :temp => true, :on_commit => :drop, :as => 'select 1')
     end
-    @db.table_exists?(:some_table).should be_false
+    @db.table_exists?(:some_table).should == false
   end
 
   specify ":on_commit should raise error if not used on a temporary table" do
@@ -1688,7 +1688,7 @@ if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG && DB.server_versio
         ['', nil].should include(payload)
         called = true
       end.should == 'foo'
-      called.should be_true
+      called.should == true
 
       # Check weird identifier names
       called = false
@@ -1698,7 +1698,7 @@ if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG && DB.server_versio
         ['', nil].should include(payload)
         called = true
       end.should == 'FOO bar'
-      called.should be_true
+      called.should == true
 
       # Check identifier symbols
       called = false
@@ -1708,7 +1708,7 @@ if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG && DB.server_versio
         ['', nil].should include(payload)
         called = true
       end.should == 'foo'
-      called.should be_true
+      called.should == true
 
       called = false
       @db.listen('foo', :after_listen=>proc{@db.notify('foo', :payload=>'bar')}) do |ev, pid, payload|
@@ -1717,7 +1717,7 @@ if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG && DB.server_versio
         payload.should == 'bar'
         called = true
       end.should == 'foo'
-      called.should be_true
+      called.should == true
 
       @db.listen('foo', :after_listen=>proc{@db.notify('foo')}).should == 'foo'
 
@@ -1738,8 +1738,8 @@ if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG && DB.server_versio
           break
         end
       end.should be_nil
-      called.should be_true
-      called2.should be_true
+      called.should == true
+      called2.should == true
       i.should == 1
     end
 
@@ -1747,7 +1747,7 @@ if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG && DB.server_versio
       @db.listen('foo2', :timeout=>0.001).should == nil
       called = false
       @db.listen('foo2', :timeout=>0.001){|ev, pid, payload| called = true}.should == nil
-      called.should be_false
+      called.should == false
       i = 0
       @db.listen('foo2', :timeout=>0.001, :loop=>proc{i+=1; throw :stop if i > 3}){|ev, pid, payload| called = true}.should == nil
       i.should == 4
@@ -1787,7 +1787,7 @@ describe 'PostgreSQL special float handling' do
     specify 'inserts NaN' do
       nan = 0.0/0.0
       @ds.insert(:value=>nan)
-      @ds.all[0][:value].nan?.should be_true
+      @ds.all[0][:value].nan?.should == true
     end
 
     specify 'inserts +Infinity' do
@@ -2093,26 +2093,26 @@ describe 'PostgreSQL array handling' do
     @db.create_table!(:items){column :i, 'integer[]'; column :i2, 'integer[]'; column :i3, 'integer[]'; column :i4, 'integer[]'; column :i5, 'integer[]'}
     @ds.insert(Sequel.pg_array([1, 2, 3]), Sequel.pg_array([2, 1]), Sequel.pg_array([4, 4]), Sequel.pg_array([[5, 5], [4, 3]]), Sequel.pg_array([1, nil, 5]))
 
-    @ds.get(Sequel.pg_array(:i) > :i3).should be_false
-    @ds.get(Sequel.pg_array(:i3) > :i).should be_true
+    @ds.get(Sequel.pg_array(:i) > :i3).should == false
+    @ds.get(Sequel.pg_array(:i3) > :i).should == true
 
-    @ds.get(Sequel.pg_array(:i) >= :i3).should be_false
-    @ds.get(Sequel.pg_array(:i) >= :i).should be_true
+    @ds.get(Sequel.pg_array(:i) >= :i3).should == false
+    @ds.get(Sequel.pg_array(:i) >= :i).should == true
 
-    @ds.get(Sequel.pg_array(:i3) < :i).should be_false
-    @ds.get(Sequel.pg_array(:i) < :i3).should be_true
+    @ds.get(Sequel.pg_array(:i3) < :i).should == false
+    @ds.get(Sequel.pg_array(:i) < :i3).should == true
 
-    @ds.get(Sequel.pg_array(:i3) <= :i).should be_false
-    @ds.get(Sequel.pg_array(:i) <= :i).should be_true
+    @ds.get(Sequel.pg_array(:i3) <= :i).should == false
+    @ds.get(Sequel.pg_array(:i) <= :i).should == true
 
-    @ds.get(Sequel.expr(5=>Sequel.pg_array(:i).any)).should be_false
-    @ds.get(Sequel.expr(1=>Sequel.pg_array(:i).any)).should be_true
+    @ds.get(Sequel.expr(5=>Sequel.pg_array(:i).any)).should == false
+    @ds.get(Sequel.expr(1=>Sequel.pg_array(:i).any)).should == true
 
-    @ds.get(Sequel.expr(1=>Sequel.pg_array(:i3).all)).should be_false
-    @ds.get(Sequel.expr(4=>Sequel.pg_array(:i3).all)).should be_true
+    @ds.get(Sequel.expr(1=>Sequel.pg_array(:i3).all)).should == false
+    @ds.get(Sequel.expr(4=>Sequel.pg_array(:i3).all)).should == true
 
-    @ds.get(Sequel.expr(1=>Sequel.pg_array(:i)[1..1].any)).should be_true
-    @ds.get(Sequel.expr(2=>Sequel.pg_array(:i)[1..1].any)).should be_false
+    @ds.get(Sequel.expr(1=>Sequel.pg_array(:i)[1..1].any)).should == true
+    @ds.get(Sequel.expr(2=>Sequel.pg_array(:i)[1..1].any)).should == false
 
     @ds.get(Sequel.pg_array(:i2)[1]).should == 2
     @ds.get(Sequel.pg_array(:i2)[1]).should == 2
@@ -2121,14 +2121,14 @@ describe 'PostgreSQL array handling' do
     @ds.get(Sequel.pg_array(:i4)[2][1]).should == 4
     @ds.get(Sequel.pg_array(:i4)[2][2]).should == 3
 
-    @ds.get(Sequel.pg_array(:i).contains(:i2)).should be_true
-    @ds.get(Sequel.pg_array(:i).contains(:i3)).should be_false
+    @ds.get(Sequel.pg_array(:i).contains(:i2)).should == true
+    @ds.get(Sequel.pg_array(:i).contains(:i3)).should == false
 
-    @ds.get(Sequel.pg_array(:i2).contained_by(:i)).should be_true
-    @ds.get(Sequel.pg_array(:i).contained_by(:i2)).should be_false
+    @ds.get(Sequel.pg_array(:i2).contained_by(:i)).should == true
+    @ds.get(Sequel.pg_array(:i).contained_by(:i2)).should == false
 
-    @ds.get(Sequel.pg_array(:i).overlaps(:i2)).should be_true
-    @ds.get(Sequel.pg_array(:i2).overlaps(:i3)).should be_false
+    @ds.get(Sequel.pg_array(:i).overlaps(:i2)).should == true
+    @ds.get(Sequel.pg_array(:i2).overlaps(:i3)).should == false
 
     @ds.get(Sequel.pg_array(:i).dims).should == '[1:3]'
     @ds.get(Sequel.pg_array(:i).length).should == 3
@@ -2144,8 +2144,8 @@ describe 'PostgreSQL array handling' do
     end
     if @db.server_version >= 90300
       @ds.get(Sequel.pg_array(:i5).remove(1).length).should == 2
-      @ds.get(Sequel.pg_array(:i5).replace(1, 4).contains([1])).should be_false
-      @ds.get(Sequel.pg_array(:i5).replace(1, 4).contains([4])).should be_true
+      @ds.get(Sequel.pg_array(:i5).replace(1, 4).contains([1])).should == false
+      @ds.get(Sequel.pg_array(:i5).replace(1, 4).contains([4])).should == true
     end
 
     if @native
@@ -2616,7 +2616,7 @@ describe 'PostgreSQL inet/cidr types' do
     @ds.count.should == 1
     if @native
       rs = @ds.all
-      rs.first.values.all?{|c| c.is_a?(Sequel::Postgres::PGArray)}.should be_true
+      rs.first.values.all?{|c| c.is_a?(Sequel::Postgres::PGArray)}.should == true
       rs.first[:i].first.should == @ipv4
       rs.first[:c].first.should == @ipv4nm
       rs.first[:m].first.should == '12:34:56:78:90:ab'
@@ -2775,70 +2775,70 @@ describe 'PostgreSQL range types' do
   specify 'operations/functions with pg_range_ops' do
     Sequel.extension :pg_range_ops
 
-    @db.get(Sequel.pg_range(1..5, :int4range).op.contains(2..4)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.contains(3..6)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.contains(0..6)).should be_false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.contains(2..4)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.contains(3..6)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.contains(0..6)).should == false
 
-    @db.get(Sequel.pg_range(1..5, :int4range).op.contained_by(0..6)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.contained_by(3..6)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.contained_by(2..4)).should be_false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.contained_by(0..6)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.contained_by(3..6)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.contained_by(2..4)).should == false
 
-    @db.get(Sequel.pg_range(1..5, :int4range).op.overlaps(5..6)).should be_true
-    @db.get(Sequel.pg_range(1...5, :int4range).op.overlaps(5..6)).should be_false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.overlaps(5..6)).should == true
+    @db.get(Sequel.pg_range(1...5, :int4range).op.overlaps(5..6)).should == false
     
-    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(6..10)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(5..10)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(-1..0)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(-1..3)).should be_false
-
-    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(6..10)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(5..10)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(-1..0)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(-1..3)).should be_false
-
-    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(6..10)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(5..10)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(-1..0)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(-1..3)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(-1..7)).should be_true
-
-    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(6..10)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(5..10)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(3..10)).should be_false
-    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-1..10)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-1..0)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-1..3)).should be_true
-    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-5..-1)).should be_true
-
-    @db.get(Sequel.pg_range(1..5, :int4range).op.adjacent_to(6..10)).should be_true
-    @db.get(Sequel.pg_range(1...5, :int4range).op.adjacent_to(6..10)).should be_false
-
-    @db.get((Sequel.pg_range(1..5, :int4range).op + (6..10)).adjacent_to(6..10)).should be_false
-    @db.get((Sequel.pg_range(1..5, :int4range).op + (6..10)).adjacent_to(11..20)).should be_true
-
-    @db.get((Sequel.pg_range(1..5, :int4range).op * (2..6)).adjacent_to(6..10)).should be_true
-    @db.get((Sequel.pg_range(1..4, :int4range).op * (2..6)).adjacent_to(6..10)).should be_false
-
-    @db.get((Sequel.pg_range(1..5, :int4range).op - (2..6)).adjacent_to(2..10)).should be_true
-    @db.get((Sequel.pg_range(0..4, :int4range).op - (3..6)).adjacent_to(4..10)).should be_false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(6..10)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(5..10)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(-1..0)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.left_of(-1..3)).should == false
+
+    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(6..10)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(5..10)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(-1..0)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.right_of(-1..3)).should == false
+
+    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(6..10)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(5..10)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(-1..0)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(-1..3)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.ends_before(-1..7)).should == true
+
+    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(6..10)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(5..10)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(3..10)).should == false
+    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-1..10)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-1..0)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-1..3)).should == true
+    @db.get(Sequel.pg_range(1..5, :int4range).op.starts_after(-5..-1)).should == true
+
+    @db.get(Sequel.pg_range(1..5, :int4range).op.adjacent_to(6..10)).should == true
+    @db.get(Sequel.pg_range(1...5, :int4range).op.adjacent_to(6..10)).should == false
+
+    @db.get((Sequel.pg_range(1..5, :int4range).op + (6..10)).adjacent_to(6..10)).should == false
+    @db.get((Sequel.pg_range(1..5, :int4range).op + (6..10)).adjacent_to(11..20)).should == true
+
+    @db.get((Sequel.pg_range(1..5, :int4range).op * (2..6)).adjacent_to(6..10)).should == true
+    @db.get((Sequel.pg_range(1..4, :int4range).op * (2..6)).adjacent_to(6..10)).should == false
+
+    @db.get((Sequel.pg_range(1..5, :int4range).op - (2..6)).adjacent_to(2..10)).should == true
+    @db.get((Sequel.pg_range(0..4, :int4range).op - (3..6)).adjacent_to(4..10)).should == false
 
     @db.get(Sequel.pg_range(0..4, :int4range).op.lower).should == 0
     @db.get(Sequel.pg_range(0..4, :int4range).op.upper).should == 5
 
-    @db.get(Sequel.pg_range(0..4, :int4range).op.isempty).should be_false
-    @db.get(Sequel::Postgres::PGRange.empty(:int4range).op.isempty).should be_true
+    @db.get(Sequel.pg_range(0..4, :int4range).op.isempty).should == false
+    @db.get(Sequel::Postgres::PGRange.empty(:int4range).op.isempty).should == true
 
-    @db.get(Sequel.pg_range(1..5, :numrange).op.lower_inc).should be_true
-    @db.get(Sequel::Postgres::PGRange.new(1, 5, :exclude_begin=>true, :db_type=>:numrange).op.lower_inc).should be_false
+    @db.get(Sequel.pg_range(1..5, :numrange).op.lower_inc).should == true
+    @db.get(Sequel::Postgres::PGRange.new(1, 5, :exclude_begin=>true, :db_type=>:numrange).op.lower_inc).should == false
 
-    @db.get(Sequel.pg_range(1..5, :numrange).op.upper_inc).should be_true
-    @db.get(Sequel.pg_range(1...5, :numrange).op.upper_inc).should be_false
+    @db.get(Sequel.pg_range(1..5, :numrange).op.upper_inc).should == true
+    @db.get(Sequel.pg_range(1...5, :numrange).op.upper_inc).should == false
 
-    @db.get(Sequel::Postgres::PGRange.new(1, 5, :db_type=>:int4range).op.lower_inf).should be_false
-    @db.get(Sequel::Postgres::PGRange.new(nil, 5, :db_type=>:int4range).op.lower_inf).should be_true
+    @db.get(Sequel::Postgres::PGRange.new(1, 5, :db_type=>:int4range).op.lower_inf).should == false
+    @db.get(Sequel::Postgres::PGRange.new(nil, 5, :db_type=>:int4range).op.lower_inf).should == true
 
-    @db.get(Sequel::Postgres::PGRange.new(1, 5, :db_type=>:int4range).op.upper_inf).should be_false
-    @db.get(Sequel::Postgres::PGRange.new(1, nil, :db_type=>:int4range).op.upper_inf).should be_true
+    @db.get(Sequel::Postgres::PGRange.new(1, 5, :db_type=>:int4range).op.upper_inf).should == false
+    @db.get(Sequel::Postgres::PGRange.new(1, nil, :db_type=>:int4range).op.upper_inf).should == true
   end
 end if DB.server_version >= 90200
 
@@ -2882,7 +2882,7 @@ describe 'PostgreSQL interval types' do
       if @native
         @ds.get(Sequel.cast(:i, String)).should == outstr
         rs = @ds.all
-        rs.first[:i].is_a?(ActiveSupport::Duration).should be_true
+        rs.first[:i].is_a?(ActiveSupport::Duration).should == true
         rs.first[:i].should == ActiveSupport::Duration.new(value, parts)
         rs.first[:i].parts.sort_by{|k,v| k.to_s}.reject{|k,v| v == 0}.should == parts.sort_by{|k,v| k.to_s}
         @ds.delete
@@ -2899,8 +2899,8 @@ describe 'PostgreSQL interval types' do
     @ds.count.should == 1
     if @native
       rs = @ds.all
-      rs.first[:i].is_a?(Sequel::Postgres::PGArray).should be_true
-      rs.first[:i].first.is_a?(ActiveSupport::Duration).should be_true
+      rs.first[:i].is_a?(Sequel::Postgres::PGArray).should == true
+      rs.first[:i].first.is_a?(ActiveSupport::Duration).should == true
       rs.first[:i].first.should == ActiveSupport::Duration.new(31557600 + 2*86400*30 + 3*86400*7 + 4*86400 + 5*3600 + 6*60 + 7, [[:years, 1], [:months, 2], [:days, 25], [:seconds, 18367]])
       rs.first[:i].first.parts.sort_by{|k,v| k.to_s}.should == [[:years, 1], [:months, 2], [:days, 25], [:seconds, 18367]].sort_by{|k,v| k.to_s}
       @ds.delete
@@ -2936,7 +2936,7 @@ describe 'PostgreSQL interval types' do
     c = Class.new(Sequel::Model(@db[:items]))
     c.plugin :pg_typecast_on_load, :i, :c unless @native
     v = c.create(:i=>'1 year 2 mons 25 days 05:06:07').i
-    v.is_a?(ActiveSupport::Duration).should be_true
+    v.is_a?(ActiveSupport::Duration).should == true
     v.should == ActiveSupport::Duration.new(31557600 + 2*86400*30 + 3*86400*7 + 4*86400 + 5*3600 + 6*60 + 7, [[:years, 1], [:months, 2], [:days, 25], [:seconds, 18367]])
     v.parts.sort_by{|k,_| k.to_s}.should == [[:years, 1], [:months, 2], [:days, 25], [:seconds, 18367]].sort_by{|k,_| k.to_s}
   end

data/spec/adapters/spec_helper.rb

@@ -24,7 +24,9 @@ class Sequel::Database
   end
 end
 
-(defined?(RSpec) ? RSpec::Core::ExampleGroup : Spec::Example::ExampleGroup).class_eval do
+require File.join(File.dirname(File.expand_path(__FILE__)), "../rspec_helper.rb")
+
+RSPEC_EXAMPLE_GROUP.class_eval do
   def log 
     begin
       DB.loggers << Logger.new(STDOUT)

data/spec/bin_spec.rb

@@ -26,6 +26,8 @@ DB2 = Sequel.connect("#{CONN_PREFIX}#{BIN_SPEC_DB2}")
 File.delete(BIN_SPEC_DB) if File.file?(BIN_SPEC_DB)
 File.delete(BIN_SPEC_DB2) if File.file?(BIN_SPEC_DB2)
 
+require File.join(File.dirname(File.expand_path(__FILE__)), "rspec_helper.rb")
+
 describe "bin/sequel" do
   def bin(opts={})
     cmd = "#{opts[:pre]}\"#{RUBY}\" -I lib bin/sequel #{opts[:args]} #{"#{CONN_PREFIX}#{BIN_SPEC_DB}" unless opts[:no_conn]} #{opts[:post]}> #{OUTPUT}#{" 2>&1" if opts[:stderr]}"

data/spec/core/database_spec.rb

@@ -483,18 +483,18 @@ describe "Database#disconnect_connection" do
     o = Object.new
     def o.close() @closed=true end
     Sequel::Database.new.disconnect_connection(o)
-    o.instance_variable_get(:@closed).should be_true
+    o.instance_variable_get(:@closed).should == true
   end
 end
 
 describe "Database#valid_connection?" do
   specify "should issue a query to validate the connection" do
     db = Sequel.mock
-    db.synchronize{|c| db.valid_connection?(c)}.should be_true
+    db.synchronize{|c| db.valid_connection?(c)}.should == true
     db.synchronize do |c|
       def c.execute(*) raise Sequel::DatabaseError, "error" end
       db.valid_connection?(c)
-    end.should be_false
+    end.should == false
   end
 end
 
@@ -581,7 +581,7 @@ describe "Database#test_connection" do
   end
   
   specify "should return true if successful" do
-    @db.test_connection.should be_true
+    @db.test_connection.should == true
   end
 
   specify "should raise an error if the attempting to connect raises an error" do
@@ -593,10 +593,10 @@ end
 describe "Database#table_exists?" do
   specify "should test existence by selecting a row from the table's dataset" do
     db = Sequel.mock(:fetch=>[Sequel::Error, [], [{:a=>1}]])
-    db.table_exists?(:a).should be_false
+    db.table_exists?(:a).should == false
     db.sqls.should == ["SELECT NULL AS nil FROM a LIMIT 1"]
-    db.table_exists?(:b).should be_true
-    db.table_exists?(:c).should be_true
+    db.table_exists?(:b).should == true
+    db.table_exists?(:c).should == true
   end
 end
 
@@ -746,7 +746,7 @@ shared_examples_for "Database#transaction" do
   specify "should have in_transaction? return true if inside a transaction" do
     c = nil
     @db.transaction{c = @db.in_transaction?}
-    c.should be_true
+    c.should == true
   end
   
   specify "should have in_transaction? handle sharding correctly" do
@@ -757,7 +757,7 @@ shared_examples_for "Database#transaction" do
   end
   
   specify "should have in_transaction? return false if not in a transaction" do
-    @db.in_transaction?.should be_false
+    @db.in_transaction?.should == false
   end
   
   specify "should return nil if Sequel::Rollback is called in the transaction" do
@@ -1741,16 +1741,16 @@ describe "Database#typecast_value" do
   end
 
   specify "should typecast boolean values to true, false, or nil" do
-    @db.typecast_value(:boolean, false).should be_false
-    @db.typecast_value(:boolean, 0).should be_false
-    @db.typecast_value(:boolean, "0").should be_false
-    @db.typecast_value(:boolean, 'f').should be_false
-    @db.typecast_value(:boolean, 'false').should be_false
-    @db.typecast_value(:boolean, true).should be_true
-    @db.typecast_value(:boolean, 1).should be_true
-    @db.typecast_value(:boolean, '1').should be_true
-    @db.typecast_value(:boolean, 't').should be_true
-    @db.typecast_value(:boolean, 'true').should be_true
+    @db.typecast_value(:boolean, false).should == false
+    @db.typecast_value(:boolean, 0).should == false
+    @db.typecast_value(:boolean, "0").should == false
+    @db.typecast_value(:boolean, 'f').should == false
+    @db.typecast_value(:boolean, 'false').should == false
+    @db.typecast_value(:boolean, true).should == true
+    @db.typecast_value(:boolean, 1).should == true
+    @db.typecast_value(:boolean, '1').should == true
+    @db.typecast_value(:boolean, 't').should == true
+    @db.typecast_value(:boolean, 'true').should == true
     @db.typecast_value(:boolean, '').should be_nil
   end
 
@@ -2326,13 +2326,13 @@ describe "Database extensions" do
   specify "should be able to register an extension with a block and have Database#extension call the block" do
     @db.quote_identifiers = false
     Sequel::Database.register_extension(:foo){|db| db.quote_identifiers = true}
-    @db.extension(:foo).quote_identifiers?.should be_true
+    @db.extension(:foo).quote_identifiers?.should == true
   end
 
   specify "should be able to register an extension with a callable and Database#extension call the callable" do
     @db.quote_identifiers = false
     Sequel::Database.register_extension(:foo, proc{|db| db.quote_identifiers = true})
-    @db.extension(:foo).quote_identifiers?.should be_true
+    @db.extension(:foo).quote_identifiers?.should == true
   end
 
   specify "should be able to load multiple extensions in the same call" do
@@ -2341,7 +2341,7 @@ describe "Database extensions" do
     Sequel::Database.register_extension(:foo, proc{|db| db.quote_identifiers = true})
     Sequel::Database.register_extension(:bar, proc{|db| db.identifier_input_method = nil})
     @db.extension(:foo, :bar)
-    @db.quote_identifiers?.should be_true
+    @db.quote_identifiers?.should == true
     @db.identifier_input_method.should be_nil
   end