sequel 4.41.0 → 4.42.0

data/spec/extensions/round_timestamps_spec.rb

@@ -17,7 +17,7 @@ describe "Sequel::Dataset::RoundTimestamps" do
   end
   
   it "should round times properly for databases supporting millisecond precision" do
-    def @dataset.timestamp_precision() 3 end
+    @dataset = @dataset.with_extend{def timestamp_precision; 3 end}
     @dataset.literal(Sequel::SQLTime.create(1, 2, 3, 499500)).must_equal "'01:02:03.500'"
     @dataset.literal(Time.local(2010, 1, 2, 3, 4, 5.4995)).must_equal "'2010-01-02 03:04:05.500'"
     @dataset.literal(DateTime.new(2010, 1, 2, 3, 4, Rational(54995, 10000))).must_equal "'2010-01-02 03:04:05.500'"
@@ -28,7 +28,7 @@ describe "Sequel::Dataset::RoundTimestamps" do
   end
   
   it "should round times properly for databases supporting second precision" do
-    def @dataset.supports_timestamp_usecs?() false end
+    @dataset = @dataset.with_extend{def supports_timestamp_usecs?; false end}
     @dataset.literal(Sequel::SQLTime.create(1, 2, 3, 500000)).must_equal "'01:02:04'"
     @dataset.literal(Time.local(2010, 1, 2, 3, 4, 5.5)).must_equal "'2010-01-02 03:04:06'"
     @dataset.literal(DateTime.new(2010, 1, 2, 3, 4, Rational(55, 10))).must_equal "'2010-01-02 03:04:06'"

data/spec/extensions/schema_dumper_spec.rb

@@ -633,8 +633,9 @@ END_MIG
       s.each{|_, c| c[:ruby_default] = column_schema_to_ruby_default(c[:default], c[:type])}
       s
     end
-    @d.dump_table_schema(:t4).gsub(/[+-]\d\d\d\d"\)/, '")').gsub(/\.0+/, '.0').must_equal "create_table(:t4) do\n  TrueClass :c1, :default=>false\n  String :c2, :default=>\"blah\"\n  Integer :c3, :default=>-1\n  Float :c4, :default=>1.0\n  BigDecimal :c5, :default=>BigDecimal.new(\"0.1005E3\")\n  File :c6, :default=>Sequel::SQL::Blob.new(\"blah\")\n  Date :c7, :default=>Date.new(2008, 10, 29)\n  DateTime :c8, :default=>DateTime.parse(\"2008-10-29T10:20:30.0\")\n  Time :c9, :default=>Sequel::SQLTime.parse(\"10:20:30.0\"), :only_time=>true\n  String :c10\n  Date :c11, :default=>Sequel::CURRENT_DATE\n  DateTime :c12, :default=>Sequel::CURRENT_TIMESTAMP\nend"
-    @d.dump_table_schema(:t4, :same_db=>true).gsub(/[+-]\d\d\d\d"\)/, '")').gsub(/\.0+/, '.0').must_equal "create_table(:t4) do\n  column :c1, \"boolean\", :default=>false\n  column :c2, \"varchar\", :default=>\"blah\"\n  column :c3, \"integer\", :default=>-1\n  column :c4, \"float\", :default=>1.0\n  column :c5, \"decimal\", :default=>BigDecimal.new(\"0.1005E3\")\n  column :c6, \"blob\", :default=>Sequel::SQL::Blob.new(\"blah\")\n  column :c7, \"date\", :default=>Date.new(2008, 10, 29)\n  column :c8, \"datetime\", :default=>DateTime.parse(\"2008-10-29T10:20:30.0\")\n  column :c9, \"time\", :default=>Sequel::SQLTime.parse(\"10:20:30.0\")\n  column :c10, \"foo\", :default=>Sequel::LiteralString.new(\"'6 weeks'\")\n  column :c11, \"date\", :default=>Sequel::CURRENT_DATE\n  column :c12, \"timestamp\", :default=>Sequel::CURRENT_TIMESTAMP\nend"
+    e = RUBY_VERSION >= '2.4' ? 'e' : 'E'
+    @d.dump_table_schema(:t4).gsub(/[+-]\d\d\d\d"\)/, '")').gsub(/\.0+/, '.0').must_equal "create_table(:t4) do\n  TrueClass :c1, :default=>false\n  String :c2, :default=>\"blah\"\n  Integer :c3, :default=>-1\n  Float :c4, :default=>1.0\n  BigDecimal :c5, :default=>BigDecimal.new(\"0.1005#{e}3\")\n  File :c6, :default=>Sequel::SQL::Blob.new(\"blah\")\n  Date :c7, :default=>Date.new(2008, 10, 29)\n  DateTime :c8, :default=>DateTime.parse(\"2008-10-29T10:20:30.0\")\n  Time :c9, :default=>Sequel::SQLTime.parse(\"10:20:30.0\"), :only_time=>true\n  String :c10\n  Date :c11, :default=>Sequel::CURRENT_DATE\n  DateTime :c12, :default=>Sequel::CURRENT_TIMESTAMP\nend"
+    @d.dump_table_schema(:t4, :same_db=>true).gsub(/[+-]\d\d\d\d"\)/, '")').gsub(/\.0+/, '.0').must_equal "create_table(:t4) do\n  column :c1, \"boolean\", :default=>false\n  column :c2, \"varchar\", :default=>\"blah\"\n  column :c3, \"integer\", :default=>-1\n  column :c4, \"float\", :default=>1.0\n  column :c5, \"decimal\", :default=>BigDecimal.new(\"0.1005#{e}3\")\n  column :c6, \"blob\", :default=>Sequel::SQL::Blob.new(\"blah\")\n  column :c7, \"date\", :default=>Date.new(2008, 10, 29)\n  column :c8, \"datetime\", :default=>DateTime.parse(\"2008-10-29T10:20:30.0\")\n  column :c9, \"time\", :default=>Sequel::SQLTime.parse(\"10:20:30.0\")\n  column :c10, \"foo\", :default=>Sequel::LiteralString.new(\"'6 weeks'\")\n  column :c11, \"date\", :default=>Sequel::CURRENT_DATE\n  column :c12, \"timestamp\", :default=>Sequel::CURRENT_TIMESTAMP\nend"
   end
   
   it "should not use a literal string as a fallback if using MySQL with the :same_db option" do

data/spec/extensions/schema_spec.rb

@@ -67,9 +67,9 @@ describe Sequel::Model, "create_table and schema" do
   it "should return nil if no schema is present" do
     @model = Class.new(Sequel::Model)
     @model.plugin :schema
-    @model.schema.must_equal nil
+    @model.schema.must_be_nil
     @submodel = Class.new(@model)
-    @submodel.schema.must_equal nil
+    @submodel.schema.must_be_nil
   end
 end
 

data/spec/extensions/scissors_spec.rb

@@ -19,8 +19,7 @@ describe "scissors plugin" do
   end
 
   it "Model.destory each instance in the dataset" do
-    @m.dataset._fetch = {:id=>1}
-    @m.destroy
+    @m.dataset.with_fetch(:id=>1).destroy
     @m.db.sqls.must_equal ['BEGIN', 'SELECT * FROM items', 'DELETE FROM items WHERE id = 1', 'COMMIT']
   end
 end

data/spec/extensions/sequel_3_dataset_methods_spec.rb

@@ -56,25 +56,38 @@ describe "Dataset#insert_multiple" do
   end
 end
 
-describe "Dataset#db=" do
-  it "should change the dataset's database" do
-    db = Sequel.mock
-    ds = db[:items].extension(:sequel_3_dataset_methods)
-    db2 = Sequel.mock
-    ds.db = db2
-    ds.db.must_equal db2
-    ds.db.wont_equal db
+# SEQUEL5: Remove
+unless Sequel.mock.dataset.frozen?
+  describe "Dataset#db=" do
+    it "should change the dataset's database" do
+      db = Sequel.mock
+      ds = db[:items].extension(:sequel_3_dataset_methods)
+      db2 = Sequel.mock
+      ds.db = db2
+      ds.db.must_equal db2
+      ds.db.wont_equal db
+    end
+
+    it "should raise error for frozen datasets" do
+      ds = Sequel.mock.dataset.extension(:sequel_3_dataset_methods).freeze
+      proc{ds.db = ds.db}.must_raise RuntimeError
+    end
   end
-end
 
-describe "Dataset#opts=" do
-  it "should change the dataset's opts" do
-    db = Sequel.mock
-    ds = db[:items].extension(:sequel_3_dataset_methods)
-    ds.sql.must_equal 'SELECT * FROM items'
-    ds.opts = {}
-    ds.sql.must_equal 'SELECT *'
-    ds.opts.must_equal({})
+  describe "Dataset#opts=" do
+    it "should change the dataset's opts" do
+      db = Sequel.mock
+      ds = db[:items].extension(:sequel_3_dataset_methods)
+      ds.sql.must_equal 'SELECT * FROM items'
+      ds.opts = {}
+      ds.sql.must_equal 'SELECT *'
+      ds.opts.must_equal({})
+    end
+
+    it "should raise error for frozen datasets" do
+      ds = Sequel.mock.dataset.extension(:sequel_3_dataset_methods).freeze
+      proc{ds.opts = {}}.must_raise RuntimeError
+    end
   end
 end
 

data/spec/extensions/serialization_modification_detection_spec.rb

@@ -42,12 +42,12 @@ describe "serialization_modification_detection plugin" do
     @o2.changed_columns.must_equal [:h]
 
     @o3.changed_columns.must_equal []
-    @o3.h.must_equal nil
+    @o3.h.must_be_nil
     @o3.h = {}
     @o3.changed_columns.must_equal [:h]
 
     @o4.changed_columns.must_equal []
-    @o4.h.must_equal nil
+    @o4.h.must_be_nil
     @o4.h = {}
     @o4.changed_columns.must_equal [:h]
   end

data/spec/extensions/serialization_spec.rb

@@ -94,7 +94,7 @@ describe "Serialization plugin" do
   it "should translate values to and from yaml serialization format using accessor methods" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
-    @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => "--- 1\n", :def => "--- hello\n")
 
     o = @c.first
     o.id.must_equal 1
@@ -114,7 +114,7 @@ describe "Serialization plugin" do
   it "should translate values to and from marshal serialization format using accessor methods" do
     @c.set_primary_key :id
     @c.plugin :serialization, :marshal, :abc, :def
-    @c.dataset._fetch = [:id => 1, :abc =>[Marshal.dump(1)].pack('m'), :def =>[Marshal.dump('hello')].pack('m')]
+    @c.dataset = @c.dataset.with_fetch([:id => 1, :abc =>[Marshal.dump(1)].pack('m'), :def =>[Marshal.dump('hello')].pack('m')])
 
     o = @c.first
     o.id.must_equal 1
@@ -134,7 +134,7 @@ describe "Serialization plugin" do
   it "should handle old non-base-64 encoded marshal serialization format" do
     @c.set_primary_key :id
     @c.plugin :serialization, :marshal, :abc, :def
-    @c.dataset._fetch = [:id => 1, :abc =>Marshal.dump(1), :def =>Marshal.dump('hello')]
+    @c.dataset = @c.dataset.with_fetch([:id => 1, :abc =>Marshal.dump(1), :def =>Marshal.dump('hello')])
 
     o = @c.first
     o.abc.must_equal 1
@@ -144,7 +144,7 @@ describe "Serialization plugin" do
   it "should raise exception for bad marshal data" do
     @c.set_primary_key :id
     @c.plugin :serialization, :marshal, :abc, :def
-    @c.dataset._fetch = [:id => 1, :abc =>'foo', :def =>'bar']
+    @c.dataset = @c.dataset.with_fetch([:id => 1, :abc =>'foo', :def =>'bar'])
 
     o = @c.first
     proc{o.abc}.must_raise TypeError, ArgumentError
@@ -154,7 +154,7 @@ describe "Serialization plugin" do
   it "should translate values to and from json serialization format using accessor methods" do
     @c.set_primary_key :id
     @c.plugin :serialization, :json, :abc, :def
-    @c.dataset._fetch = {:id => 1, :abc => [1].to_json, :def => ["hello"].to_json}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => [1].to_json, :def => ["hello"].to_json)
     
     o = @c.first
     o.id.must_equal 1
@@ -175,7 +175,7 @@ describe "Serialization plugin" do
   it "should translate values to and from arbitrary callables using accessor methods" do
     @c.set_primary_key :id
     @c.plugin :serialization, [proc{|s| s.reverse}, proc{|s| s.reverse}], :abc, :def
-    @c.dataset._fetch = {:id => 1, :abc => 'cba', :def => 'olleh'}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => 'cba', :def => 'olleh')
     
     o = @c.first
     o.id.must_equal 1
@@ -198,7 +198,7 @@ describe "Serialization plugin" do
     require 'sequel/plugins/serialization'
     Sequel::Plugins::Serialization.register_format(:reverse, proc{|s| s.reverse}, proc{|s| s.reverse})
     @c.plugin :serialization, :reverse, :abc, :def
-    @c.dataset._fetch = {:id => 1, :abc => 'cba', :def => 'olleh'}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => 'cba', :def => 'olleh')
     
     o = @c.first
     o.id.must_equal 1
@@ -219,7 +219,7 @@ describe "Serialization plugin" do
   it "should copy serialization formats and columns to subclasses" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
-    @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => "--- 1\n", :def => "--- hello\n")
 
     o = Class.new(@c).first
     o.id.must_equal 1
@@ -259,8 +259,10 @@ describe "Serialization plugin" do
   it "should not clear the deserialized columns when refreshing after saving a new object with insert_select" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
-    def (@c.instance_dataset).supports_insert_select?() true end
-    def (@c.instance_dataset).insert_select(*) {:id=>1} end
+    @c.dataset = @c.dataset.with_extend do
+      def supports_insert_select?; true end
+      def insert_select(*) {:id=>1} end
+    end
     o = @c.new(:abc => "--- 1\n", :def => "--- hello\n")
     o.deserialized_values.length.must_equal 2
     o.save
@@ -301,7 +303,7 @@ describe "Serialization plugin" do
   it "should work correctly with frozen instances" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
-    @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => "--- 1\n", :def => "--- hello\n")
 
     o = @c.first
     o.freeze
@@ -322,7 +324,7 @@ describe "Serialization plugin" do
 
   it "should have changed_columns include serialized columns if those columns have changed" do
     @c.plugin :serialization, :yaml, :abc, :def
-    @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => "--- 1\n", :def => "--- hello\n")
     o = @c.first
     o.changed_columns.must_equal []
     o.abc = 1
@@ -342,7 +344,7 @@ describe "Serialization plugin" do
   it "should update column_changes if the dirty plugin is used" do
     @c.plugin :serialization, :yaml, :abc, :def
     @c.plugin :dirty
-    @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
+    @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => "--- 1\n", :def => "--- hello\n")
     o = @c.first
     o.column_changes.must_equal({})
     o.abc = 1

data/spec/extensions/set_overrides_spec.rb

@@ -25,10 +25,13 @@ describe "Sequel::Dataset #set_defaults" do
     @ds.update_sql('y = 2').must_equal "UPDATE items SET y = 2"
   end
 
-  it "should have working mutation method" do
-    @ds = Sequel.mock.dataset.from(:items).extension(:set_overrides)
-    @ds.set_defaults!(:x=>1)
-    @ds.insert_sql.must_equal "INSERT INTO items (x) VALUES (1)"
+  # SEQUEL5: Remove
+  unless Sequel.mock.dataset.frozen?
+    it "should have working mutation method" do
+      @ds = Sequel.mock.dataset.from(:items).extension(:set_overrides)
+      @ds.set_defaults!(:x=>1)
+      @ds.insert_sql.must_equal "INSERT INTO items (x) VALUES (1)"
+    end
   end
 end
 
@@ -53,10 +56,13 @@ describe "Sequel::Dataset #set_overrides" do
     @ds.set_overrides(:x=>2).update_sql.must_equal "UPDATE items SET x = 1"
   end
 
-  it "should have working mutation method" do
-    @ds = Sequel.mock.dataset.from(:items).extension(:set_overrides)
-    @ds.set_overrides!(:x=>1)
-    @ds.insert_sql.must_equal "INSERT INTO items (x) VALUES (1)"
+  # SEQUEL5: Remove
+  unless Sequel.mock.dataset.frozen?
+    it "should have working mutation method" do
+      @ds = Sequel.mock.dataset.from(:items).extension(:set_overrides)
+      @ds.set_overrides!(:x=>1)
+      @ds.insert_sql.must_equal "INSERT INTO items (x) VALUES (1)"
+    end
   end
 
   it "should consider dataset with select overrides and default a simple select all" do

data/spec/extensions/sharding_spec.rb

@@ -3,21 +3,18 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 describe "sharding plugin" do
   before do
     @db = Sequel.mock(:numrows=>1, :autoid=>proc{1}, :servers=>{:s1=>{}, :s2=>{}, :s3=>{}, :s4=>{}})
-    @Artist = Class.new(Sequel::Model(@db[:artists]))
+    @Artist = Class.new(Sequel::Model(@db[:artists].with_fetch(:id=>2, :name=>'YJM')))
     @Artist.class_eval do
-      instance_dataset._fetch = dataset._fetch = {:id=>2, :name=>'YJM'}
       columns :id, :name
       plugin :sharding
     end
-    @Album = Class.new(Sequel::Model(@db[:albums]))
+    @Album = Class.new(Sequel::Model(@db[:albums].with_fetch(:id=>1, :name=>'RF', :artist_id=>2)))
     @Album.class_eval do
-      instance_dataset._fetch = dataset._fetch = {:id=>1, :name=>'RF', :artist_id=>2}
       columns :id, :artist_id, :name
       plugin :sharding
     end
-    @Tag = Class.new(Sequel::Model(@db[:tags]))
+    @Tag = Class.new(Sequel::Model(@db[:tags].with_fetch(:id=>3, :name=>'M')))
     @Tag.class_eval do
-      instance_dataset._fetch = dataset._fetch = {:id=>3, :name=>'M'}
       columns :id, :name
       plugin :sharding
     end
@@ -67,7 +64,7 @@ describe "sharding plugin" do
   end 
 
   it "should not use current dataset's shard when eager loading if eagerly loaded dataset has its own shard" do
-    @Artist.instance_dataset.opts[:server] = @Artist.dataset.opts[:server] = :s2
+    @Artist.dataset = @Artist.dataset.server(:s2)
     albums = @Album.server(:s1).eager(:artist).all
     @db.sqls.must_equal ["SELECT * FROM albums -- s1", "SELECT * FROM artists WHERE (artists.id IN (2)) -- s2"]
     albums.length.must_equal 1
@@ -76,9 +73,7 @@ describe "sharding plugin" do
   end 
 
   it "should use current dataset's shard when eager graphing if eagerly graphed dataset doesn't have its own shard" do
-    ds = @Album.server(:s1).eager_graph(:artist)
-    ds._fetch = {:id=>1, :artist_id=>2, :name=>'RF', :artist_id_0=>2, :artist_name=>'YJM'}
-    albums = ds.all
+    albums = @Album.server(:s1).eager_graph(:artist).with_fetch(:id=>1, :artist_id=>2, :name=>'RF', :artist_id_0=>2, :artist_name=>'YJM').all
     @db.sqls.must_equal ["SELECT albums.id, albums.artist_id, albums.name, artist.id AS artist_id_0, artist.name AS artist_name FROM albums LEFT OUTER JOIN artists AS artist ON (artist.id = albums.artist_id) -- s1"]
     albums.length.must_equal 1
     albums.first.artist.save
@@ -86,10 +81,8 @@ describe "sharding plugin" do
   end 
 
   it "should not use current dataset's shard when eager graphing if eagerly graphed dataset has its own shard" do
-    @Artist.instance_dataset.opts[:server] = @Artist.dataset.opts[:server] = :s2
-    ds = @Album.server(:s1).eager_graph(:artist)
-    ds._fetch = {:id=>1, :artist_id=>2, :name=>'RF', :artist_id_0=>2, :artist_name=>'YJM'}
-    albums = ds.all
+    @Artist.dataset = @Artist.dataset.server(:s2)
+    albums = @Album.server(:s1).eager_graph(:artist).with_fetch(:id=>1, :artist_id=>2, :name=>'RF', :artist_id_0=>2, :artist_name=>'YJM').all
     @db.sqls.must_equal ["SELECT albums.id, albums.artist_id, albums.name, artist.id AS artist_id_0, artist.name AS artist_name FROM albums LEFT OUTER JOIN artists AS artist ON (artist.id = albums.artist_id) -- s1"]
     albums.length.must_equal 1
     albums.first.artist.save
@@ -97,10 +90,8 @@ describe "sharding plugin" do
   end 
 
   it "should use eagerly graphed dataset shard for eagerly graphed objects even if current dataset does not have a shard" do
-    @Artist.instance_dataset.opts[:server] = @Artist.dataset.opts[:server] = :s2
-    ds = @Album.eager_graph(:artist)
-    ds._fetch = {:id=>1, :artist_id=>2, :name=>'RF', :artist_id_0=>2, :artist_name=>'YJM'}
-    albums = ds.all
+    @Artist.dataset = @Artist.dataset.server(:s2)
+    albums = @Album.eager_graph(:artist).with_fetch(:id=>1, :artist_id=>2, :name=>'RF', :artist_id_0=>2, :artist_name=>'YJM').all
     @db.sqls.must_equal ["SELECT albums.id, albums.artist_id, albums.name, artist.id AS artist_id_0, artist.name AS artist_name FROM albums LEFT OUTER JOIN artists AS artist ON (artist.id = albums.artist_id)"]
     albums.length.must_equal 1
     albums.first.artist.save

data/spec/extensions/shared_caching_spec.rb

@@ -28,7 +28,7 @@ describe "Shared caching behavior" do
       @c.load(:id=>3, :caching_model_id=>2, :caching_model_id2=>1).caching_model2.must_be_same_as(@cm21)
       @db.sqls.must_equal []
       @db.fetch = []
-      @c.load(:id=>4, :caching_model_id=>2, :caching_model_id2=>2).caching_model2.must_equal nil
+      @c.load(:id=>4, :caching_model_id=>2, :caching_model_id2=>2).caching_model2.must_be_nil
     end
   end
 
@@ -40,7 +40,7 @@ describe "Shared caching behavior" do
       @c.load(:id=>4, :caching_model_id=>2).caching_model.must_be_same_as(@cm2)
       @db.sqls.must_equal []
       @db.fetch = []
-      @c.load(:id=>4, :caching_model_id=>3).caching_model.must_equal nil
+      @c.load(:id=>4, :caching_model_id=>3).caching_model.must_be_nil
     end
 
     it "should not use a simple primary key lookup if the assocation has a nil :key option" do
@@ -93,8 +93,7 @@ describe "Shared caching behavior" do
     end
 
     it "should not use a simple primary key lookup if the prepared_statements_associations method is being used" do
-      c2 = Class.new(Sequel::Model(@db[:not_caching_model]))
-      c2.dataset._fetch = {:id=>1}
+      c2 = Class.new(Sequel::Model(@db[:not_caching_model].with_fetch(:id=>1)))
       c = Class.new(Sequel::Model(@db[:lookup_model]))
       c.class_eval do
         plugin :prepared_statements_associations

data/spec/extensions/single_table_inheritance_spec.rb

@@ -21,7 +21,7 @@ describe Sequel::Model, "single table inheritance plugin" do
 
   it "should have simple_table = nil" do
     StiTest.simple_table.must_equal "sti_tests"
-    StiTestSub1.simple_table.must_equal nil
+    StiTestSub1.simple_table.must_be_nil
   end
   
   it "should allow changing the inheritance column via a plugin :single_table_inheritance call" do
@@ -30,7 +30,7 @@ describe Sequel::Model, "single table inheritance plugin" do
     Object.send(:remove_const, :StiTestSub2)
     class ::StiTestSub1 < StiTest; end 
     class ::StiTestSub2 < StiTest; end 
-    StiTest.dataset._fetch = [{:blah=>'StiTest'}, {:blah=>'StiTestSub1'}, {:blah=>'StiTestSub2'}]
+    StiTest.dataset = StiTest.dataset.with_fetch([{:blah=>'StiTest'}, {:blah=>'StiTestSub1'}, {:blah=>'StiTestSub2'}])
     StiTest.all.collect{|x| x.class}.must_equal [StiTest, StiTestSub1, StiTestSub2]
     StiTest.dataset.sql.must_equal "SELECT * FROM sti_tests"
     StiTestSub1.dataset.sql.must_equal "SELECT * FROM sti_tests WHERE (sti_tests.blah IN ('StiTestSub1'))"
@@ -38,23 +38,23 @@ describe Sequel::Model, "single table inheritance plugin" do
   end 
   
   it "should return rows with the correct class based on the polymorphic_key value" do
-    @ds._fetch = [{:kind=>'StiTest'}, {:kind=>'StiTestSub1'}, {:kind=>'StiTestSub2'}]
+    StiTest.dataset = StiTest.dataset.with_fetch([{:kind=>'StiTest'}, {:kind=>'StiTestSub1'}, {:kind=>'StiTestSub2'}])
     StiTest.all.collect{|x| x.class}.must_equal [StiTest, StiTestSub1, StiTestSub2]
   end 
 
   it "should return rows with the correct class based on the polymorphic_key value when retreiving by primary key" do
-    @ds._fetch = [{:kind=>'StiTestSub1'}]
+    StiTest.dataset = StiTest.dataset.with_fetch([{:kind=>'StiTestSub1'}])
     StiTest[1].class.must_equal StiTestSub1
   end 
 
   it "should return rows with the correct class for subclasses based on the polymorphic_key value" do
     class ::StiTestSub1Sub < StiTestSub1; end 
-    StiTestSub1.dataset._fetch = [{:kind=>'StiTestSub1'}, {:kind=>'StiTestSub1Sub'}]
+    StiTestSub1.dataset = StiTestSub1.dataset.with_fetch([{:kind=>'StiTestSub1'}, {:kind=>'StiTestSub1Sub'}])
     StiTestSub1.all.collect{|x| x.class}.must_equal [StiTestSub1, StiTestSub1Sub]
   end 
 
   it "should fallback to the main class if the given class does not exist" do
-    @ds._fetch = {:kind=>'StiTestSub3'}
+    StiTest.dataset = StiTest.dataset.with_fetch(:kind=>'StiTestSub3')
     StiTest.all.collect{|x| x.class}.must_equal [StiTest]
   end
 
@@ -65,7 +65,7 @@ describe Sequel::Model, "single table inheritance plugin" do
       Object
     end
     StiTest.plugin :single_table_inheritance, :kind
-    StiTest.dataset._fetch = [{:kind=>''}, {:kind=>nil}]
+    StiTest.dataset = StiTest.dataset.with_fetch([{:kind=>''}, {:kind=>nil}])
     StiTest.all.collect{|x| x.class}.must_equal [StiTest, StiTest]
     called.must_equal false
   end
@@ -147,8 +147,8 @@ describe Sequel::Model, "single table inheritance plugin" do
     c2[obj2.id]
     c2.cache_get_pk(obj2.id).values.must_equal StiTest.cache_get_pk(obj2.id).values
     obj2.save
-    c2.cache_get_pk(obj2.id).must_equal nil
-    StiTest.cache_get_pk(obj2.id).must_equal nil
+    c2.cache_get_pk(obj2.id).must_be_nil
+    StiTest.cache_get_pk(obj2.id).must_be_nil
   end
 
   describe "with custom options" do
@@ -170,7 +170,7 @@ describe Sequel::Model, "single table inheritance plugin" do
         set_dataset(dataset.select(*(columns - [:blah])))
       end
       class ::StiTest4 < ::StiTest3; end
-      StiTest3.dataset._fetch = {:id=>1, :kind=>'StiTest4'}
+      StiTest3.dataset = StiTest3.dataset.with_fetch(:id=>1, :kind=>'StiTest4')
       StiTest3[1].must_equal StiTest4.load(:id=>1, :kind=>'StiTest4')
     end
 
@@ -214,7 +214,7 @@ describe Sequel::Model, "single table inheritance plugin" do
       StiTest4.create.kind.must_equal 6
 
       class ::StiTest5 < ::StiTest4; end
-      StiTest5.create.kind.must_equal nil
+      StiTest5.create.kind.must_be_nil
     end
 
     it "should infer key_map from model_map if provided as a hash" do