sequel 4.46.0 → 4.49.0

data/spec/extensions/server_block_spec.rb

@@ -8,6 +8,13 @@ with_server_specs = shared_description do
     @db.sqls.must_equal ["SELECT * FROM t -- b"]
   end
 
+  it "should set the default server to use in the block" do
+    @db.with_server(:a, :b){@db[:t].all}
+    @db.sqls.must_equal ["SELECT * FROM t -- b"]
+    @db.with_server(:a, :b){@db[:t].insert}
+    @db.sqls.must_equal ["INSERT INTO t DEFAULT VALUES -- a"]
+  end
+
   it "should have no affect after the block" do
     @db.with_server(:a){@db[:t].all}
     @db.sqls.must_equal ["SELECT * FROM t -- a"]

data/spec/extensions/single_table_inheritance_spec.rb

@@ -19,6 +19,22 @@ describe Sequel::Model, "single table inheritance plugin" do
     Object.send(:remove_const, :StiTest)
   end
 
+  describe ".sti_load" do
+    it "should load instances of the correct type" do
+      StiTest.sti_load(:id => 3).must_be_instance_of StiTest
+      StiTest.sti_load(:id => 3, :kind => 'StiTestSub1').must_be_instance_of StiTestSub1
+      StiTest.sti_load(:id => 3, :kind => 'StiTestSub2').must_be_instance_of StiTestSub2
+    end
+  end
+
+  describe ".sti_class_from_sti_key" do
+    it "should load the correct subclass based on the key" do
+      StiTest.sti_class_from_sti_key('StiTest').must_equal StiTest
+      StiTest.sti_class_from_sti_key('StiTestSub1').must_equal StiTestSub1
+      StiTest.sti_class_from_sti_key('StiTestSub2').must_equal StiTestSub2
+    end
+  end
+
   it "should freeze sti metadata when freezing model class" do
     StiTest.freeze
     StiTest.sti_dataset.frozen?.must_equal true
@@ -90,7 +106,7 @@ describe Sequel::Model, "single table inheritance plugin" do
 
   it "should fallback to the main class if the sti_key field is empty or nil without calling constantize" do
     called = false
-    StiTest.meta_def(:constantize) do |s|
+    def StiTest.constantize(s)
       called = true
       Object
     end

data/spec/extensions/spec_helper.rb

@@ -28,13 +28,19 @@ rescue LoadError
   nil
 end
 
-Sequel.extension :meta_def
 Sequel.extension :core_refinements if RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby'
 
 def skip_warn(s)
   warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
 end
 
+class Minitest::HooksSpec
+  # SEQUEL5: Replace with define_singleton_method
+  def meta_def(obj, name, &block)
+    (class << obj; self end).send(:define_method, name, &block)
+  end
+end
+
 # SEQUEL5: Remove
 output = Sequel::Deprecation.output
 Sequel::Deprecation.output = nil

data/spec/extensions/static_cache_spec.rb

@@ -113,35 +113,58 @@ describe "Sequel::Plugins::StaticCache" do
       @c.all.must_equal [@c1, @c2]
     end
 
-    it "should have to_hash without arguments run without a query" do
+    it "should have as_hash/to_hash without arguments run without a query" do
       a = @c.to_hash
       a.must_equal(1=>@c1, 2=>@c2)
       a[1].must_equal @c1
       a[2].must_equal @c2
+
+      a = @c.as_hash
+      a.must_equal(1=>@c1, 2=>@c2)
+      a[1].must_equal @c1
+      a[2].must_equal @c2
+      @db.sqls.must_equal []
+    end
+
+    it "should have as_hash handle :hash option" do
+      h = {}
+      a = @c.as_hash(nil, nil, :hash=>h)
+      a.must_be_same_as h
+      a.must_equal(1=>@c1, 2=>@c2)
+      a[1].must_equal @c1
+      a[2].must_equal @c2
+
+      h = {}
+      a = @c.as_hash(:id, nil, :hash=>h)
+      a.must_be_same_as h
+      a.must_equal(1=>@c1, 2=>@c2)
+      a[1].must_equal @c1
+      a[2].must_equal @c2
+
       @db.sqls.must_equal []
     end
 
-    it "should have to_hash with arguments return results without a query" do
-      a = @c.to_hash(:id)
+    it "should have as_hash with arguments return results without a query" do
+      a = @c.as_hash(:id)
       a.must_equal(1=>@c1, 2=>@c2)
       a[1].must_equal @c1
       a[2].must_equal @c2
 
-      a = @c.to_hash([:id])
+      a = @c.as_hash([:id])
       a.must_equal([1]=>@c1, [2]=>@c2)
       a[[1]].must_equal @c1
       a[[2]].must_equal @c2
 
-      @c.to_hash(:id, :id).must_equal(1=>1, 2=>2)
-      @c.to_hash([:id], :id).must_equal([1]=>1, [2]=>2)
-      @c.to_hash(:id, [:id]).must_equal(1=>[1], 2=>[2])
-      @c.to_hash([:id], [:id]).must_equal([1]=>[1], [2]=>[2])
+      @c.as_hash(:id, :id).must_equal(1=>1, 2=>2)
+      @c.as_hash([:id], :id).must_equal([1]=>1, [2]=>2)
+      @c.as_hash(:id, [:id]).must_equal(1=>[1], 2=>[2])
+      @c.as_hash([:id], [:id]).must_equal([1]=>[1], [2]=>[2])
 
       @db.sqls.must_equal []
     end
 
-    it "should have to_hash not return a frozen object" do
-      @c.to_hash.frozen?.must_equal false
+    it "should have as_hash not return a frozen object" do
+      @c.as_hash.frozen?.must_equal false
     end
 
     it "should have to_hash_groups without arguments return the cached objects without a query" do
@@ -163,10 +186,38 @@ describe "Sequel::Plugins::StaticCache" do
       @db.sqls.must_equal []
     end
 
+    it "should have to_hash_groups handle :hash option" do
+      h = {}
+      a = @c.to_hash_groups(:id, nil, :hash=>h)
+      a.must_be_same_as h
+      a.must_equal(1=>[@c1], 2=>[@c2])
+      a[1].first.must_equal @c1
+      a[2].first.must_equal @c2
+    end
+
+    it "should have as_hash_groups without arguments return the cached objects without a query" do
+      a = @c.to_hash_groups(:id)
+      a.must_equal(1=>[@c1], 2=>[@c2])
+      a[1].first.must_equal @c1
+      a[2].first.must_equal @c2
+
+      a = @c.to_hash_groups([:id])
+      a.must_equal([1]=>[@c1], [2]=>[@c2])
+      a[[1]].first.must_equal @c1
+      a[[2]].first.must_equal @c2
+
+      @c.to_hash_groups(:id, :id).must_equal(1=>[1], 2=>[2])
+      @c.to_hash_groups([:id], :id).must_equal([1]=>[1], [2]=>[2])
+      @c.to_hash_groups(:id, [:id]).must_equal(1=>[[1]], 2=>[[2]])
+      @c.to_hash_groups([:id], [:id]).must_equal([1]=>[[1]], [2]=>[[2]])
+
+      @db.sqls.must_equal []
+    end
+
     it "subclasses should work correctly" do
       c = Class.new(@c)
       c.all.must_equal [c.load(:id=>1), c.load(:id=>2)]
-      c.to_hash.must_equal(1=>c.load(:id=>1), 2=>c.load(:id=>2))
+      c.as_hash.must_equal(1=>c.load(:id=>1), 2=>c.load(:id=>2))
       @db.sqls.must_equal ['SELECT * FROM t']
     end
 
@@ -174,8 +225,8 @@ describe "Sequel::Plugins::StaticCache" do
       ds = @c.dataset.from(:t2).columns(:id).with_fetch(:id=>3)
       @c.dataset = ds
       @c.all.must_equal [@c.load(:id=>3)]
-      @c.to_hash.must_equal(3=>@c.load(:id=>3))
-      @c.to_hash[3].must_equal @c.all.first
+      @c.as_hash.must_equal(3=>@c.load(:id=>3))
+      @c.as_hash[3].must_equal @c.all.first
       @db.sqls.must_equal ['SELECT * FROM t2']
     end
   end
@@ -238,18 +289,18 @@ describe "Sequel::Plugins::StaticCache" do
       a.last.must_be_same_as(@c2)
     end
 
-    it "should have to_hash without arguments use cached instances" do
-      a = @c.to_hash
+    it "should have as_hash without arguments use cached instances" do
+      a = @c.as_hash
       a[1].must_be_same_as(@c1)
       a[2].must_be_same_as(@c2)
     end
 
-    it "should have to_hash with arguments return cached instances" do
-      a = @c.to_hash(:id)
+    it "should have as_hash with arguments return cached instances" do
+      a = @c.as_hash(:id)
       a[1].must_be_same_as(@c1)
       a[2].must_be_same_as(@c2)
 
-      a = @c.to_hash([:id])
+      a = @c.as_hash([:id])
       a[[1]].must_be_same_as(@c1)
       a[[2]].must_be_same_as(@c2)
     end
@@ -313,16 +364,16 @@ describe "Sequel::Plugins::StaticCache" do
       @c.map.all?{|o| !o.frozen?}.must_equal true
     end
 
-    it "none of values in the hash returned by to_hash without an argument should be frozen" do
-      @c.to_hash.values.all?{|o| !o.frozen?}.must_equal true
+    it "none of values in the hash returned by as_hash without an argument should be frozen" do
+      @c.as_hash.values.all?{|o| !o.frozen?}.must_equal true
     end
 
-    it "none of values in the hash returned by to_hash with a single argument should be frozen" do
-      @c.to_hash(:id).values.all?{|o| !o.frozen?}.must_equal true
+    it "none of values in the hash returned by as_hash with a single argument should be frozen" do
+      @c.as_hash(:id).values.all?{|o| !o.frozen?}.must_equal true
     end
 
-    it "none of values in the hash returned by to_hash with a single array argument should be frozen" do
-      @c.to_hash([:id, :id]).values.all?{|o| !o.frozen?}.must_equal true
+    it "none of values in the hash returned by as_hash with a single array argument should be frozen" do
+      @c.as_hash([:id, :id]).values.all?{|o| !o.frozen?}.must_equal true
     end
 
     it "none of values in the hash returned by to_hash_groups with a single argument should be frozen" do

data/spec/extensions/string_agg_spec.rb

@@ -48,7 +48,7 @@ describe "string_agg extension" do
   it "should correctly literalize on MySQL, H2, HSQLDB" do
     [:mysql, :h2, :hsqldb].each do |type|
       db = dbf.call(type)
-      db.meta_def(:database_type){type}
+      meta_def(db, :database_type){type}
       ds = db.dataset.with_quote_identifiers(false).with_extend{def input_identifier(v) v.to_s end}
       ds.literal(@sa1).upcase.must_equal "GROUP_CONCAT(C SEPARATOR ',')"
       ds.literal(@sa2).upcase.must_equal "GROUP_CONCAT(C SEPARATOR '-')"

data/spec/extensions/touch_spec.rb

@@ -67,6 +67,15 @@ describe "Touch plugin" do
       "UPDATE albums SET updated_at = CURRENT_TIMESTAMP WHERE (albums.artist_id = 1)"]
   end
 
+  it "should clear associations after touching them  :associations option" do
+    @Artist.plugin :touch, :associations=>:albums
+    @a.associations[:albums] = [@Album.call(:id=>1)]
+    @a.touch
+    @a.associations[:albums].must_be_nil
+    DB.sqls.must_equal ["UPDATE artists SET updated_at = CURRENT_TIMESTAMP WHERE (id = 1)",
+      "UPDATE albums SET updated_at = CURRENT_TIMESTAMP WHERE (albums.artist_id = 1)"]
+  end
+
   it "should be able to give an array to the :associations option specifying multiple associations" do
     @Album.plugin :touch, :associations=>[:artist, :followup_albums]
     @Album.load(:id=>4, :artist_id=>1).touch

data/spec/extensions/validation_helpers_spec.rb

@@ -18,6 +18,12 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.wont_be :valid?
     @m.value = '1_1'
     @m.must_be :valid?
+    o = String.new
+    class << o
+      undef_method :blank?
+    end
+    @m.value = o
+    @m.must_be :valid?
     o = Object.new
     @m.value = o
     @m.wont_be :valid?
@@ -80,7 +86,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.must_be :valid?
   end
   
-  it "should support modifying default options for all models" do
+  deprecated "should support modifying default options for all models" do
     @c.set_validations{validates_presence(:value)}
     @m.wont_be :valid?
     @m.errors.must_equal(:value=>['is not present'])
@@ -98,7 +104,6 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.wont_be :valid?
     @m.errors.must_equal(:value=>["was not entered"])
 
-    
     c = Class.new(Sequel::Model)
     c.class_eval do
       plugin :validation_helpers
@@ -248,17 +253,17 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.must_be :valid?
     @m.value = '123'
     @m.must_be :valid?
-    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    def @m.db_schema; {:value=>{:type=>:integer}} end
     @m.wont_be :valid?
     @m.errors.full_messages.must_equal ['value is not a valid integer']
 
     @c.set_validations{validates_schema_types(:value)}
-    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    def @m.db_schema; {:value=>{:type=>:integer}} end
     @m.wont_be :valid?
     @m.errors.full_messages.must_equal ['value is not a valid integer']
 
     @c.set_validations{validates_schema_types(:value, :message=>'is bad')}
-    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    def @m.db_schema; {:value=>{:type=>:integer}} end
     @m.wont_be :valid?
     @m.errors.full_messages.must_equal ['value is bad']
   end

data/spec/extensions/whitelist_security_spec.rb

@@ -64,6 +64,19 @@ describe Sequel::Model, "#(set|update)_(all|only)" do
   end
 end
 
+describe Sequel::Model, "#(set|update)_(all|only) without set_allowed_columns" do
+  before do
+    @c = Class.new(Sequel::Model(:items)) do
+      set_primary_key :id
+      columns :x, :y, :z, :id
+    end
+    @c.plugin :whitelist_security
+    @c.strict_param_setting = false
+    @o1 = @c.new
+    DB.reset
+  end
+end
+
 describe Sequel::Model, ".strict_param_setting" do
   before do
     @c = Class.new(Sequel::Model(:blahblah)) do
@@ -105,6 +118,19 @@ describe Sequel::Model, ".allowed_columns " do
     @c.allowed_columns.must_equal [:x, :y]
   end
 
+  it "should not change behavior if allowed_columns are not set" do
+    i = @c.new(:x => 1, :y => 2, :z => 3)
+    i.values.must_equal(:x => 1, :y => 2, :z => 3)
+    i.set(:x => 4, :y => 5, :z => 6)
+    i.values.must_equal(:x => 4, :y => 5, :z => 6)
+
+    @c.dataset = @c.dataset.with_fetch(:x => 7)
+    i = @c.new
+    i.update(:x => 7)
+    i.values.must_equal(:x => 7)
+    DB.sqls.must_equal ["INSERT INTO blahblah (x) VALUES (7)", "SELECT * FROM blahblah WHERE id = 10"]
+  end
+
   it "should only set allowed columns by default" do
     @c.set_allowed_columns :x, :y
     i = @c.new(:x => 1, :y => 2, :z => 3)

data/spec/integration/associations_test.rb

@@ -1621,6 +1621,7 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
       Album.first_tags.all.must_equal []
       Artist.tags.all.must_equal []
       Artist.first_tags.all.must_equal []
+      Tag.tags.all.must_equal []
     end
     Artist.albums.tags.all.must_equal []
 
@@ -1637,6 +1638,7 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
       Album.first_tags.all.must_equal [@tag]
       Artist.tags.all.must_equal [@tag]
       Artist.first_tags.all.must_equal [@tag]
+      Tag.tags.all.must_equal [@tag]
     end
     Artist.albums.tags.all.must_equal [@tag]
 
@@ -1652,6 +1654,7 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
       Album.first_tags.order(:name).all.must_equal [@tag, tag]
       Artist.tags.order(:name).all.must_equal [@tag, tag]
       Artist.first_tags.order(:name).all.must_equal [@tag, tag]
+      Tag.tags.order(:name).all.must_equal [@tag, tag]
     end
     Artist.albums.tags.order(:name).all.must_equal [@tag, tag]
 
@@ -1664,6 +1667,7 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
       Album.filter(Album.qualified_primary_key_hash(album.pk)).first_tags.all.must_equal [tag]
       Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).tags.all.must_equal [tag]
       Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).first_tags.all.must_equal [tag]
+      Tag.filter(Tag.qualified_primary_key_hash(tag.pk)).tags.all.must_equal [tag]
     end
     Artist.filter(Artist.qualified_primary_key_hash(artist.pk)).albums.tags.all.must_equal [tag]
 
@@ -1891,6 +1895,8 @@ describe "Sequel::Model Simple Associations" do
     class ::Tag < Sequel::Model(@db)
       plugin :dataset_associations
       many_to_many :albums
+      plugin :many_through_many
+      many_through_many :tags, [[:albums_tags, :tag_id, :album_id], [:albums, :id, :artist_id], [:albums, :artist_id, :id], [:albums_tags, :album_id, :tag_id]], :class=>:Tag
     end
     @album = Album.create(:name=>'Al')
     @artist = Artist.create(:name=>'Ar')
@@ -2184,6 +2190,8 @@ describe "Sequel::Model Composite Key Associations" do
       set_primary_key [:id1, :id2]
       unrestrict_primary_key
       many_to_many :albums, :right_key=>[:album_id1, :album_id2], :left_key=>[:tag_id1, :tag_id2]
+      plugin :many_through_many
+      many_through_many :tags, [[:albums_tags, [:tag_id1, :tag_id2], [:album_id1, :album_id2]], [:albums, [:id1, :id2], [:artist_id1, :artist_id2]], [:albums, [:artist_id1, :artist_id2], [:id1, :id2]], [:albums_tags, [:album_id1, :album_id2], [:tag_id1, :tag_id2]]], :class=>:Tag
     end
     @album = Album.create(:name=>'Al', :id1=>1, :id2=>2)
     @artist = Artist.create(:name=>'Ar', :id1=>3, :id2=>4)

data/spec/integration/dataset_test.rb

@@ -15,8 +15,8 @@ describe "Simple Dataset operations" do
   end
 
   it "should support sequential primary keys" do
-    @ds << {:number=>20}
-    @ds << {:number=>30}
+    @ds.insert(:number=>20)
+    @ds.insert(:number=>30)
     @ds.order(:number).all.must_equal [
       {:id => 1, :number=>10},
       {:id => 2, :number=>20},
@@ -28,8 +28,8 @@ describe "Simple Dataset operations" do
       primary_key :id, :type=>:Bignum
       Integer :number
     end
-    @ds << {:number=>20}
-    @ds << {:number=>30}
+    @ds.insert(:number=>20)
+    @ds.insert(:number=>30)
     @ds.order(:number).all.must_equal [{:id => 1, :number=>20}, {:id => 2, :number=>30}]   
   end 
 
@@ -49,7 +49,7 @@ describe "Simple Dataset operations" do
     @ds.filter(:id=>2).first[:number].must_equal 20
   end
 
-  it "should have insert_multiple return primary key values" do
+  deprecated "should have insert_multiple return primary key values" do
     @ds.extension(:sequel_3_dataset_methods).insert_multiple([{:number=>20}, {:number=>30}]).must_equal [2, 3]
     @ds.filter(:id=>2).get(:number).must_equal 20
     @ds.filter(:id=>3).get(:number).must_equal 30
@@ -60,7 +60,7 @@ describe "Simple Dataset operations" do
   end
 
   it "should handle LATERAL subqueries correctly" do
-    @ds << {:number=>20}
+    @ds.insert(:number=>20)
     @ds.from(Sequel[:items].as(:i), @ds.where(Sequel[:items][:number]=>Sequel[:i][:number]).lateral).select_order_map([Sequel[:i][:number].as(:n), Sequel[:t1][:number]]).must_equal [[10, 10], [20, 20]]
     @ds.from(Sequel[:items].as(:i)).cross_join(@ds.where(Sequel[:items][:number]=>Sequel[:i][:number]).lateral).select_order_map([Sequel[:i][:number].as(:n), Sequel[:t1][:number]]).must_equal [[10, 10], [20, 20]]
     @ds.from(Sequel[:items].as(:i)).join(@ds.where(Sequel[:items][:number]=>Sequel[:i][:number]).lateral, 1=>1).select_order_map([Sequel[:i][:number].as(:n), Sequel[:t1][:number]]).must_equal [[10, 10], [20, 20]]
@@ -389,9 +389,9 @@ describe Sequel::Dataset do
 
   it "should return the correct record count" do
     @d.count.must_equal 0
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => nil}
+    @d.insert(:name => 'abc', :value => 123)
+    @d.insert(:name => 'abc', :value => 456)
+    @d.insert(:name => 'def', :value => nil)
     5.times do
       @d.count.must_equal 3
       @d.count(:name).must_equal 3
@@ -400,14 +400,14 @@ describe Sequel::Dataset do
   end
 
   it "should handle functions with identifier names correctly" do
-    @d << {:name => 'abc', :value => 6}
+    @d.insert(:name => 'abc', :value => 6)
     @d.get{sum.function(:value)}.must_equal 6
   end
 
   it "should handle aggregate methods on limited datasets correctly" do
-    @d << {:name => 'abc', :value => 6}
-    @d << {:name => 'bcd', :value => 12}
-    @d << {:name => 'def', :value => 18}
+    @d.insert(:name => 'abc', :value => 6)
+    @d.insert(:name => 'bcd', :value => 12)
+    @d.insert(:name => 'def', :value => 18)
     @d = @d.order(:name).limit(2)
     @d.count.must_equal 2
     @d.avg(:value).to_i.must_equal 9
@@ -415,14 +415,14 @@ describe Sequel::Dataset do
     @d.reverse.min(:value).to_i.must_equal 12
     @d.max(:value).to_i.must_equal 12
     @d.sum(:value).to_i.must_equal 18
-    @d.interval(:value).to_i.must_equal 6
+    @d.extension(:sequel_4_dataset_methods).interval(:value).to_i.must_equal 6
   end
 
   it "should return the correct records" do
     @d.to_a.must_equal []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
+    @d.insert(:name => 'abc', :value => 123)
+    @d.insert(:name => 'abc', :value => 456)
+    @d.insert(:name => 'def', :value => 789)
 
     @d.order(:value).to_a.must_equal [
       {:name => 'abc', :value => 123},
@@ -432,27 +432,27 @@ describe Sequel::Dataset do
   end
 
   it "should update records correctly" do
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
+    @d.insert(:name => 'abc', :value => 123)
+    @d.insert(:name => 'abc', :value => 456)
+    @d.insert(:name => 'def', :value => 789)
     @d.filter(:name => 'abc').update(:value => 530)
     @d[:name => 'def'][:value].must_equal 789
     @d.filter(:value => 530).count.must_equal 2
   end
 
   it "should delete records correctly" do
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
+    @d.insert(:name => 'abc', :value => 123)
+    @d.insert(:name => 'abc', :value => 456)
+    @d.insert(:name => 'def', :value => 789)
     @d.filter(:name => 'abc').delete
     @d.count.must_equal 1
     @d.first[:name].must_equal 'def'
   end
   
   it "should be able to truncate the table" do
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
+    @d.insert(:name => 'abc', :value => 123)
+    @d.insert(:name => 'abc', :value => 456)
+    @d.insert(:name => 'def', :value => 789)
     @d.count.must_equal 3
     @d.truncate.must_be_nil
     @d.count.must_equal 0
@@ -517,9 +517,9 @@ describe Sequel::Dataset do
       Integer :value
     end 
     @d = DB[:items]
-    @d << {:value => 123}
-    @d << {:value => 456}
-    @d << {:value => 789}
+    @d.insert(:value => 123)
+    @d.insert(:value => 456)
+    @d.insert(:value => 789)
   end 
   after do
     DB.drop_table?(:items)
@@ -1055,7 +1055,7 @@ describe "Sequel::Dataset convenience methods" do
     @db.drop_table?(:a)
   end
   
-  it "#[]= should update matching rows" do
+  deprecated "#[]= should update matching rows" do
     @ds.insert(20, 10)
     @ds.extension(:sequel_3_dataset_methods)[:a=>20] = {:b=>30}
     @ds.all.must_equal [{:a=>20, :b=>30}]
@@ -1104,7 +1104,7 @@ describe "Sequel::Dataset convenience methods" do
   end
   
   it "#range should return the range between the maximum and minimum values" do
-    @ds = @ds.unordered
+    @ds = @ds.unordered.extension(:sequel_4_dataset_methods)
     @ds.insert(20, 10)
     @ds.insert(30, 10)
     @ds.range(:a).must_equal(20..30)
@@ -1112,7 +1112,7 @@ describe "Sequel::Dataset convenience methods" do
   end
   
   it "#interval should return the different between the maximum and minimum values" do
-    @ds = @ds.unordered
+    @ds = @ds.unordered.extension(:sequel_4_dataset_methods)
     @ds.insert(20, 10)
     @ds.insert(30, 10)
     @ds.interval(:a).to_i.must_equal 10
@@ -1147,10 +1147,10 @@ describe "Sequel::Dataset main SQL methods" do
     @ds.filter(Sequel.lit("b < ?", 15)).invert.all.must_equal [{:a=>20, :b=>30}]
   end
   
-  it "#and and #or should work correctly" do
+  it "#where and #or should work correctly" do
     @ds.insert(20, 30)
-    @ds.filter(:a=>20).and(:b=>30).all.must_equal [{:a=>20, :b=>30}]
-    @ds.filter(:a=>20).and(:b=>15).all.must_equal []
+    @ds.filter(:a=>20).where(:b=>30).all.must_equal [{:a=>20, :b=>30}]
+    @ds.filter(:a=>20).where(:b=>15).all.must_equal []
     @ds.filter(:a=>20).or(:b=>15).all.must_equal [{:a=>20, :b=>30}]
     @ds.filter(:a=>10).or(:b=>15).all.must_equal []
   end
@@ -1212,17 +1212,18 @@ describe "Sequel::Dataset convenience methods" do
     @ds.map([:a, :b]).must_equal [[1, 2], [5, 6]]
   end
   
-  it "should have working #to_hash" do
+  it "should have working #as_hash" do
     @ds.to_hash(:a).must_equal(1=>{:a=>1, :b=>2, :c=>3, :d=>4}, 5=>{:a=>5, :b=>6, :c=>7, :d=>8})
-    @ds.to_hash(:b).must_equal(2=>{:a=>1, :b=>2, :c=>3, :d=>4}, 6=>{:a=>5, :b=>6, :c=>7, :d=>8})
-    @ds.to_hash([:a, :b]).must_equal([1, 2]=>{:a=>1, :b=>2, :c=>3, :d=>4}, [5, 6]=>{:a=>5, :b=>6, :c=>7, :d=>8})
+    @ds.as_hash(:a).must_equal(1=>{:a=>1, :b=>2, :c=>3, :d=>4}, 5=>{:a=>5, :b=>6, :c=>7, :d=>8})
+    @ds.as_hash(:b).must_equal(2=>{:a=>1, :b=>2, :c=>3, :d=>4}, 6=>{:a=>5, :b=>6, :c=>7, :d=>8})
+    @ds.as_hash([:a, :b]).must_equal([1, 2]=>{:a=>1, :b=>2, :c=>3, :d=>4}, [5, 6]=>{:a=>5, :b=>6, :c=>7, :d=>8})
 
-    @ds.to_hash(:a, :b).must_equal(1=>2, 5=>6)
-    @ds.to_hash([:a, :c], :b).must_equal([1, 3]=>2, [5, 7]=>6)
-    @ds.to_hash(:a, [:b, :c]).must_equal(1=>[2, 3], 5=>[6, 7])
-    @ds.to_hash([:a, :c], [:b, :d]).must_equal([1, 3]=>[2, 4], [5, 7]=>[6, 8])
+    @ds.as_hash(:a, :b).must_equal(1=>2, 5=>6)
+    @ds.as_hash([:a, :c], :b).must_equal([1, 3]=>2, [5, 7]=>6)
+    @ds.as_hash(:a, [:b, :c]).must_equal(1=>[2, 3], 5=>[6, 7])
+    @ds.as_hash([:a, :c], [:b, :d]).must_equal([1, 3]=>[2, 4], [5, 7]=>[6, 8])
 
-    @ds.to_hash(:a, :b, :hash => (tmp = {})).must_be_same_as(tmp)
+    @ds.as_hash(:a, :b, :hash => (tmp = {})).must_be_same_as(tmp)
   end
 
   it "should have working #to_hash_groups" do
@@ -1874,7 +1875,7 @@ describe "Dataset replace" do
   end
 
   it "should update a record if the condition is met" do
-    @d << {:id => 111}
+    @d.insert(:id => 111)
     @d.all.must_equal [{:id => 111, :value => nil}]
     @d.replace(:id => 111, :value => 333)
     @d.all.must_equal [{:id => 111, :value => 333}]