sequel 4.41.0 → 4.42.0

data/spec/extensions/typecast_on_load_spec.rb

@@ -40,7 +40,7 @@ describe Sequel::Model, "TypecastOnLoad plugin" do
 
   it "should call setter method with value when automatically reloading the object on creation via insert_select" do
     @c.plugin :typecast_on_load, :b
-    @c.dataset.meta_def(:insert_select){|h| insert(h); first}
+    @c.dataset = @c.dataset.with_extend{def insert_select(h) insert(h); first end}
     o = @c.new(:b=>"1", :y=>"0")
     o.save.values.must_equal(:id=>1, :b=>1, :y=>"0")
     o.bset.must_equal true

data/spec/extensions/unlimited_update_spec.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 describe "Sequel::Plugins::UnlimitedUpdate" do
   before do
     @db = Sequel.mock(:host=>'mysql', :numrows=>1)
+    @db.extend_datasets{def quote_identifiers?; false end}
     @c = Class.new(Sequel::Model(@db[:test]))
     @c.columns :id, :name
     @o = @c.load(:id=>1, :name=>'a')

data/spec/extensions/update_primary_key_spec.rb

@@ -5,6 +5,10 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
     @c = Class.new(Sequel::Model(:a))
     @c.plugin :update_primary_key
     @c.columns :a, :b
+    def @c.set_dataset(*)
+      super
+      set_primary_key :a
+    end
     @c.set_primary_key :a
     @c.unrestrict_primary_key
     @ds = @c.dataset
@@ -12,7 +16,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
   end
 
   it "should handle regular updates" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>1, :b=>4}], [{:a=>1, :b=>4}], [{:a=>1, :b=>5}], [{:a=>1, :b=>5}], [{:a=>1, :b=>6}], [{:a=>1, :b=>6}]]
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>1, :b=>4}], [{:a=>1, :b=>4}], [{:a=>1, :b=>5}], [{:a=>1, :b=>5}], [{:a=>1, :b=>6}], [{:a=>1, :b=>6}]])
     @c.first.update(:b=>4)
     @c.all.must_equal [@c.load(:a=>1, :b=>4)]
     DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET b = 4 WHERE (a = 1)", "SELECT * FROM a"]
@@ -25,7 +29,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
   end
 
   it "should handle updating the primary key field with another field" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]]
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]])
     @c.first.update(:a=>2, :b=>4)
     @c.all.must_equal [@c.load(:a=>2, :b=>4)]
     sqls = DB.sqls
@@ -34,7 +38,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
   end
 
   it "should handle updating just the primary key field when saving changes" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>3}], [{:a=>2, :b=>3}], [{:a=>3, :b=>3}]]
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>3}], [{:a=>2, :b=>3}], [{:a=>3, :b=>3}]])
     @c.first.update(:a=>2)
     @c.all.must_equal [@c.load(:a=>2, :b=>3)]
     DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET a = 2 WHERE (a = 1)", "SELECT * FROM a"]
@@ -44,7 +48,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
   end
 
   it "should handle saving after modifying the primary key field with another field" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]]
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]])
     @c.first.set(:a=>2, :b=>4).save
     @c.all.must_equal [@c.load(:a=>2, :b=>4)]
     sqls = DB.sqls
@@ -53,7 +57,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
   end
 
   it "should handle saving after modifying just the primary key field" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>3}]]
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>3}]])
     @c.first.set(:a=>2).save
     @c.all.must_equal [@c.load(:a=>2, :b=>3)]
     sqls = DB.sqls
@@ -62,7 +66,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
   end
 
   it "should handle saving after updating the primary key" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>5}]]
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>5}]])
     @c.first.update(:a=>2).update(:b=>4).set(:b=>5).save
     @c.all.must_equal [@c.load(:a=>2, :b=>5)]
     DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET a = 2 WHERE (a = 1)", "UPDATE a SET b = 4 WHERE (a = 2)", "UPDATE a SET b = 5 WHERE (a = 2)", "SELECT * FROM a"]
@@ -70,7 +74,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
 
   it "should work correctly when using the prepared_statements plugin" do
     @c.plugin :prepared_statements
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]]
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]])
     o = @c.first
     o.update(:a=>2, :b=>4)
     @c.all.must_equal [@c.load(:a=>2, :b=>4)]

data/spec/extensions/update_refresh_spec.rb

@@ -45,7 +45,7 @@ describe "Sequel::Plugins::UpdateRefresh" do
     @c.dataset = @db[:test].select(:id, :name)
     @db.sqls
     o = @c.load(:id=>1, :name=>'a')
-    o.this.opts[:returning] = [:id, :name]
+    o.instance_variable_set(:@this, o.this.returning(:id, :name))
     o.save
     @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1) RETURNING id, name"]
     o.name.must_equal 'b'

data/spec/extensions/uuid_spec.rb

@@ -14,7 +14,6 @@ describe "Sequel::Plugins::Uuid" do
       end
       db.reset
     end
-    @c.dataset.autoid = nil
   end
   
   it "should handle validations on the uuid field for new objects" do

data/spec/extensions/validate_associated_spec.rb

@@ -16,7 +16,7 @@ describe "ValidatesAssociated plugin" do
     @c.send(:define_method, :validate){|*| errors.add(:name, 'is b') if name == 'b'}
     o = @c.load(:id=>2, :name=>'b')
     @o.send(:delay_validate_associated_object, @c.association_reflection(:cs), o)
-    @o.save.must_equal nil
+    @o.save.must_be_nil
     @o.errors[:cs].must_equal ["name is b"]
     o.errors[:name].must_equal ['is b']
   end

data/spec/extensions/validation_class_methods_spec.rb

@@ -100,8 +100,8 @@ describe Sequel::Model do
     atts = nil
     o.values.clear
     o.valid?.must_equal true
-    vals.must_equal nil
-    atts.must_equal nil
+    vals.must_be_nil
+    atts.must_be_nil
   end
   
   it "should overwrite existing validation with the same tag and attribute" do
@@ -175,7 +175,7 @@ describe Sequel::Model do
     @o.score = 86
     @o.wont_be :valid?
     @o.errors[:score].must_equal ['too low']
-    @o.errors.on(:blah).must_equal nil
+    @o.errors.on(:blah).must_be_nil
   end
 end
 
@@ -203,7 +203,7 @@ describe Sequel::Model do
     @c = model_class.call Sequel::Model do
       columns :value
       
-      def self.filter(*args)
+      def self.where(*args)
         o = Object.new
         def o.count; 2; end
         o
@@ -620,7 +620,7 @@ describe "Superclass validations" do
   end
   
   it "should have skip_superclass_validations? return whether superclass validations were skipped" do
-    @c2.skip_superclass_validations?.must_equal nil
+    @c2.skip_superclass_validations?.must_be_nil
     @c2.skip_superclass_validations
     @c2.skip_superclass_validations?.must_equal true
   end
@@ -829,7 +829,7 @@ describe Sequel::Model, "Validations" do
         uniqueness_of :username
       end
     end
-    User.dataset._fetch = proc do |sql|
+    User.dataset = User.dataset.with_fetch(proc do |sql|
       case sql
       when /count.*username = '0records'/
         {:v => 0}
@@ -840,7 +840,7 @@ describe Sequel::Model, "Validations" do
       when /username = '1record'/
         {:id => 3, :username => "1record", :password => "test"}
       end
-    end
+    end)
     
     @user = User.new(:username => "2records", :password => "anothertest")
     @user.wont_be :valid?
@@ -876,7 +876,7 @@ describe Sequel::Model, "Validations" do
         uniqueness_of [:username, :password]
       end
     end
-    User.dataset._fetch = proc do |sql|
+    User.dataset = User.dataset.with_fetch(proc do |sql|
       case sql
       when /count.*username = '0records'/
         {:v => 0}
@@ -891,7 +891,7 @@ describe Sequel::Model, "Validations" do
           {:id => 4, :username => "1record", :password => "test"}
         end
       end
-    end
+    end)
     
     @user = User.new(:username => "2records", :password => "anothertest")
     @user.wont_be :valid?
@@ -1022,6 +1022,6 @@ describe "Model#save" do
   
   it "should return nil if validations fail and raise_on_save_faiure is false" do
     @m.raise_on_save_failure = false
-    @m.save.must_equal nil
+    @m.save.must_be_nil
   end
 end

data/spec/extensions/validation_helpers_spec.rb

@@ -365,14 +365,14 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     @c.set_validations{validates_unique(:username)}
-    @c.dataset._fetch = proc do |sql|
+    @c.dataset = @c.dataset.with_fetch(proc do |sql|
       case sql
       when /count.*username = '0records'/
         {:v => 0}
       when /count.*username = '1record'/
         {:v => 1}
       end
-    end
+    end)
     
     @user = @c.new(:username => "0records", :password => "anothertest")
     @user.must_be :valid?
@@ -403,14 +403,14 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     @c.set_validations{validates_unique([:username, :password])}
-    @c.dataset._fetch = proc do |sql|
+    @c.dataset = @c.dataset.with_fetch(proc do |sql|
       case sql
       when /count.*username = '0records'/
         {:v => 0}
       when /count.*username = '1record'/
         {:v => 1}
       end
-    end
+    end)
     
     @user = @c.new(:username => "0records", :password => "anothertest")
     @user.must_be :valid?
@@ -448,7 +448,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     @c.set_validations{validates_unique(:username){|ds| ds.filter(:active)}}
-    @c.dataset._fetch = {:v=>0}
+    @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
     @c.new(:username => "0records", :password => "anothertest").must_be :valid?
@@ -461,7 +461,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     @c.set_validations{validates_unique(:username, :where=>proc{|ds, obj, cols| ds.where(cols.map{|c| [Sequel.function(:lower, c), obj.send(c).downcase]})})}
-    @c.dataset._fetch = {:v=>0}
+    @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
     @c.new(:username => "0RECORDS", :password => "anothertest").must_be :valid?
@@ -475,7 +475,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.set_dataset DB[:items]
     c = @c
     @c.set_validations{validates_unique(:username, :dataset=>c.where(:a=>[1,2,3]))}
-    @c.dataset._fetch = {:v=>0}
+    @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
     @c.new(:username => "0records", :password => "anothertest").must_be :valid?
@@ -489,7 +489,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.set_dataset DB[:items]
     c = @c
     @c.set_validations{validates_unique(:username, :dataset=>c.cross_join(:a))}
-    @c.dataset._fetch = {:v=>0}
+    @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
     @c.new(:username => "0records", :password => "anothertest").must_be :valid?
@@ -502,7 +502,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     @c.set_validations{validates_unique([:username, :password], :only_if_modified=>true)}
-    @c.dataset._fetch = {:v=>0}
+    @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
     @c.new(:username => "0records", :password => "anothertest").must_be :valid?
@@ -531,7 +531,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     @c.set_validations{errors.add(:username, 'foo'); validates_unique([:username, :password])}
-    @c.dataset._fetch = {:v=>0}
+    @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
     m = @c.new(:username => "1", :password => "anothertest")

data/spec/extensions/xml_serializer_spec.rb

@@ -19,7 +19,11 @@ describe "Sequel::Plugins::XmlSerializer" do
       attr_accessor :blah
       plugin :xml_serializer
       columns :id, :name, :artist_id
-      @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}, :artist_id=>{:type=>:integer}}
+      @db_schema2 = @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}, :artist_id=>{:type=>:integer}}
+      def self.set_dataset(*)
+        super
+        @db_schema = @db_schema2
+      end
       many_to_one :artist
     end
     @artist = Artist.load(:id=>2, :name=>'YJM')
@@ -142,7 +146,7 @@ describe "Sequel::Plugins::XmlSerializer" do
 
   it "should support an :array_root_name option when serializing arrays" do
     artist = @artist
-    Artist.dataset.meta_def(:all){[artist]}
+    Artist.dataset = Artist.dataset.with_extend{define_method(:all){[artist]}}
     ["<?xml version=\"1.0\"?><ars><ar><id>2</id><name>YJM</name></ar></ars>",
      "<?xml version=\"1.0\"?><ars><ar><name>YJM</name><id>2</id></ar></ars>"].must_include(Artist.to_xml(:array_root_name=>'ars', :root_name=>'ar').gsub(/\n */m, ''))
   end
@@ -154,7 +158,7 @@ describe "Sequel::Plugins::XmlSerializer" do
 
   it "should support a to_xml class and dataset method" do
     album = @album
-    Album.dataset.meta_def(:all){[album]}
+    Album.dataset = Album.dataset.with_extend{define_method(:all){[album]}}
     Album.array_from_xml(Album.to_xml).must_equal [@album]
     Album.array_from_xml(Album.to_xml(:include=>:artist), :associations=>:artist).map{|x| x.artist}.must_equal [@artist]
     Album.array_from_xml(Album.dataset.to_xml(:only=>:name)).must_equal [Album.load(:name=>@album.name)]

data/spec/integration/associations_test.rb

@@ -14,9 +14,9 @@ OneToOneEagerLimitStrategies = shared_description do
     a.first.first_album.must_equal @album
     a.first.last_album.must_equal diff_album
     a.first.second_album.must_equal diff_album
-    a.last.first_album.must_equal nil
-    a.last.last_album.must_equal nil
-    a.last.second_album.must_equal nil
+    a.last.first_album.must_be_nil
+    a.last.last_album.must_be_nil
+    a.last.second_album.must_be_nil
 
     # Check that no extra columns got added by the eager loading
     a.first.first_album.values.must_equal @album.values
@@ -27,7 +27,7 @@ OneToOneEagerLimitStrategies = shared_description do
     a = Artist.eager(:first_album).order(:name).all
     a.must_equal [@artist, ar]
     [@album, same_album].must_include(a.first.first_album)
-    a.last.first_album.must_equal nil
+    a.last.first_album.must_be_nil
   end
 end
 
@@ -42,14 +42,14 @@ OneToOneEagerGraphLimitStrategies = shared_description do
     a = ds.eager_graph_with_options(:first_album, limit_strategy).all
     a.must_equal [@artist, ar]
     a.first.first_album.must_equal @album
-    a.last.first_album.must_equal nil
+    a.last.first_album.must_be_nil
     a.first.first_album.values.must_equal @album.values
 
     a = ds.eager_graph_with_options(:last_album, limit_strategy).all
     a = ds.eager_graph(:last_album).all
     a.must_equal [@artist, ar]
     a.first.last_album.must_equal diff_album
-    a.last.last_album.must_equal nil
+    a.last.last_album.must_be_nil
     a.first.last_album.values.must_equal diff_album.values
 
     if @els[:eager_limit_strategy] != :distinct_on && (@els[:eager_limit_strategy] != :correlated_subquery || Album.dataset.supports_offsets_in_correlated_subqueries?) 
@@ -57,7 +57,7 @@ OneToOneEagerGraphLimitStrategies = shared_description do
       a = ds.eager_graph(:second_album).all
       a.must_equal [@artist, ar]
       a.first.second_album.must_equal diff_album
-      a.last.second_album.must_equal nil
+      a.last.second_album.must_be_nil
       a.first.second_album.values.must_equal diff_album.values
     end
 
@@ -65,7 +65,7 @@ OneToOneEagerGraphLimitStrategies = shared_description do
     a = ds.eager_graph_with_options(:first_album, limit_strategy).all
     a.must_equal [@artist, ar]
     [@album, same_album].must_include(a.first.first_album)
-    a.last.first_album.must_equal nil
+    a.last.first_album.must_be_nil
   end
 end
 
@@ -149,9 +149,9 @@ OneThroughOneEagerLimitStrategies = shared_description do
     als.first.first_tag.must_equal @tag
     als.first.second_tag.must_equal tu
     als.first.last_tag.must_equal tv
-    als.last.first_tag.must_equal nil
-    als.last.second_tag.must_equal nil
-    als.last.last_tag.must_equal nil
+    als.last.first_tag.must_be_nil
+    als.last.second_tag.must_be_nil
+    als.last.last_tag.must_be_nil
     
     # Check that no extra columns got added by the eager loading
     als.first.first_tag.values.must_equal @tag.values
@@ -170,19 +170,19 @@ OneThroughOneEagerGraphLimitStrategies = shared_description do
     als = ds.eager_graph_with_options(:first_tag, limit_strategy).all
     als.must_equal [@album, al]
     als.first.first_tag.must_equal @tag
-    als.last.first_tag.must_equal nil
+    als.last.first_tag.must_be_nil
     als.first.first_tag.values.must_equal @tag.values
 
     als = ds.eager_graph_with_options(:second_tag, @els[:eager_limit_strategy] != :distinct_on ? limit_strategy : {}).all
     als.must_equal [@album, al]
     als.first.second_tag.must_equal tu
-    als.last.second_tag.must_equal nil
+    als.last.second_tag.must_be_nil
     als.first.second_tag.values.must_equal tu.values
 
     als = ds.eager_graph_with_options(:last_tag, limit_strategy).all
     als.must_equal [@album, al]
     als.first.last_tag.must_equal tv
-    als.last.last_tag.must_equal nil
+    als.last.last_tag.must_be_nil
     als.first.last_tag.values.must_equal tv.values
   end
 end
@@ -333,7 +333,7 @@ OneThroughManyEagerLimitStrategies = shared_description do
     ars.first.second_tag.must_equal tu
     ars.first.last_tag.must_equal tv
     ars.last.first_tag.must_equal tu
-    ars.last.second_tag.must_equal nil
+    ars.last.second_tag.must_be_nil
     ars.last.last_tag.must_equal tu
     
     # Check that no extra columns got added by the eager loading
@@ -362,7 +362,7 @@ OneThroughManyEagerGraphLimitStrategies = shared_description do
     ars = ds.eager_graph_with_options(:second_tag, @els[:eager_limit_strategy] != :distinct_on ? limit_strategy : {}).all
     ars.must_equal [@artist, ar]
     ars.first.second_tag.must_equal tu
-    ars.last.second_tag.must_equal nil
+    ars.last.second_tag.must_be_nil
     ars.first.second_tag.values.must_equal tu.values
 
     ars = ds.eager_graph_with_options(:last_tag, limit_strategy).all
@@ -1495,10 +1495,10 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
   end
 
   it "should return no objects if none are associated" do
-    @album.artist.must_equal nil
-    @album.artist_dataset.first.must_equal nil
-    @artist.first_album.must_equal nil
-    @artist.first_album_dataset.first.must_equal nil
+    @album.artist.must_be_nil
+    @album.artist_dataset.first.must_be_nil
+    @artist.first_album.must_be_nil
+    @artist.first_album_dataset.first.must_be_nil
     @artist.albums.must_equal []
     @artist.albums_dataset.all.must_equal []
     @album.tags.must_equal []
@@ -1508,8 +1508,8 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
     @tag.albums.must_equal []
     @tag.albums_dataset.all.must_equal []
     unless @no_many_through_many
-      @album.first_tag.must_equal nil
-      @album.first_tag_dataset.first.must_equal nil
+      @album.first_tag.must_be_nil
+      @album.first_tag_dataset.first.must_be_nil
     end
   end
 
@@ -1518,13 +1518,13 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
     @album.update(:artist => @artist)
     @album.reload.artist.must_equal @artist
     @album.update(:artist => nil)
-    @album.reload.artist.must_equal nil
+    @album.reload.artist.must_be_nil
 
     # one to one
     @artist.update(:first_album => @album)
     @artist.reload.first_album.must_equal @album
     @artist.update(:first_album => nil)
-    @artist.reload.first_album.must_equal nil
+    @artist.reload.first_album.must_be_nil
 
     unless @no_many_through_many
       tag = @pr.call.last
@@ -1536,15 +1536,15 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
       @album.update(:first_tag => tag)
       @album.reload.first_tag.must_equal tag
       @album.update(:first_tag => nil)
-      @album.reload.first_tag.must_equal nil
+      @album.reload.first_tag.must_be_nil
       @album.update(:first_tag => nil)
-      @album.reload.first_tag.must_equal nil
+      @album.reload.first_tag.must_be_nil
 
       # one through one with alias
       @album.update(:alias_t_tag => @tag)
       @album.reload.alias_t_tag.must_equal @tag
       @album.update(:alias_t_tag => nil)
-      @album.reload.alias_t_tag.must_equal nil
+      @album.reload.alias_t_tag.must_be_nil
     end
   end
 
@@ -2041,12 +2041,12 @@ describe "Sequel::Model Simple Associations" do
     @artist.albums(proc{|ds| ds.filter(:id=>@album.id)}).must_equal [@album]
 
     @album.artist.must_equal @artist
-    @album.artist(proc{|ds| ds.exclude(:id=>@artist.id)}).must_equal nil
+    @album.artist(proc{|ds| ds.exclude(:id=>@artist.id)}).must_be_nil
     @album.artist(proc{|ds| ds.filter(:id=>@artist.id)}).must_equal @artist
 
     @artist.albums{|ds| ds.exclude(:id=>@album.id)}.must_equal []
     @artist.albums{|ds| ds.filter(:id=>@album.id)}.must_equal [@album]
-    @album.artist{|ds| ds.exclude(:id=>@artist.id)}.must_equal nil
+    @album.artist{|ds| ds.exclude(:id=>@artist.id)}.must_be_nil
     @album.artist{|ds| ds.filter(:id=>@artist.id)}.must_equal @artist
   end
   
@@ -2082,8 +2082,8 @@ describe "Sequel::Model Simple Associations" do
     Album.many_to_many :tags, :right_key=>:tag_id, :select=>[Sequel.expr(:tags).*, Sequel[:albums_tags][:tag_id].as(:atid)], :dataset_associations_join=>true
     Artist.many_through_many :tags, [[:albums, :artist_id, :id], [:albums_tags, :album_id, :tag_id]], :select=>[Sequel.expr(:tags).*, Sequel[:albums_tags][:tag_id].as(:atid), Sequel[:albums][:artist_id].as(:aid)], :dataset_associations_join=>true
 
-    Album.tags.order(Sequel[:tags][:name]).first.must_equal nil
-    Artist.tags.order(Sequel[:tags][:name]).first.must_equal nil
+    Album.tags.order(Sequel[:tags][:name]).first.must_be_nil
+    Artist.tags.order(Sequel[:tags][:name]).first.must_be_nil
 
     @album.add_tag(@tag)
     @artist.add_album(@album)