sequel 3.21.0 → 3.36.0

data/spec/extensions/identity_map_spec.rb

@@ -5,13 +5,14 @@ describe "Sequel::Plugins::IdentityMap" do
     class ::IdentityMapModel < Sequel::Model
       plugin :identity_map
       attr_accessor :foo
-      ds = dataset
-      def ds.fetch_rows(sql)
-        c = @opts[:where].args.first
-        c = c.column if c.is_a?(Sequel::SQL::QualifiedIdentifier)
-        h = {c=>@opts[:where].args.last}
-        execute(sql)
-        yield h
+      dataset._fetch = proc do |sql|
+        sql =~ /WHERE \(?(\w+\.)?(\w+) = (\d)\)?/
+        {$2.to_sym=>$3.to_i}
+      end
+      def self.waw_identity_map(&block) # with and without
+        with_identity_map(&block)
+        db.reset
+        yield
       end
     end
     class ::IdentityMapAlbum < ::IdentityMapModel
@@ -105,9 +106,9 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 1
       o.foo = 1
       @c[1].foo.should == o.foo
-      MODEL_DB.sqls.length.should == 1
+      MODEL_DB.sqls.length.should == 0
       @c[2].foo.should_not == o.foo
-      MODEL_DB.sqls.length.should == 2
+      MODEL_DB.sqls.length.should == 1
     end
   end
 
@@ -118,22 +119,22 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 1
       o.foo = 1
       @c[1].should == o
-      MODEL_DB.sqls.length.should == 1
+      MODEL_DB.sqls.length.should == 0
       o.destroy
-      MODEL_DB.sqls.length.should == 2
+      MODEL_DB.sqls.length.should == 1
       @c[1].foo.should_not == o.foo
-      MODEL_DB.sqls.length.should == 3
+      MODEL_DB.sqls.length.should == 1
 
       MODEL_DB.reset
       o = @c[2]
       MODEL_DB.sqls.length.should == 1
       o.foo = 1
       @c[2].should == o
-      MODEL_DB.sqls.length.should == 1
+      MODEL_DB.sqls.length.should == 0
       o.delete
-      MODEL_DB.sqls.length.should == 2
+      MODEL_DB.sqls.length.should == 1
       @c[2].foo.should_not == o.foo
-      MODEL_DB.sqls.length.should == 3
+      MODEL_DB.sqls.length.should == 1
     end
   end
 
@@ -148,10 +149,10 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 1
       o = @c1.load(:id=>1, :another_id=>2, :artist_id=>2)
       o.artist.should == a
-      MODEL_DB.sqls.length.should == 1
+      MODEL_DB.sqls.length.should == 0
       o = @c1.load(:id=>3, :another_id=>3, :artist_id=>3)
       o.artist.should_not == a
-      MODEL_DB.sqls.length.should == 2
+      MODEL_DB.sqls.length.should == 1
     end
   end
 
@@ -165,10 +166,10 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 1
       o = @c1.load(:id=>2, :artist_id=>2)
       o.artist.should == a
-      MODEL_DB.sqls.length.should == 1
+      MODEL_DB.sqls.length.should == 0
       o = @c1.load(:id=>3, :artist_id=>3)
       o.artist.should_not == a
-      MODEL_DB.sqls.length.should == 2
+      MODEL_DB.sqls.length.should == 1
     end
   end
 
@@ -182,9 +183,9 @@ describe "Sequel::Plugins::IdentityMap" do
       a.should be_a_kind_of(@c1)
       MODEL_DB.sqls.length.should == 1
       o.reload
-      MODEL_DB.sqls.length.should == 2
+      MODEL_DB.sqls.length.should == 1
       o.artist.should == a
-      MODEL_DB.sqls.length.should == 3
+      MODEL_DB.sqls.length.should == 1
     end
   end
 
@@ -199,7 +200,7 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 1
       o = @c1.load(:id=>2, :artist_id=>2)
       o.artist.should == a
-      MODEL_DB.sqls.length.should == 2
+      MODEL_DB.sqls.length.should == 1
     end
   end
 
@@ -213,7 +214,115 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 1
       o = @c1.load(:id=>2, :artist_id=>2)
       o.artist.should == a
+      MODEL_DB.sqls.length.should == 1
+    end
+  end
+
+  it "should not use the identity map as a lookup cache if a dynamic callback is used" do
+    @c1.many_to_one :artist, :class=>@c2
+    @c.with_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      o = @c1.load(:id=>1, :artist_id=>2)
+      a = o.artist
+      a.should be_a_kind_of(@c2)
+      MODEL_DB.sqls.length.should == 1
+      o = @c1.load(:id=>2, :artist_id=>2)
+      o.artist.should == a
+      MODEL_DB.sqls.length.should == 0
+      o = @c1.load(:id=>3, :artist_id=>3)
+      o.artist.should_not == a
+      MODEL_DB.sqls.length.should == 1
+    end
+  end
+
+  it "should not override custom :eager_loaders for many_to_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    c = @c2
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>:album_id, :right_key=>:artist_id, :join_table=>:aa, :eager_loader=>(proc do |eo|
+       eo[:rows].each{|object| object.associations[:artists] = [c.load(:id=>object.id)]}
+    end)
+    @c1.dataset._fetch = [{:id=>1}, {:id=>2}, {:id=>3}]
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 1
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1)], [@c2.load(:id=>2)], [@c2.load(:id=>3)]]
+      MODEL_DB.sqls.length.should == 0
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>:album_id, :right_key=>:artist_id, :join_table=>:aa
+    @c1.dataset._fetch = [{:id=>1}, {:id=>2}, {:id=>3}]
+    @c2.dataset._fetch = [{:id=>1, :x_foreign_key_x=>1}, {:id=>1, :x_foreign_key_x=>2}, {:id=>2, :x_foreign_key_x=>1}, {:id=>2, :x_foreign_key_x=>2}, {:id=>3, :x_foreign_key_x=>1}, {:id=>3, :x_foreign_key_x=>1}]
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 0
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations with composite keys" do
+    @c1.columns :id, :id2
+    @c2.columns :id
+    @c1.set_primary_key :id, :id2
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>[:album_id1, :album_id2], :right_key=>:artist_id, :join_table=>:aa
+    @c1.dataset._fetch = [{:id=>1, :id2=>4}, {:id=>2, :id2=>5}, {:id=>3, :id2=>6}]
+    @c2.dataset._fetch = [ {:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}, {:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5}, {:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}, {:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5}, {:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}, {:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}]
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1, :id2=>4), @c1.load(:id=>2, :id2=>5), @c1.load(:id=>3, :id2=>6)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 0
+    end
+  end
+
+  it "should work correctly when eagerly loading many_through_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    @c1.plugin :many_through_many
+    @c1.many_through_many :artists, [[:aa, :album_id, :artist_id]], :class=>@c2
+    @c1.dataset._fetch = [{:id=>1}, {:id=>2}, {:id=>3}]
+    @c2.dataset._fetch = [{:id=>1, :x_foreign_key_x=>1}, {:id=>1, :x_foreign_key_x=>2}, {:id=>2, :x_foreign_key_x=>1}, {:id=>2, :x_foreign_key_x=>2}, {:id=>3, :x_foreign_key_x=>1}, {:id=>3, :x_foreign_key_x=>1}]
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 0
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations with composite keys" do
+    @c1.columns :id, :id2
+    @c2.columns :id
+    @c1.set_primary_key :id, :id2
+    @c1.plugin :many_through_many
+    @c1.many_through_many :artists, [[:aa, [:album_id1, :album_id2], :artist_id]], :class=>@c2
+    @c1.dataset._fetch = [{:id=>1, :id2=>4}, {:id=>2, :id2=>5}, {:id=>3, :id2=>6}]
+    @c2.dataset._fetch = [ {:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}, {:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5}, {:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}, {:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5}, {:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}, {:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4}]
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
       MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1, :id2=>4), @c1.load(:id=>2, :id2=>5), @c1.load(:id=>3, :id2=>6)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 0
     end
   end
 end

data/spec/extensions/inflector_spec.rb

@@ -1,8 +1,5 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
-if defined?(ActiveSupport::Inflector)
-  skip_warn "inflector extension: active_support inflector loaded"
-else
 describe String do
   it "#camelize and #camelcase should transform the word to CamelCase" do
     "egg_and_hams".camelize.should == "EggAndHams"
@@ -182,4 +179,3 @@ describe 'Default inflections' do
     end
   end
 end
-end

data/spec/extensions/instance_filters_spec.rb

@@ -2,54 +2,44 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "instance_filters plugin" do
   before do
-    @c = Class.new(Sequel::Model(:people)) do
-    end
-    @sql = sql = ''
-    @v = v = [1]
+    @c = Class.new(Sequel::Model(:people))
     @c.dataset.quote_identifiers = false
-    @c.dataset.meta_def(:update) do |opts|
-      sql.replace(update_sql(opts))
-      return v.first
-    end
-    @c.dataset.meta_def(:delete) do
-      sql.replace(delete_sql)
-      return v.first
-    end
     @c.columns :id, :name, :num
     @c.plugin :instance_filters
     @p = @c.load(:id=>1, :name=>'John', :num=>1)
+    MODEL_DB.sqls
   end
 
   specify "should raise an error when updating a stale record" do
     @p.update(:name=>'Bob')
-    @sql.should == "UPDATE people SET name = 'Bob' WHERE (id = 1)"
+    MODEL_DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
     @p.instance_filter(:name=>'Jim')
-    @v.replace([0])
+    @p.this.numrows = 0
     proc{@p.update(:name=>'Joe')}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
-    @sql.should == "UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Jim'))"
+    MODEL_DB.sqls.should == ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Jim'))"]
   end 
 
   specify "should raise an error when destroying a stale record" do
     @p.destroy
-    @sql.should == "DELETE FROM people WHERE (id = 1)"
+    MODEL_DB.sqls.should == ["DELETE FROM people WHERE id = 1"]
     @p.instance_filter(:name=>'Jim')
-    @v.replace([0])
+    @p.this.numrows = 0
     proc{@p.destroy}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
-    @sql.should == "DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"
+    MODEL_DB.sqls.should == ["DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"]
   end 
   
   specify "should apply all instance filters" do
     @p.instance_filter(:name=>'Jim')
     @p.instance_filter{num > 2}
     @p.update(:name=>'Bob')
-    @sql.should == "UPDATE people SET name = 'Bob' WHERE ((id = 1) AND (name = 'Jim') AND (num > 2))"
+    MODEL_DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE ((id = 1) AND (name = 'Jim') AND (num > 2))"]
   end 
 
   specify "should drop instance filters after updating" do
     @p.instance_filter(:name=>'Joe')
     @p.update(:name=>'Joe')
-    @sql.should == "UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Joe'))"
+    MODEL_DB.sqls.should == ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Joe'))"]
     @p.update(:name=>'Bob')
-    @sql.should == "UPDATE people SET name = 'Bob' WHERE (id = 1)"
+    MODEL_DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
   end
 end

data/spec/extensions/instance_hooks_spec.rb

@@ -177,3 +177,75 @@ describe "InstanceHooks plugin" do
     @r.should == [2, 1, 4, 3]
   end
 end
+
+describe "InstanceHooks plugin with transactions" do
+  before do
+    @db = Sequel.mock(:numrows=>1)
+    pr = proc{|x| r(x)}
+    @c = Class.new(Sequel::Model(@db[:items])) do
+      attr_accessor :rb
+      def after_save
+        db.execute('as')
+        raise Sequel::Rollback if rb
+      end
+      def after_destroy
+        db.execute('ad')
+        raise Sequel::Rollback if rb
+      end
+    end
+    @c.use_transactions = true
+    @c.plugin :instance_hooks
+    @o = @c.load({:id=>1})
+    @or = @c.load({:id=>1})
+    @or.rb = true
+    @r = []
+    @db.sqls
+  end
+  
+  it "should support after_commit_hook" do
+    @o.after_commit_hook{@db.execute('ac1')}
+    @o.after_commit_hook{@db.execute('ac2')}
+    @o.save.should_not be_nil
+    @db.sqls.should == ['BEGIN', 'as', 'COMMIT', 'ac1', 'ac2']
+  end
+  
+  it "should support after_rollback_hook" do
+    @or.after_rollback_hook{@db.execute('ar1')}
+    @or.after_rollback_hook{@db.execute('ar2')}
+    @or.save.should be_nil
+    @db.sqls.should == ['BEGIN', 'as', 'ROLLBACK', 'ar1', 'ar2']
+  end
+  
+  it "should support after_commit_hook" do
+    @o.after_destroy_commit_hook{@db.execute('adc1')}
+    @o.after_destroy_commit_hook{@db.execute('adc2')}
+    @o.destroy.should_not be_nil
+    @db.sqls.should == ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'COMMIT', 'adc1', 'adc2']
+  end
+  
+  it "should support after_rollback_hook" do
+    @or.after_destroy_rollback_hook{@db.execute('adr1')}
+    @or.after_destroy_rollback_hook{@db.execute('adr2')}
+    @or.destroy.should be_nil
+    @db.sqls.should == ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'ROLLBACK', 'adr1', 'adr2']
+  end
+
+  it "should have *_hook methods return self "do
+    @o.before_destroy_hook{r 1}.should equal(@o)
+    @o.before_validation_hook{r 1}.should equal(@o)
+    @o.before_save_hook{r 1}.should equal(@o)
+    @o.before_update_hook{r 1}.should equal(@o)
+    @o.before_create_hook{r 1}.should equal(@o)
+
+    @o.after_destroy_hook{r 1}.should equal(@o)
+    @o.after_validation_hook{r 1}.should equal(@o)
+    @o.after_save_hook{r 1}.should equal(@o)
+    @o.after_update_hook{r 1}.should equal(@o)
+    @o.after_create_hook{r 1}.should equal(@o)
+    @o.after_commit_hook{r 1}.should equal(@o)
+    @o.after_rollback_hook{r 1}.should equal(@o)
+    @o.after_destroy_commit_hook{r 1}.should equal(@o)
+    @o.after_destroy_rollback_hook{r 1}.should equal(@o)
+  end
+
+end

data/spec/extensions/json_serializer_spec.rb

@@ -96,14 +96,30 @@ describe "Sequel::Plugins::JsonSerializer" do
     @artist.id.should == 2
   end
 
+  it "should support #from_json to support specific :fields" do
+    @album.from_json('{"name": "AS", "artist_id": 3}', :fields=>['name'])
+    @album.name.should == 'AS'
+    @album.artist_id.should == 2
+  end
+
+  it "should support #from_json to support :missing=>:skip option" do
+    @album.from_json('{"artist_id": 3}', :fields=>['name'], :missing=>:skip)
+    @album.name.should == 'RF'
+    @album.artist_id.should == 2
+  end
+
+  it "should support #from_json to support :missing=>:raise option" do
+    proc{@album.from_json('{"artist_id": 3}', :fields=>['name'], :missing=>:raise)}.should raise_error(Sequel::Error)
+  end
+
   it "should raise an exception for json keys that aren't associations, columns, or setter methods" do
     Album.send(:undef_method, :blah=)
     proc{JSON.parse(@album.to_json(:include=>:blah))}.should raise_error(Sequel::Error)
   end
 
   it "should support a to_json class and dataset method" do
-    album = @album
-    Album.dataset.meta_def(:all){[album]}
+    Album.dataset._fetch = {:id=>1, :name=>'RF', :artist_id=>2}
+    Artist.dataset._fetch = {:id=>2, :name=>'YJM'}
     JSON.parse(Album.to_json).should == [@album]
     JSON.parse(Album.to_json(:include=>:artist)).map{|x| x.artist}.should == [@artist]
     JSON.parse(Album.dataset.to_json(:only=>:name)).should == [Album.load(:name=>@album.name)]
@@ -112,10 +128,23 @@ describe "Sequel::Plugins::JsonSerializer" do
   it "should have dataset to_json method work with naked datasets" do
     album = @album
     ds = Album.dataset.naked
-    ds.meta_def(:all){[album.values]}
+    ds._fetch = {:id=>1, :name=>'RF', :artist_id=>2}
     JSON.parse(ds.to_json).should == [@album.values.inject({}){|h, (k, v)| h[k.to_s] = v; h}]
   end
 
+  it "should have dataset to_json method respect :array option for the array to use" do
+    a = Album.load(:id=>1, :name=>'RF', :artist_id=>3)
+    JSON.parse(Album.to_json(:array=>[a])).should == [a]
+
+    a.associations[:artist] = artist = Artist.load(:id=>3, :name=>'YJM')
+    JSON.parse(Album.to_json(:array=>[a], :include=>:artist)).first.artist.should == artist
+
+    artist.associations[:albums] = [a]
+    x = JSON.parse(Artist.to_json(:array=>[artist], :include=>:albums))
+    x.should == [artist]
+    x.first.albums.should == [a]
+  end
+
   it "should propagate class default options to instance to_json output" do
     class ::Album2 < Sequel::Model
       attr_accessor :blah
@@ -136,9 +165,23 @@ describe "Sequel::Plugins::JsonSerializer" do
     @album.to_json(:root=>true, :only => :name).to_s.should == '{"album":{"name":"RF"}}'
   end
   
-  it "should handle the :root option to qualify a dataset of records" do
-    album = @album
-    Album.dataset.meta_def(:all){[album, album]}
+  it "should handle the :root=>:both option to qualify a dataset of records" do
+    Album.dataset._fetch = [{:id=>1, :name=>'RF'}, {:id=>1, :name=>'RF'}]
+    Album.dataset.to_json(:root=>true, :only => :id).to_s.should == '{"albums":[{"album":{"id":1}},{"album":{"id":1}}]}'
+  end
+
+  it "should handle the :root=>:collection option to qualify just the collection" do
+    Album.dataset._fetch = [{:id=>1, :name=>'RF'}, {:id=>1, :name=>'RF'}]
+    Album.dataset.to_json(:root=>:collection, :only => :id).to_s.should == '{"albums":[{"id":1},{"id":1}]}'
+  end
+
+  it "should handle the :root=>:instance option to qualify just the instances" do
+    Album.dataset._fetch = [{:id=>1, :name=>'RF'}, {:id=>1, :name=>'RF'}]
+    Album.dataset.to_json(:root=>:instance, :only => :id).to_s.should == '[{"album":{"id":1}},{"album":{"id":1}}]'
+  end
+
+  it "should handle the :root=>true option be the same as :root=>:both for backwards compatibility" do
+    Album.dataset._fetch = [{:id=>1, :name=>'RF'}, {:id=>1, :name=>'RF'}]
     Album.dataset.to_json(:root=>true, :only => :id).to_s.should == '{"albums":[{"album":{"id":1}},{"album":{"id":1}}]}'
   end
 

data/spec/extensions/lazy_attributes_spec.rb

@@ -1,8 +1,9 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require 'yaml'
 
 describe "Sequel::Plugins::LazyAttributes" do
   before do
-    @db = MockDatabase.new
+    @db = Sequel.mock
     @db.meta_def(:schema){|*a| [[:id, {:type=>:integer}], [:name,{:type=>:string}]]}
     class ::LazyAttributesModel < Sequel::Model(@db[:la])
       plugin :lazy_attributes
@@ -10,27 +11,23 @@ describe "Sequel::Plugins::LazyAttributes" do
       meta_def(:columns){[:id, :name]}
       lazy_attributes :name
       meta_def(:columns){[:id]}
-      ds = dataset
-      def ds.fetch_rows(sql)
-        execute(sql)
-        select = @opts[:select]
-        where = @opts[:where]
-        block = @mod_block || proc{|s| s}
-        if !where
-          if select.include?(:name)
-            yield(block[:id=>1, :name=>'1'])
-            yield(block[:id=>2, :name=>'2'])
+      instance_dataset._fetch = dataset._fetch = proc do |sql|
+        if sql !~ /WHERE/
+          if sql =~ /name/
+            [{:id=>1, :name=>'1'}, {:id=>2, :name=>'2'}]
           else
-            yield(:id=>1)
-            yield(:id=>2)
+            [{:id=>1}, {:id=>2}]
           end
         else
-          i = where.args.last
-          Array(i).each do |x|
+          if sql =~ /id IN \(([\d, ]+)\)/
+            $1.split(', ')
+          elsif sql =~ /id = (\d)/
+            [$1]
+          end.map do |x|
             if sql =~ /SELECT name FROM/
-              yield(block[:name=>x.to_s])
+              {:name=>x.to_s}
             else
-              yield(block[:id=>x, :name=>x.to_s])
+              {:id=>x.to_i, :name=>x.to_s}
             end
           end
         end
@@ -38,7 +35,7 @@ describe "Sequel::Plugins::LazyAttributes" do
     end
     @c = ::LazyAttributesModel
     @ds = LazyAttributesModel.dataset
-    @db.reset
+    @db.sqls
   end
   after do
     Object.send(:remove_const, :LazyAttributesModel)
@@ -136,7 +133,7 @@ describe "Sequel::Plugins::LazyAttributes" do
 
   it "should work with the serialization plugin" do
     @c.plugin :serialization, :yaml, :name
-    @ds.instance_variable_set(:@mod_block, proc{|s| s.merge(:name=>"--- #{s[:name].to_i*3}\n")})
+    @c.instance_dataset._fetch = @ds._fetch = [[{:id=>1}, {:id=>2}], [{:id=>1, :name=>"--- 3\n"}, {:id=>2, :name=>"--- 6\n"}], [{:id=>1}], [{:name=>"--- 3\n"}]]
     @c.with_identity_map do
       ms = @ds.all
       ms.map{|m| m.values}.should == [{:id=>1}, {:id=>2}]
@@ -146,7 +143,6 @@ describe "Sequel::Plugins::LazyAttributes" do
       ms.map{|m| m.name}.should == [3,6]
       @db.sqls.should == ['SELECT id FROM la', 'SELECT id, name FROM la WHERE (id IN (1, 2))']
     end
-    @db.reset
     @c.with_identity_map do
       m = @ds.first
       m.values.should == {:id=>1}