sequel 4.5.0 → 4.6.0

data/spec/integration/dataset_test.rb

@@ -195,6 +195,12 @@ describe "Simple Dataset operations" do
     @ds.limit(2, 1).all.should == []
   end
 
+  specify "should be orderable by column number" do
+    @ds.insert(:number=>20)
+    @ds.insert(:number=>10)
+    @ds.order(2, 1).select_map([:id, :number]).should == [[1, 10], [3, 10], [2, 20]]
+  end
+
   specify "should fetch correctly with a limit in an IN subselect" do
     @ds.where(:id=>@ds.select(:id).order(:id).limit(2)).all.should == [{:id=>1, :number=>10}]
     @ds.insert(:number=>20)

data/spec/integration/migrator_test.rb

@@ -13,66 +13,66 @@ describe Sequel::Migrator do
   specify "should be able to migrate up and down all the way successfully" do
     @dir = 'spec/files/integer_migrations'
     @m.apply(@db, @dir)
-    [:schema_info, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_info, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_info].get(:version).should == 3
     @m.apply(@db, @dir, 0)
-    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_false}
+    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_info].get(:version).should == 0
   end
   
   specify "should be able to migrate up and down to specific versions successfully" do
     @dir = 'spec/files/integer_migrations'
     @m.apply(@db, @dir, 2)
-    [:schema_info, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should be_true}
-    @db.table_exists?(:sm3333).should be_false
+    [:schema_info, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should == true}
+    @db.table_exists?(:sm3333).should == false
     @db[:schema_info].get(:version).should == 2
     @m.apply(@db, @dir, 1)
-    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_false}
-    @db.table_exists?(:sm1111).should be_true
+    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should == false}
+    @db.table_exists?(:sm1111).should == true
     @db[:schema_info].get(:version).should == 1
   end
 
   specify "should correctly set migration version to the last successful migration if the migration raises an error when migrating up" do
     @dir = 'spec/files/bad_up_migration'
     proc{@m.apply(@db, @dir)}.should raise_error
-    [:schema_info, :sm11111].each{|n| @db.table_exists?(n).should be_true}
-    @db.table_exists?(:sm22222).should be_false
+    [:schema_info, :sm11111].each{|n| @db.table_exists?(n).should == true}
+    @db.table_exists?(:sm22222).should == false
     @db[:schema_info].get(:version).should == 1
     @m.apply(@db, @dir, 0)
-    [:sm11111, :sm22222].each{|n| @db.table_exists?(n).should be_false}
+    [:sm11111, :sm22222].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_info].get(:version).should == 0
   end
 
   specify "should correctly set migration version to the last successful migration if the migration raises an error when migrating down" do
     @dir = 'spec/files/bad_down_migration'
     @m.apply(@db, @dir)
-    [:schema_info, :sm11111, :sm22222].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_info, :sm11111, :sm22222].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_info].get(:version).should == 2
     proc{@m.apply(@db, @dir, 0)}.should raise_error
-    [:sm22222].each{|n| @db.table_exists?(n).should be_false}
-    @db.table_exists?(:sm11111).should be_true
+    [:sm22222].each{|n| @db.table_exists?(n).should == false}
+    @db.table_exists?(:sm11111).should == true
     @db[:schema_info].get(:version).should == 1
   end
 
   specify "should handle migrating up or down all the way with timestamped migrations" do
     @dir = 'spec/files/timestamped_migrations'
     @m.apply(@db, @dir)
-    [:schema_migrations, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253851_create_nodes.rb 1273253853_3_create_users.rb'
     @m.apply(@db, @dir, 0)
-    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_false}
+    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == []
   end
 
   specify "should handle migrating up or down to specific timestamps with timestamped migrations" do
     @dir = 'spec/files/timestamped_migrations'
     @m.apply(@db, @dir, 1273253851)
-    [:schema_migrations, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should be_true}
-    @db.table_exists?(:sm3333).should be_false
+    [:schema_migrations, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should == true}
+    @db.table_exists?(:sm3333).should == false
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253851_create_nodes.rb'
     @m.apply(@db, @dir, 1273253849)
-    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_false}
-    @db.table_exists?(:sm1111).should be_true
+    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should == false}
+    @db.table_exists?(:sm1111).should == true
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb'
   end
 
@@ -81,7 +81,7 @@ describe Sequel::Migrator do
     @m.apply(@db, @dir)
     @dir = 'spec/files/interleaved_timestamped_migrations'
     @m.apply(@db, @dir)
-    [:schema_migrations, :sm1111, :sm1122, :sm2222, :sm2233, :sm3333].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :sm1111, :sm1122, :sm2222, :sm2233, :sm3333].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253850_create_artists.rb 1273253851_create_nodes.rb 1273253852_create_albums.rb 1273253853_3_create_users.rb'
   end
 
@@ -90,7 +90,7 @@ describe Sequel::Migrator do
     @m.apply(@db, @dir)
     @dir = 'spec/files/interleaved_timestamped_migrations'
     @m.apply(@db, @dir, 0)
-    [:sm1111, :sm1122, :sm2222, :sm2233, :sm3333].each{|n| @db.table_exists?(n).should be_false}
+    [:sm1111, :sm1122, :sm2222, :sm2233, :sm3333].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == []
   end
 
@@ -99,89 +99,89 @@ describe Sequel::Migrator do
     @m.apply(@db, @dir)
     @dir = 'spec/files/interleaved_timestamped_migrations'
     @m.apply(@db, @dir, 1273253851)
-    [:schema_migrations, :sm1111, :sm1122, :sm2222].each{|n| @db.table_exists?(n).should be_true}
-    [:sm2233, :sm3333].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_migrations, :sm1111, :sm1122, :sm2222].each{|n| @db.table_exists?(n).should == true}
+    [:sm2233, :sm3333].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253850_create_artists.rb 1273253851_create_nodes.rb'
   end
 
   specify "should correctly update schema_migrations table when an error occurs when migrating up or down using timestamped migrations" do
     @dir = 'spec/files/bad_timestamped_migrations'
     proc{@m.apply(@db, @dir)}.should raise_error
-    [:schema_migrations, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should be_true}
-    @db.table_exists?(:sm3333).should be_false
+    [:schema_migrations, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should == true}
+    @db.table_exists?(:sm3333).should == false
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253851_create_nodes.rb'
     proc{@m.apply(@db, @dir, 0)}.should raise_error
-    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_false}
-    @db.table_exists?(:sm1111).should be_true
+    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should == false}
+    @db.table_exists?(:sm1111).should == true
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb'
   end
 
   specify "should handle multiple migrations with the same timestamp correctly" do
     @dir = 'spec/files/duplicate_timestamped_migrations'
     @m.apply(@db, @dir)
-    [:schema_migrations, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253853_create_nodes.rb 1273253853_create_users.rb'
     @m.apply(@db, @dir, 1273253853)
-    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_true}
+    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253853_create_nodes.rb 1273253853_create_users.rb'
     @m.apply(@db, @dir, 1273253849)
-    [:sm1111].each{|n| @db.table_exists?(n).should be_true}
-    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_false}
+    [:sm1111].each{|n| @db.table_exists?(n).should == true}
+    [:sm2222, :sm3333].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb'
     @m.apply(@db, @dir, 1273253848)
-    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_false}
+    [:sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == []
   end
 
   specify "should convert schema_info table to schema_migrations table" do
     @dir = 'spec/files/integer_migrations'
     @m.apply(@db, @dir)
-    [:schema_info, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should == false}
 
     @dir = 'spec/files/convert_to_timestamp_migrations'
     @m.apply(@db, @dir)
-    [:schema_info, :sm1111, :sm2222, :sm3333, :schema_migrations, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_info, :sm1111, :sm2222, :sm3333, :schema_migrations, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'001_create_sessions.rb 002_create_nodes.rb 003_3_create_users.rb 1273253850_create_artists.rb 1273253852_create_albums.rb'
 
     @m.apply(@db, @dir, 4)
-    [:schema_info, :schema_migrations, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_true}
-    [:sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :schema_migrations, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should == true}
+    [:sm1122, :sm2233].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == %w'001_create_sessions.rb 002_create_nodes.rb 003_3_create_users.rb'
 
     @m.apply(@db, @dir, 0)
-    [:schema_info, :schema_migrations].each{|n| @db.table_exists?(n).should be_true}
-    [:sm1111, :sm2222, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :schema_migrations].each{|n| @db.table_exists?(n).should == true}
+    [:sm1111, :sm2222, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == []
   end
 
   specify "should handle unapplied migrations when migrating schema_info table to schema_migrations table" do
     @dir = 'spec/files/integer_migrations'
     @m.apply(@db, @dir, 2)
-    [:schema_info, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :sm1111, :sm2222].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should == false}
 
     @dir = 'spec/files/convert_to_timestamp_migrations'
     @m.apply(@db, @dir, 1273253850)
-    [:schema_info, :sm1111, :sm2222, :sm3333, :schema_migrations, :sm1122].each{|n| @db.table_exists?(n).should be_true}
-    [:sm2233].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :sm1111, :sm2222, :sm3333, :schema_migrations, :sm1122].each{|n| @db.table_exists?(n).should == true}
+    [:sm2233].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == %w'001_create_sessions.rb 002_create_nodes.rb 003_3_create_users.rb 1273253850_create_artists.rb'
   end
 
   specify "should handle unapplied migrations when migrating schema_info table to schema_migrations table and target is less than last integer migration version" do
     @dir = 'spec/files/integer_migrations'
     @m.apply(@db, @dir, 1)
-    [:schema_info, :sm1111].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :sm2222, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :sm1111].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :sm2222, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should == false}
 
     @dir = 'spec/files/convert_to_timestamp_migrations'
     @m.apply(@db, @dir, 2)
-    [:schema_info, :sm1111, :sm2222, :schema_migrations].each{|n| @db.table_exists?(n).should be_true}
-    [:sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :sm1111, :sm2222, :schema_migrations].each{|n| @db.table_exists?(n).should == true}
+    [:sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should == false}
     @db[:schema_migrations].select_order_map(:filename).should == %w'001_create_sessions.rb 002_create_nodes.rb'
 
     @m.apply(@db, @dir)
-    [:schema_info, :sm1111, :sm2222, :schema_migrations, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_info, :sm1111, :sm2222, :schema_migrations, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should == true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'001_create_sessions.rb 002_create_nodes.rb 003_3_create_users.rb 1273253850_create_artists.rb 1273253852_create_albums.rb'
   end
 
@@ -189,52 +189,52 @@ describe Sequel::Migrator do
     @dir = 'spec/files/reversible_migrations'
     @db.drop_table?(:a, :b)
     @m.apply(@db, @dir, 1)
-    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should == false}
     @db[:a].columns.should == [:a]
 
     @m.apply(@db, @dir, 2)
-    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should == false}
     @db[:a].columns.should == [:a, :b]
 
     @m.apply(@db, @dir, 3)
-    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should == false}
     @db[:a].columns.should == [:a, :c]
 
     @m.apply(@db, @dir, 4)
-    [:schema_info, :b].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :b].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should == false}
     @db[:b].columns.should == [:a, :c]
 
     @m.apply(@db, @dir, 5)
-    [:schema_info, :b].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :b].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should == false}
     @db[:b].columns.should == [:a, :c, :e]
 
     @m.apply(@db, @dir, 4)
-    [:schema_info, :b].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :b].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should == false}
     @db[:b].columns.should == [:a, :c]
 
     @m.apply(@db, @dir, 3)
-    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should == false}
     @db[:a].columns.should == [:a, :c]
 
     @m.apply(@db, @dir, 2)
-    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should == false}
     @db[:a].columns.should == [:a, :b]
 
     @m.apply(@db, @dir, 1)
-    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should == false}
     @db[:a].columns.should == [:a]
 
     @m.apply(@db, @dir, 0)
-    [:schema_info].each{|n| @db.table_exists?(n).should be_true}
-    [:schema_migrations, :a, :b].each{|n| @db.table_exists?(n).should be_false}
+    [:schema_info].each{|n| @db.table_exists?(n).should == true}
+    [:schema_migrations, :a, :b].each{|n| @db.table_exists?(n).should == false}
   end
 end

data/spec/integration/model_test.rb

@@ -107,7 +107,7 @@ describe "Sequel::Model basic support" do
 
     i.rb = true
     i.destroy.should be_nil
-    i.exists?.should be_true
+    i.exists?.should == true
     i.hooks.should == [:ad, :adr]
 
     i.name = 'K'
@@ -118,7 +118,7 @@ describe "Sequel::Model basic support" do
 
     i.rb = false
     i.destroy.should_not be_nil
-    i.exists?.should be_false
+    i.exists?.should == false
     i.hooks.should == [:ad, :adc]
   end
 

data/spec/integration/schema_test.rb

@@ -298,7 +298,7 @@ describe "Database schema modifiers" do
   specify "should handle create table in a rolled back transaction" do
     @db.drop_table?(:items)
     @db.transaction(:rollback=>:always){@db.create_table(:items){Integer :number}}
-    @db.table_exists?(:items).should be_false
+    @db.table_exists?(:items).should == false
   end if DB.supports_transactional_ddl?
   
   describe "join tables" do

data/spec/integration/spec_helper.rb

@@ -60,7 +60,9 @@ def Sequel.guarded?(*checked)
   false
 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/integration/transaction_test.rb

@@ -23,10 +23,10 @@ describe "Database transactions" do
   end
 
   specify "should have #in_transaction? work correctly" do
-    @db.in_transaction?.should be_false
+    @db.in_transaction?.should == false
     c = nil
     @db.transaction{c = @db.in_transaction?}
-    c.should be_true
+    c.should == true
   end
 
   specify "should correctly rollback transactions" do

data/spec/model/association_reflection_spec.rb

@@ -269,16 +269,16 @@ describe Sequel::Model::Associations::AssociationReflection, "#remove_before_des
 
   it "should be true for many_to_one and many_to_many associations" do
     @c.many_to_one :c, :class=>@c
-    @c.association_reflection(:c).remove_before_destroy?.should be_true
+    @c.association_reflection(:c).remove_before_destroy?.should == true
     @c.many_to_many :cs, :class=>@c
-    @c.association_reflection(:cs).remove_before_destroy?.should be_true
+    @c.association_reflection(:cs).remove_before_destroy?.should == true
   end
 
   it "should be false for one_to_one and one_to_many associations" do
     @c.one_to_one :c, :class=>@c
-    @c.association_reflection(:c).remove_before_destroy?.should be_false
+    @c.association_reflection(:c).remove_before_destroy?.should == false
     @c.one_to_many :cs, :class=>@c
-    @c.association_reflection(:cs).remove_before_destroy?.should be_false
+    @c.association_reflection(:cs).remove_before_destroy?.should == false
   end
 end
 

data/spec/model/associations_spec.rb

@@ -3736,7 +3736,7 @@ describe "Model#freeze" do
   end
 
   it "should freeze the object's associations" do
-    @o.associations.frozen?.should be_true
+    @o.associations.frozen?.should == true
   end
 
   it "should not break associations getters" do

data/spec/model/class_dataset_methods_spec.rb

@@ -25,7 +25,7 @@ describe Sequel::Model, "class dataset methods"  do
     @c.each{|r| r.should == @c.load(:id=>1)}.should == @d
     @db.sqls.should == ["SELECT * FROM items"]
     @c.each_server{|r| r.opts[:server].should == :default}
-    @c.empty?.should be_false
+    @c.empty?.should == false
     @db.sqls.should == ["SELECT 1 AS one FROM items LIMIT 1"]
     @c.except(@d, :from_self=>false).sql.should == "SELECT * FROM items EXCEPT SELECT * FROM items"
     @c.exclude(:a).sql.should == "SELECT * FROM items WHERE NOT a"

data/spec/model/eager_loading_spec.rb

@@ -149,6 +149,13 @@ describe Sequel::Model, "#eager" do
     DB.sqls.should == []
   end
   
+  it "should not break if the dataset does not have a row proc" do
+    EagerAlbum.one_to_one :track, :class=>'EagerTrack', :key=>:album_id
+    a = EagerAlbum.eager(:track).naked.all
+    a.should == [{:id => 1, :band_id => 2}]
+    DB.sqls.should == ['SELECT * FROM albums']
+  end
+  
   it "should use first matching entry when eager loading one_to_one association" do
     EagerAlbum.one_to_one :track, :class=>'EagerTrack', :key=>:album_id
     EagerTrack.dataset._fetch = [{:id => 3, :album_id=>1}, {:id => 4, :album_id=>1}]

data/spec/model/model_spec.rb

@@ -303,7 +303,7 @@ describe Sequel::Model, "constructors" do
     block_called = false
     m = @m.new {|i| block_called = true; i.should be_a_kind_of(@m); i.values[:a] = 1}
     
-    block_called.should be_true
+    block_called.should == true
     m.values[:a].should == 1
   end
   
@@ -312,21 +312,21 @@ describe Sequel::Model, "constructors" do
     o = @m.dataset.row_proc.call(:a=>1)
     o.should be_a_kind_of(@m)
     o.values.should == {:a=>1}
-    o.new?.should be_false
+    o.new?.should == false
   end
   
   it "should have .call create an existing object" do
     o = @m.call(:a=>1)
     o.should be_a_kind_of(@m)
     o.values.should == {:a=>1}
-    o.new?.should be_false
+    o.new?.should == false
   end
   
   it "should have .load create an existing object" do
     o = @m.load(:a=>1)
     o.should be_a_kind_of(@m)
     o.values.should == {:a=>1}
-    o.new?.should be_false
+    o.new?.should == false
   end
 end