sequel 4.41.0 → 4.42.0

data/spec/extensions/meta_def_spec.rb

@@ -11,9 +11,14 @@ describe "Sequel::Metaprogramming" do
     o = Sequel::Database.new
     o.meta_def(:foo){4}
     o.foo.must_equal 4
+    
     o = o[:a]
-    o.meta_def(:foo){5}
-    o.foo.must_equal 5
+    # SEQUEL5: Remove
+    unless o.frozen?
+      o.meta_def(:foo){5}
+      o.foo.must_equal 5
+    end
+
     o = Sequel::Model.new
     o.meta_def(:foo){6}
     o.foo.must_equal 6

data/spec/extensions/migration_spec.rb

@@ -54,8 +54,8 @@ describe "Migration.apply" do
 
   it "should have default up and down actions that do nothing" do
     m = Class.new(Sequel::Migration)
-    m.apply(@db, :up).must_equal nil
-    m.apply(@db, :down).must_equal nil
+    m.apply(@db, :up).must_be_nil
+    m.apply(@db, :down).must_be_nil
   end
 
   it "should respond to the methods the database responds to" do
@@ -89,8 +89,8 @@ describe "SimpleMigration#apply" do
 
   it "should have default up and down actions that do nothing" do
     m = Sequel.migration{}
-    m.apply(@db, :up).must_equal nil
-    m.apply(@db, :down).must_equal nil
+    m.apply(@db, :up).must_be_nil
+    m.apply(@db, :down).must_be_nil
   end
 end
 
@@ -252,15 +252,13 @@ describe "Sequel::IntegerMigrator" do
       end
       
       def dataset
-        ds = super
-        ds.extend(Module.new do
+        super.with_extend do
           def count; 1; end
           def columns; db.columns_created end
           def insert(h); db.versions.merge!(h); db.run insert_sql(h) end
           def update(h); db.versions.merge!(h); db.run update_sql(h) end
           def fetch_rows(sql); db.execute(sql); yield(db.versions) unless db.versions.empty? end
-        end)
-        ds
+        end
       end
 
       def table_exists?(name)
@@ -513,7 +511,6 @@ describe "Sequel::TimestampMigrator" do
     end
     dbc = Class.new(Sequel::Mock::Database) do
       self::Tables = tables= {}
-      define_method(:dataset){|*a| dsc.new(self, *a)}
       def create_table(name, *args, &block)
         super
         self.class::Tables[name.to_sym] = true
@@ -522,6 +519,7 @@ describe "Sequel::TimestampMigrator" do
       define_method(:table_exists?){|name| super(name); tables.has_key?(name.to_sym)}
     end
     @db = dbc.new
+    @db.dataset_class = dsc
     @m = Sequel::Migrator
   end
 
@@ -739,9 +737,9 @@ describe "Sequel::TimestampMigrator" do
 
   it "should return nil" do
     @dir = 'spec/files/timestamped_migrations'
-    @m.apply(@db, @dir, 1273253850).must_equal nil
-    @m.apply(@db, @dir, 0).must_equal nil
-    @m.apply(@db, @dir).must_equal nil
+    @m.apply(@db, @dir, 1273253850).must_be_nil
+    @m.apply(@db, @dir, 0).must_be_nil
+    @m.apply(@db, @dir).must_be_nil
   end
 
   it "should use TimestampMigrator if TimestampMigrator.apply is called even for integer migrations directory" do

data/spec/extensions/mssql_optimistic_locking_spec.rb

@@ -3,7 +3,8 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 describe "MSSSQL optimistic locking plugin" do
   before do
     @db = Sequel.mock(:host=>'mssql')
-    @c = Class.new(Sequel::Model(@db[:items]))
+    @ds = @db[:items].with_quote_identifiers(false).with_extend{def input_identifier(v); v.to_s end}
+    @c = Class.new(Sequel::Model(@ds))
     @c.columns :id, :name, :timestamp
     @c.plugin :mssql_optimistic_locking
     @o = @c.load(:id=>1, :name=>'a', :timestamp=>'1234')
@@ -49,7 +50,7 @@ describe "MSSSQL optimistic locking plugin" do
   end
 
   it "should allow changing the lock column via model.lock_column=" do
-    @c = Class.new(Sequel::Model(@db[:items]))
+    @c = Class.new(Sequel::Model(@ds))
     @c.columns :id, :name, :lv
     @c.plugin :mssql_optimistic_locking
     @c.lock_column = :lv
@@ -66,7 +67,7 @@ describe "MSSSQL optimistic locking plugin" do
   end
 
   it "should allow changing the lock column via plugin option" do
-    @c = Class.new(Sequel::Model(@db[:items]))
+    @c = Class.new(Sequel::Model(@ds))
     @c.columns :id, :name, :lv
     @c.plugin :mssql_optimistic_locking, :lock_column=>:lv
     @o = @c.load(:id=>1, :name=>'a', :lv=>'1234')

data/spec/extensions/named_timezones_spec.rb

@@ -44,9 +44,10 @@ describe "Sequel named_timezones extension" do
   end
     
   it "should convert datetimes going into the database to named database_timezone" do
-    ds = @db[:a]
-    def ds.supports_timestamp_timezones?; true; end
-    def ds.supports_timestamp_usecs?; false; end
+    ds = @db[:a].with_extend do
+      def supports_timestamp_timezones?; true; end
+      def supports_timestamp_usecs?; false; end
+    end
     ds.insert([@dt, DateTime.civil(2009,6,1,3,20,30,-7/24.0), DateTime.civil(2009,6,1,6,20,30,-1/6.0)])
     @db.sqls.must_equal ["INSERT INTO a VALUES ('2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400')"]
   end

data/spec/extensions/nested_attributes_spec.rb

@@ -326,7 +326,7 @@ describe "NestedAttributes plugin" do
     ar.set(:albums_attributes=>[{:id=>10, :_remove=>'t'}])
     ar.associations[:albums].must_equal []
     @db.sqls.must_equal []
-    @Album.dataset._fetch = {:id=>1}
+    @Album.dataset = @Album.dataset.with_fetch(:id=>1)
     ar.save
     check_sql_array("SELECT 1 AS one FROM albums WHERE ((albums.artist_id = 20) AND (id = 10)) LIMIT 1",
       ["UPDATE albums SET artist_id = NULL, name = 'Al' WHERE (id = 10)", "UPDATE albums SET name = 'Al', artist_id = NULL WHERE (id = 10)"],
@@ -350,7 +350,7 @@ describe "NestedAttributes plugin" do
     ar.associations[:concerts] = [co]
     ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-05', :_remove=>'t'}])
     @db.sqls.must_equal []
-    @Concert.dataset._fetch = {:id=>1}
+    @Concert.dataset = @Concert.dataset.with_fetch(:id=>1)
     ar.save
     check_sql_array(["SELECT 1 AS one FROM concerts WHERE ((concerts.artist_id = 10) AND (tour = 'To') AND (date = '2004-04-05')) LIMIT 1", "SELECT 1 AS one FROM concerts WHERE ((concerts.artist_id = 10) AND (date = '2004-04-05') AND (tour = 'To')) LIMIT 1"],
       ["UPDATE concerts SET artist_id = NULL, playlist = 'Pl' WHERE ((tour = 'To') AND (date = '2004-04-05'))", "UPDATE concerts SET playlist = 'Pl', artist_id = NULL WHERE ((tour = 'To') AND (date = '2004-04-05'))", "UPDATE concerts SET artist_id = NULL, playlist = 'Pl' WHERE ((date = '2004-04-05') AND (tour = 'To'))", "UPDATE concerts SET playlist = 'Pl', artist_id = NULL WHERE ((date = '2004-04-05') AND (tour = 'To'))"],

data/spec/extensions/null_dataset_spec.rb

@@ -17,12 +17,12 @@ describe "null_dataset extension" do
   end
 
   it "should make fetch_rows be a noop" do
-    @ds.fetch_rows("SELECT 1", &@pr).must_equal nil
+    @ds.fetch_rows("SELECT 1", &@pr).must_be_nil
     @i.must_equal 0
   end
 
   it "should make insert be a noop" do
-    @ds.insert(1).must_equal nil
+    @ds.insert(1).must_be_nil
   end
 
   it "should make update be a noop" do
@@ -34,19 +34,21 @@ describe "null_dataset extension" do
   end
 
   it "should make truncate be a noop" do
-    @ds.truncate.must_equal nil
+    @ds.truncate.must_be_nil
   end
 
   it "should make execute_* be a noop" do
-    @ds.send(:execute_ddl,'FOO').must_equal nil
-    @ds.send(:execute_insert,'FOO').must_equal nil
-    @ds.send(:execute_dui,'FOO').must_equal nil
-    @ds.send(:execute,'FOO').must_equal nil
+    @ds.send(:execute_ddl,'FOO').must_be_nil
+    @ds.send(:execute_insert,'FOO').must_be_nil
+    @ds.send(:execute_dui,'FOO').must_be_nil
+    @ds.send(:execute,'FOO').must_be_nil
   end
 
   it "should have working columns" do
     @skip_check = true
-    @ds.columns.must_equal [:id]
+    2.times do
+      @ds.columns.must_equal [:id]
+    end
     @db.sqls.must_equal ['SELECT * FROM table LIMIT 1']
   end
 
@@ -59,7 +61,7 @@ describe "null_dataset extension" do
   end
 
   it "should make import a noop" do
-    @ds.import([:id], [[1], [2], [3]]).must_equal nil
+    @ds.import([:id], [[1], [2], [3]]).must_be_nil
   end
 
   it "should have nullify method returned modified receiver" do
@@ -73,9 +75,12 @@ describe "null_dataset extension" do
 
   it "should have nullify! method modify receiver" do
     ds = @db[:table]
-    ds.nullify!.must_be_same_as(ds)
-    ds.each(&@pr)
-    @i.must_equal 0
+    # SEQUEL5: Remove
+    unless ds.frozen?
+      ds.nullify!.must_be_same_as(ds)
+      ds.each(&@pr)
+      @i.must_equal 0
+    end
   end
 
   it "should work with method chaining" do

data/spec/extensions/optimistic_locking_spec.rb

@@ -6,7 +6,7 @@ describe "optimistic_locking plugin" do
     end
     h = {1=>{:id=>1, :name=>'John', :lock_version=>2}}
     lv = @lv = "lock_version".dup
-    @c.instance_dataset.numrows = @c.dataset.numrows = proc do |sql|
+    @c.dataset = @c.dataset.with_numrows(proc do |sql|
       case sql
       when /UPDATE people SET (name|#{lv}) = ('Jim'|'Bob'|\d+), (?:name|#{lv}) = ('Jim'|'Bob'|\d+) WHERE \(\(id = (\d+)\) AND \(#{lv} = (\d+)\)\)/
         name, nlv = $1 == 'name' ? [$2, $3] : [$3, $2]
@@ -36,13 +36,12 @@ describe "optimistic_locking plugin" do
       else
         puts sql
       end
-    end
-    @c.instance_dataset._fetch = @c.dataset._fetch = proc do |sql|
+    end).with_fetch(proc do |sql|
       m = h[1].dup
       v = m.delete(:lock_version)
       m[lv.to_sym] = v
       m
-    end
+    end)
     @c.columns :id, :name, :lock_version
     @c.plugin :optimistic_locking
   end
@@ -118,7 +117,7 @@ describe "optimistic_locking plugin" do
   end
 
   it "should not increment the lock column when the update fails" do
-    @c.instance_dataset.meta_def(:update) {|_| raise }
+    @c.dataset = @c.dataset.with_extend{def update(_) raise end}
     p1 = @c[1]
     p1.modified!
     lv = p1.lock_version

data/spec/extensions/pagination_spec.rb

@@ -2,9 +2,8 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "A paginated dataset" do
   before do
-    @d = Sequel.mock.dataset.extension(:pagination)
-    @d.meta_def(:count) {153}
-    
+    count = @count = [153]
+    @d = Sequel.mock.dataset.extension(:pagination).with_extend{define_method(:count){count.first}}
     @paginated = @d.paginate(1, 20)
   end
   
@@ -24,7 +23,7 @@ describe "A paginated dataset" do
     @paginated.page_count.must_equal 8
     @d.paginate(1, 50).page_count.must_equal 4
 
-    @d.meta_def(:count) {0}
+    @count[0] = 0
     @d.paginate(1, 50).page_count.must_equal 1
   end
   
@@ -35,11 +34,11 @@ describe "A paginated dataset" do
   
   it "should return the next page number or nil if we're on the last" do
     @paginated.next_page.must_equal 2
-    @d.paginate(4, 50).next_page.must_equal nil
+    @d.paginate(4, 50).next_page.must_be_nil
   end
   
   it "should return the previous page number or nil if we're on the first" do
-    @paginated.prev_page.must_equal nil
+    @paginated.prev_page.must_be_nil
     @d.paginate(4, 50).prev_page.must_equal 3
   end
   
@@ -67,7 +66,7 @@ describe "A paginated dataset" do
     @d.paginate(5, 30).last_page?.must_equal false
     @d.paginate(6, 30).last_page?.must_equal true
 
-    @d.meta_def(:count) {0}
+    @count[0] = 0
     @d.paginate(1, 30).last_page?.must_equal true
     @d.paginate(2, 30).last_page?.must_equal false
   end
@@ -80,15 +79,14 @@ describe "A paginated dataset" do
 
   it "should work with fixed sql" do
     ds = @d.clone(:sql => 'select * from blah')
-    ds.meta_def(:count) {150}
+    @count[0] = 150
     ds.paginate(2, 50).sql.must_equal 'SELECT * FROM (select * from blah) AS t1 LIMIT 50 OFFSET 50'
   end
 end
 
 describe "Dataset#each_page" do
   before do
-    @d = Sequel.mock.dataset.from(:items).extension(:pagination)
-    @d.meta_def(:count) {153}
+    @d = Sequel.mock[:items].extension(:pagination).with_extend{def count; 153 end}
   end
   
   it "should raise an error if the dataset already has a limit" do

data/spec/extensions/pg_array_associations_spec.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 describe Sequel::Model, "pg_array_associations" do
   before do
     @db = Sequel.mock(:numrows=>1)
+    @db.extend_datasets{def quote_identifiers?; false end}
     class ::Artist < Sequel::Model(@db)
       attr_accessor :yyy
       columns :id, :tag_ids
@@ -21,8 +22,8 @@ describe Sequel::Model, "pg_array_associations" do
     end
     @c1 = Artist
     @c2 = Tag
-    @c1.dataset._fetch = {:id=>1, :tag_ids=>Sequel.pg_array([1,2,3])}
-    @c2.dataset._fetch = {:id=>2}
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :tag_ids=>Sequel.pg_array([1,2,3]))
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2)
     @o1 = @c1.first
     @o2 = @c2.first
     @n1 = @c1.new
@@ -223,8 +224,8 @@ describe Sequel::Model, "pg_array_associations" do
   it "should support a :uniq option that removes duplicates from the association" do
     @c1.pg_array_to_many :tags, :clone=>:tags, :uniq=>true
     @c2.many_to_pg_array :artists, :clone=>:artists, :uniq=>true
-    @c1.dataset._fetch = [{:id=>20}, {:id=>30}, {:id=>20}, {:id=>30}]
-    @c2.dataset._fetch = [{:id=>20}, {:id=>30}, {:id=>20}, {:id=>30}]
+    @c1.dataset = @c1.dataset.with_fetch([{:id=>20}, {:id=>30}, {:id=>20}, {:id=>30}])
+    @c2.dataset = @c1.dataset.with_fetch([{:id=>20}, {:id=>30}, {:id=>20}, {:id=>30}])
     @o1.tags.must_equal [@c2.load(:id=>20), @c2.load(:id=>30)]
     @o2.artists.must_equal [@c1.load(:id=>20), @c1.load(:id=>30)]
   end
@@ -312,8 +313,8 @@ describe Sequel::Model, "pg_array_associations" do
     @c1.pg_array_to_many :tags2, :clone=>:tags, :eager_graph=>:artists, :key=>:tag_ids
     @c2.many_to_pg_array :artists2, :clone=>:artists, :eager_graph=>:tags
 
-    @c2.dataset._fetch = {:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3])}
-    @c1.dataset._fetch = {:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3])}
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3]))
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3]))
 
     @o1.tags2.must_equal [@o2]
     @db.sqls.first.must_match(/SELECT tags\.id, artists\.id AS artists_id, artists\.tag_ids FROM tags LEFT OUTER JOIN artists ON \(artists.tag_ids @> ARRAY\[tags.id\]\) WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
@@ -325,8 +326,8 @@ describe Sequel::Model, "pg_array_associations" do
     @o2.artists2.first.tags.must_equal [@o2]
     @db.sqls.must_equal []
 
-    @c2.dataset._fetch = {:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3])}
-    @c1.dataset._fetch = {:id=>1, :tag_ids=>Sequel.pg_array([1,2,3])}
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3]))
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :tag_ids=>Sequel.pg_array([1,2,3]))
 
     a = @c1.eager(:tags2).all
     sqls = @db.sqls
@@ -337,8 +338,8 @@ describe Sequel::Model, "pg_array_associations" do
     a.first.tags2.first.artists.must_equal [@o1]
     @db.sqls.must_equal []
 
-    @c2.dataset._fetch = {:id=>2}
-    @c1.dataset._fetch = {:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3])}
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2)
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3]))
 
     a = @c2.eager(:artists2).all
     @db.sqls.must_equal ["SELECT * FROM tags", "SELECT artists.id, artists.tag_ids, tags.id AS tags_id FROM artists LEFT OUTER JOIN tags ON (artists.tag_ids @> ARRAY[tags.id]) WHERE (artists.tag_ids && ARRAY[2]::integer[])"]
@@ -349,7 +350,7 @@ describe Sequel::Model, "pg_array_associations" do
   end
   
   it "should respect the :limit option when eager loading" do
-    @c2.dataset._fetch = [{:id=>1},{:id=>2}, {:id=>3}]
+    @c2.dataset = @c2.dataset.with_fetch([{:id=>1},{:id=>2}, {:id=>3}])
 
     @c1.pg_array_to_many :tags, :clone=>:tags, :limit=>2
     a = @c1.eager(:tags).all
@@ -378,8 +379,8 @@ describe Sequel::Model, "pg_array_associations" do
     a.first.tags.must_equal [@c2.load(:id=>2), @c2.load(:id=>3)]
     @db.sqls.length.must_equal 0
 
-    @c2.dataset._fetch = [{:id=>2}]
-    @c1.dataset._fetch = [{:id=>5, :tag_ids=>Sequel.pg_array([1,2,3])},{:id=>6, :tag_ids=>Sequel.pg_array([2,3])}, {:id=>7, :tag_ids=>Sequel.pg_array([1,2])}]
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2)
+    @c1.dataset = @c1.dataset.with_fetch([{:id=>5, :tag_ids=>Sequel.pg_array([1,2,3])},{:id=>6, :tag_ids=>Sequel.pg_array([2,3])}, {:id=>7, :tag_ids=>Sequel.pg_array([1,2])}])
 
     @c2.many_to_pg_array :artists, :clone=>:artists, :limit=>2
     a = @c2.eager(:artists).all
@@ -414,8 +415,8 @@ describe Sequel::Model, "pg_array_associations" do
   end
 
   it "should eagerly graph associations" do
-    @c2.dataset._fetch = {:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3])}
-    @c1.dataset._fetch = {:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3])}
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3]))
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3]))
 
     a = @c1.eager_graph(:tags).all
     @db.sqls.must_equal ["SELECT artists.id, artists.tag_ids, tags.id AS tags_id FROM artists LEFT OUTER JOIN tags ON (artists.tag_ids @> ARRAY[tags.id])"]
@@ -431,8 +432,8 @@ describe Sequel::Model, "pg_array_associations" do
   end
 
   it "should allow cascading of eager graphing for associations of associated models" do
-    @c2.dataset._fetch = {:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3]), :tags_0_id=>2}
-    @c1.dataset._fetch = {:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3]), :artists_0_id=>1, :artists_0_tag_ids=>Sequel.pg_array([1,2,3])}
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3]), :tags_0_id=>2)
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3]), :artists_0_id=>1, :artists_0_tag_ids=>Sequel.pg_array([1,2,3]))
 
     a = @c1.eager_graph(:tags=>:artists).all
     @db.sqls.must_equal ["SELECT artists.id, artists.tag_ids, tags.id AS tags_id, artists_0.id AS artists_0_id, artists_0.tag_ids AS artists_0_tag_ids FROM artists LEFT OUTER JOIN tags ON (artists.tag_ids @> ARRAY[tags.id]) LEFT OUTER JOIN artists AS artists_0 ON (artists_0.tag_ids @> ARRAY[tags.id])"]
@@ -454,8 +455,8 @@ describe Sequel::Model, "pg_array_associations" do
     @c1.pg_array_to_many :tags, :clone=>:tags, :primary_key=>Sequel.*(:id, 3), :primary_key_method=>:id3, :key=>:tag3_ids, :key_column=>Sequel.pg_array(:tag_ids)[1..2]
     @c2.many_to_pg_array :artists, :clone=>:artists, :primary_key=>:id3, :key=>:tag3_ids, :key_column=>Sequel.pg_array(:tag_ids)[1..2]
 
-    @c2.dataset._fetch = {:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3]), :tags_0_id=>2}
-    @c1.dataset._fetch = {:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3]), :artists_0_id=>1, :artists_0_tag_ids=>Sequel.pg_array([1,2,3])}
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3]), :tags_0_id=>2)
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3]), :artists_0_id=>1, :artists_0_tag_ids=>Sequel.pg_array([1,2,3]))
 
     a = @c1.eager_graph(:tags).all
     a.must_equal [@o1]
@@ -474,8 +475,8 @@ describe Sequel::Model, "pg_array_associations" do
     @c1.pg_array_to_many :tags, :clone=>:tags, :graph_select=>:id2
     @c2.many_to_pg_array :artists, :clone=>:artists, :graph_select=>:id
 
-    @c2.dataset._fetch = {:id=>2, :artists_id=>1}
-    @c1.dataset._fetch = {:id=>1, :id2=>2, :tag_ids=>Sequel.pg_array([1,2,3])}
+    @c2.dataset = @c2.dataset.with_fetch(:id=>2, :artists_id=>1)
+    @c1.dataset = @c1.dataset.with_fetch(:id=>1, :id2=>2, :tag_ids=>Sequel.pg_array([1,2,3]))
 
     a = @c1.eager_graph(:tags).all
     @db.sqls.must_equal ["SELECT artists.id, artists.tag_ids, tags.id2 FROM artists LEFT OUTER JOIN tags ON (artists.tag_ids @> ARRAY[tags.id])"]
@@ -606,7 +607,7 @@ describe Sequel::Model, "pg_array_associations" do
 
     v = @c1.load(:id=>1)
     v.remove_tag(@c2.load(:id=>4))
-    v.tag_ids.must_equal nil
+    v.tag_ids.must_be_nil
     @db.sqls.must_equal []
     v.save_changes
     @db.sqls.must_equal []
@@ -616,7 +617,7 @@ describe Sequel::Model, "pg_array_associations" do
 
     v = @c1.load(:id=>1)
     v.remove_all_tags
-    v.tag_ids.must_equal nil
+    v.tag_ids.must_be_nil
     @db.sqls.must_equal []
     v.save_changes
     @db.sqls.must_equal []
@@ -720,17 +721,17 @@ describe Sequel::Model, "pg_array_associations" do
     t = @c2.load(:id=>2)
     def a.validate() errors.add(:id, 'foo') end
     a.associations[:tags] = []
-    a.add_tag(t).must_equal nil
+    a.add_tag(t).must_be_nil
     a.tags.must_equal []
     a.associations[:tags] = [t]
-    a.remove_tag(t).must_equal nil
+    a.remove_tag(t).must_be_nil
     a.tags.must_equal [t]
 
     t.associations[:artists] = []
-    t.add_artist(a).must_equal nil
+    t.add_artist(a).must_be_nil
     t.artists.must_equal []
     t.associations[:artists] = [a]
-    t.remove_artist(a).must_equal nil
+    t.remove_artist(a).must_be_nil
     t.artists.must_equal [a]
   end
 end