sequel 3.29.0 → 3.30.0

data/spec/extensions/composition_spec.rb

@@ -48,9 +48,10 @@ describe "Composition plugin" do
     @c.composition :date, :composer=>proc{Date.new(year+1, month+2, day+3)}, :decomposer=>proc{[:year, :month, :day].each{|s| self.send("#{s}=", date.send(s) * 2)}}
     @o.date.should == Date.new(2, 4, 6)
     @o.save
-    MODEL_DB.sqls.last.should include("year = 4")
-    MODEL_DB.sqls.last.should include("month = 8")
-    MODEL_DB.sqls.last.should include("day = 12")
+    sql = MODEL_DB.sqls.last
+    sql.should include("year = 4")
+    sql.should include("month = 8")
+    sql.should include("day = 12")
   end
 
   it "should allow call super in composition getter and setter method definition in class" do
@@ -139,8 +140,9 @@ describe "Composition plugin" do
     @o.date.month.should == 6
     @o.date = c.new(3, 4)
     @o.save
-    MODEL_DB.sqls.last.should include("year = 6")
-    MODEL_DB.sqls.last.should include("month = 12")
+    sql = MODEL_DB.sqls.last
+    sql.should include("year = 6")
+    sql.should include("month = 12")
   end
 
   it ":mapping option should work with an array of two pairs of symbols" do
@@ -160,8 +162,9 @@ describe "Composition plugin" do
     @o.date.m.should == 6
     @o.date = c.new(3, 4)
     @o.save
-    MODEL_DB.sqls.last.should include("year = 6")
-    MODEL_DB.sqls.last.should include("month = 12")
+    sql = MODEL_DB.sqls.last
+    sql.should include("year = 6")
+    sql.should include("month = 12")
   end
 
   it ":mapping option :composer should return nil if all values are nil" do
@@ -173,9 +176,10 @@ describe "Composition plugin" do
     @c.composition :date, :mapping=>[:year, :month, :day]
     @o.date = nil
     @o.save
-    MODEL_DB.sqls.last.should include("year = NULL")
-    MODEL_DB.sqls.last.should include("month = NULL")
-    MODEL_DB.sqls.last.should include("day = NULL")
+    sql = MODEL_DB.sqls.last
+    sql.should include("year = NULL")
+    sql.should include("month = NULL")
+    sql.should include("day = NULL")
   end
 
   it "should work correctly with subclasses" do
@@ -184,8 +188,9 @@ describe "Composition plugin" do
     o = c.load(:id=>1, :year=>1, :month=>2, :day=>3)
     o.date.should == Date.new(1, 2, 3)
     o.save
-    MODEL_DB.sqls.last.should include("year = 1")
-    MODEL_DB.sqls.last.should include("month = 2")
-    MODEL_DB.sqls.last.should include("day = 3")
+    sql = MODEL_DB.sqls.last
+    sql.should include("year = 1")
+    sql.should include("month = 2")
+    sql.should include("day = 3")
   end
 end

data/spec/extensions/hook_class_methods_spec.rb

@@ -6,187 +6,185 @@ describe "Model hooks" do
   end
   
   specify "should be definable using a block" do
-    $adds = []
+    adds = []
     c = Class.new(Sequel::Model)
     c.class_eval do
-      before_save {$adds << 'hi'}
+      before_save{adds << 'hi'}
     end
     
     c.new.before_save
-    $adds.should == ['hi']
+    adds.should == ['hi']
   end
   
   specify "should be definable using a method name" do
-    $adds = []
+    adds = []
     c = Class.new(Sequel::Model)
     c.class_eval do
-      def bye; $adds << 'bye'; end
+      define_method(:bye){adds << 'bye'}
       before_save :bye
     end
     
     c.new.before_save
-    $adds.should == ['bye']
+    adds.should == ['bye']
   end
 
   specify "should be additive" do
-    $adds = []
+    adds = []
     c = Class.new(Sequel::Model)
     c.class_eval do
-      after_save {$adds << 'hyiyie'}
-      after_save {$adds << 'byiyie'}
+      after_save{adds << 'hyiyie'}
+      after_save{adds << 'byiyie'}
     end
 
     c.new.after_save
-    $adds.should == ['hyiyie', 'byiyie']
+    adds.should == ['hyiyie', 'byiyie']
   end
   
   specify "before hooks should run in reverse order" do
-    $adds = []
+    adds = []
     c = Class.new(Sequel::Model)
     c.class_eval do
-      before_save {$adds << 'hyiyie'}
-      before_save {$adds << 'byiyie'}
+      before_save{adds << 'hyiyie'}
+      before_save{adds << 'byiyie'}
     end
     
     c.new.before_save
-    $adds.should == ['byiyie', 'hyiyie']
+    adds.should == ['byiyie', 'hyiyie']
   end
 
   specify "should not be additive if the method or tag already exists" do
-    $adds = []
+    adds = []
     c = Class.new(Sequel::Model)
     c.class_eval do
-      def bye; $adds << 'bye'; end
+      define_method(:bye){adds << 'bye'}
       before_save :bye
       before_save :bye
     end
     
     c.new.before_save
-    $adds.should == ['bye']
+    adds.should == ['bye']
 
-    $adds = []
+    adds = []
     d = Class.new(Sequel::Model)
     d.class_eval do
-      before_save(:bye){$adds << 'hyiyie'}
-      before_save(:bye){$adds << 'byiyie'}
+      before_save(:bye){adds << 'hyiyie'}
+      before_save(:bye){adds << 'byiyie'}
     end
     
     d.new.before_save
-    $adds.should == ['byiyie']
+    adds.should == ['byiyie']
 
-    $adds = []
+    adds = []
     e = Class.new(Sequel::Model)
     e.class_eval do
-      def bye; $adds << 'bye'; end
+      define_method(:bye){adds << 'bye'}
       before_save :bye
-      before_save(:bye){$adds << 'byiyie'}
+      before_save(:bye){adds << 'byiyie'}
     end
     
     e.new.before_save
-    $adds.should == ['byiyie']
+    adds.should == ['byiyie']
 
-    $adds = []
+    adds = []
     e = Class.new(Sequel::Model)
     e.class_eval do
-      def bye; $adds << 'bye'; end
-      before_save(:bye){$adds << 'byiyie'}
+      define_method(:bye){adds << 'bye'}
+      before_save(:bye){adds << 'byiyie'}
       before_save :bye
     end
     
     e.new.before_save
-    $adds.should == ['bye']
+    adds.should == ['bye']
   end
   
   specify "should be inheritable" do
-    # pending
-    
-    $adds = []
+    adds = []
     a = Class.new(Sequel::Model)
     a.class_eval do
-      after_save {$adds << '123'}
+      after_save{adds << '123'}
     end
     
     b = Class.new(a)
     b.class_eval do
-      after_save {$adds << '456'}
-      after_save {$adds << '789'}
+      after_save{adds << '456'}
+      after_save{adds << '789'}
     end
     
     b.new.after_save
-    $adds.should == ['123', '456', '789']
+    adds.should == ['123', '456', '789']
   end
   
   specify "should be overridable in descendant classes" do
-    $adds = []
+    adds = []
     a = Class.new(Sequel::Model)
     a.class_eval do
-      before_save {$adds << '123'}
+      before_save{adds << '123'}
     end
     
     b = Class.new(a)
     b.class_eval do
-      def before_save; $adds << '456'; end
+      define_method(:before_save){adds << '456'}
     end
     
     a.new.before_save
-    $adds.should == ['123']
-    $adds = []
+    adds.should == ['123']
+    adds = []
     b.new.before_save
-    $adds.should == ['456']
+    adds.should == ['456']
   end
   
   specify "should stop processing if a before hook returns false" do
-    $flag = true
-    $adds = []
+    flag = true
+    adds = []
     
     a = Class.new(Sequel::Model)
     a.class_eval do
-      before_save {$adds << 'cruel'; $flag}
-      before_save {$adds << 'blah'; $flag}
+      before_save{adds << 'cruel'; flag}
+      before_save{adds << 'blah'; flag}
     end
     
     a.new.before_save
-    $adds.should == ['blah', 'cruel']
+    adds.should == ['blah', 'cruel']
 
     # chain should not break on nil
-    $adds = []
-    $flag = nil
+    adds = []
+    flag = nil
     a.new.before_save
-    $adds.should == ['blah', 'cruel']
+    adds.should == ['blah', 'cruel']
     
-    $adds = []
-    $flag = false
+    adds = []
+    flag = false
     a.new.before_save
-    $adds.should == ['blah']
+    adds.should == ['blah']
     
     b = Class.new(a)
     b.class_eval do
-      before_save {$adds << 'mau'}
+      before_save{adds << 'mau'}
     end
     
-    $adds = []
+    adds = []
     b.new.before_save
-    $adds.should == ['mau', 'blah']
+    adds.should == ['mau', 'blah']
   end
 end
 
 describe "Model#after_initialize" do
   specify "should be called after initialization" do
-    $values1 = nil
-    $reached_after_initialized = false
+    values1 = nil
+    reached_after_initialized = false
     
     a = Class.new(Sequel::Model)
     a.class_eval do
       columns :x, :y
       after_initialize do
-        $values1 = @values.clone
-        $reached_after_initialized = true
+        values1 = @values.clone
+        reached_after_initialized = true
       end
     end
     
     a.new(:x => 1, :y => 2)
-    $values1.should == {:x => 1, :y => 2}
-    $reached_after_initialized.should == true
+    values1.should == {:x => 1, :y => 2}
+    reached_after_initialized.should == true
   end
 end
 
@@ -206,11 +204,7 @@ describe "Model#before_create && Model#after_create" do
   specify "should be called around new record creation" do
     @c.before_create {MODEL_DB << "BLAH before"}
     @c.create(:x => 2)
-    MODEL_DB.sqls.should == [
-      'BLAH before',
-      'INSERT INTO items (x) VALUES (2)',
-      'BLAH after'
-    ]
+    MODEL_DB.sqls.should == ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after']
   end
 
   specify ".create should cancel the save and raise an error if before_create returns false and raise_on_save_failure is true" do
@@ -242,11 +236,7 @@ describe "Model#before_update && Model#after_update" do
     @c.before_update {MODEL_DB << "BLAH before"}
     m = @c.load(:id => 2233, :x=>123)
     m.save
-    MODEL_DB.sqls.should == [
-      'BLAH before',
-      'UPDATE items SET x = 123 WHERE (id = 2233)',
-      'BLAH after'
-    ]
+    MODEL_DB.sqls.should == ['BLAH before', 'UPDATE items SET x = 123 WHERE (id = 2233)', 'BLAH after']
   end
 
   specify "#save should cancel the save and raise an error if before_update returns false and raise_on_save_failure is true" do
@@ -279,22 +269,14 @@ describe "Model#before_save && Model#after_save" do
     @c.before_save {MODEL_DB << "BLAH before"}
     m = @c.load(:id => 2233, :x=>123)
     m.save
-    MODEL_DB.sqls.should == [
-      'BLAH before',
-      'UPDATE items SET x = 123 WHERE (id = 2233)',
-      'BLAH after'
-    ]
+    MODEL_DB.sqls.should == ['BLAH before', 'UPDATE items SET x = 123 WHERE (id = 2233)', 'BLAH after']
   end
   
   specify "should be called around record creation" do
     @c.before_save {MODEL_DB << "BLAH before"}
     @c.no_primary_key
     @c.create(:x => 2)
-    MODEL_DB.sqls.should == [
-      'BLAH before',
-      'INSERT INTO items (x) VALUES (2)',
-      'BLAH after'
-    ]
+    MODEL_DB.sqls.should == ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after']
   end
 
   specify "#save should cancel the save and raise an error if before_save returns false and raise_on_save_failure is true" do
@@ -319,10 +301,6 @@ describe "Model#before_destroy && Model#after_destroy" do
     @c = Class.new(Sequel::Model(:items))
     @c.class_eval do
       after_destroy {MODEL_DB << "BLAH after"}
-      
-      def delete
-        MODEL_DB << "DELETE BLAH"
-      end
     end
   end
   
@@ -330,11 +308,7 @@ describe "Model#before_destroy && Model#after_destroy" do
     @c.before_destroy {MODEL_DB << "BLAH before"}
     m = @c.load(:id => 2233)
     m.destroy
-    MODEL_DB.sqls.should == [
-      'BLAH before',
-      'DELETE BLAH',
-      'BLAH after'
-    ]
+    MODEL_DB.sqls.should == ['BLAH before', "DELETE FROM items WHERE (id = 2233)", 'BLAH after']
   end
 
   specify "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_save_failure is true" do

data/spec/extensions/identity_map_spec.rb

@@ -5,13 +5,9 @@ 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)
@@ -110,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
 
@@ -123,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
 
@@ -153,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
 
@@ -170,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
 
@@ -187,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
 
@@ -204,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
 
@@ -218,7 +214,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
 
@@ -229,13 +225,7 @@ describe "Sequel::Plugins::IdentityMap" do
     @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)
-    ds = @c1.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1})
-      yield({:id=>2})
-      yield({:id=>3})
-    end
+    @c1.dataset._fetch = [{:id=>1}, {:id=>2}, {:id=>3}]
 
     @c.waw_identity_map do
       MODEL_DB.sqls.length.should == 0
@@ -243,7 +233,7 @@ describe "Sequel::Plugins::IdentityMap" do
       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 == 1
+      MODEL_DB.sqls.length.should == 0
     end
   end
 
@@ -251,23 +241,8 @@ describe "Sequel::Plugins::IdentityMap" 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
-    ds = @c1.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1})
-      yield({:id=>2})
-      yield({:id=>3})
-    end
-    ds = @c2.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1, :x_foreign_key_x=>1})
-      yield({:id=>1, :x_foreign_key_x=>2})
-      yield({:id=>2, :x_foreign_key_x=>1})
-      yield({:id=>2, :x_foreign_key_x=>2})
-      yield({:id=>3, :x_foreign_key_x=>1})
-      yield({:id=>3, :x_foreign_key_x=>1})
-    end
+    @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
@@ -275,7 +250,7 @@ describe "Sequel::Plugins::IdentityMap" do
       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 == 2
+      MODEL_DB.sqls.length.should == 0
     end
   end
 
@@ -284,23 +259,8 @@ describe "Sequel::Plugins::IdentityMap" do
     @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
-    ds = @c1.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1, :id2=>4})
-      yield({:id=>2, :id2=>5})
-      yield({:id=>3, :id2=>6})
-    end
-    ds = @c2.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-      yield({:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
-      yield({:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-      yield({:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
-      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-    end
+    @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
@@ -308,7 +268,7 @@ describe "Sequel::Plugins::IdentityMap" do
       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 == 2
+      MODEL_DB.sqls.length.should == 0
     end
   end
 
@@ -317,23 +277,8 @@ describe "Sequel::Plugins::IdentityMap" do
     @c2.columns :id
     @c1.plugin :many_through_many
     @c1.many_through_many :artists, [[:aa, :album_id, :artist_id]], :class=>@c2
-    ds = @c1.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1})
-      yield({:id=>2})
-      yield({:id=>3})
-    end
-    ds = @c2.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1, :x_foreign_key_x=>1})
-      yield({:id=>1, :x_foreign_key_x=>2})
-      yield({:id=>2, :x_foreign_key_x=>1})
-      yield({:id=>2, :x_foreign_key_x=>2})
-      yield({:id=>3, :x_foreign_key_x=>1})
-      yield({:id=>3, :x_foreign_key_x=>1})
-    end
+    @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
@@ -341,7 +286,7 @@ describe "Sequel::Plugins::IdentityMap" do
       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 == 2
+      MODEL_DB.sqls.length.should == 0
     end
   end
 
@@ -351,23 +296,8 @@ describe "Sequel::Plugins::IdentityMap" do
     @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
-    ds = @c1.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1, :id2=>4})
-      yield({:id=>2, :id2=>5})
-      yield({:id=>3, :id2=>6})
-    end
-    ds = @c2.dataset
-    def ds.fetch_rows(sql)
-      execute(sql)
-      yield({:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-      yield({:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
-      yield({:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-      yield({:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
-      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
-    end
+    @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
@@ -375,7 +305,7 @@ describe "Sequel::Plugins::IdentityMap" do
       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 == 2
+      MODEL_DB.sqls.length.should == 0
     end
   end
 end