sequel 3.21.0 → 3.41.0

data/spec/extensions/hook_class_methods_spec.rb

@@ -1,192 +1,185 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-describe "Model hooks" do
+model_class = proc do |klass, &block|
+  c = Class.new(klass)
+  c.plugin :hook_class_methods
+  c.class_eval(&block) if block
+  c
+end
+
+describe Sequel::Model, "hook_class_methods plugin" do
   before do
     MODEL_DB.reset
   end
   
   specify "should be definable using a block" do
-    $adds = []
-    c = Class.new(Sequel::Model)
-    c.class_eval do
-      before_save {$adds << 'hi'}
+    adds = []
+    c = model_class.call Sequel::Model do
+      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 = []
-    c = Class.new(Sequel::Model)
-    c.class_eval do
-      def bye; $adds << 'bye'; end
+    adds = []
+    c = model_class.call Sequel::Model do
+      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 = []
-    c = Class.new(Sequel::Model)
-    c.class_eval do
-      after_save {$adds << 'hyiyie'}
-      after_save {$adds << 'byiyie'}
+    adds = []
+    c = model_class.call Sequel::Model do
+      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 = []
-    c = Class.new(Sequel::Model)
-    c.class_eval do
-      before_save {$adds << 'hyiyie'}
-      before_save {$adds << 'byiyie'}
+    adds = []
+    c = model_class.call Sequel::Model do
+      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 = []
-    c = Class.new(Sequel::Model)
-    c.class_eval do
-      def bye; $adds << 'bye'; end
+    adds = []
+    c = model_class.call Sequel::Model do
+      define_method(:bye){adds << 'bye'}
       before_save :bye
       before_save :bye
     end
     
     c.new.before_save
-    $adds.should == ['bye']
+    adds.should == ['bye']
 
-    $adds = []
-    d = Class.new(Sequel::Model)
-    d.class_eval do
-      before_save(:bye){$adds << 'hyiyie'}
-      before_save(:bye){$adds << 'byiyie'}
+    adds = []
+    d = model_class.call Sequel::Model do
+      before_save(:bye){adds << 'hyiyie'}
+      before_save(:bye){adds << 'byiyie'}
     end
     
     d.new.before_save
-    $adds.should == ['byiyie']
+    adds.should == ['byiyie']
 
-    $adds = []
-    e = Class.new(Sequel::Model)
-    e.class_eval do
-      def bye; $adds << 'bye'; end
+    adds = []
+    e = model_class.call Sequel::Model do
+      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 = []
-    e = Class.new(Sequel::Model)
-    e.class_eval do
-      def bye; $adds << 'bye'; end
-      before_save(:bye){$adds << 'byiyie'}
+    adds = []
+    e = model_class.call Sequel::Model do
+      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 = []
-    a = Class.new(Sequel::Model)
-    a.class_eval do
-      after_save {$adds << '123'}
+    adds = []
+    a = model_class.call Sequel::Model do
+      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 = []
-    a = Class.new(Sequel::Model)
-    a.class_eval do
-      before_save {$adds << '123'}
+    adds = []
+    a = model_class.call Sequel::Model do
+      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}
+    a = model_class.call Sequel::Model do
+      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
+    a = model_class.call Sequel::Model 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
 
@@ -194,8 +187,7 @@ describe "Model#before_create && Model#after_create" do
   before do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items))
-    @c.class_eval do
+    @c = model_class.call Sequel::Model(:items)  do
       columns :x
       no_primary_key
       
@@ -206,11 +198,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
@@ -232,8 +220,7 @@ describe "Model#before_update && Model#after_update" do
   before do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items))
-    @c.class_eval do
+    @c = model_class.call(Sequel::Model(:items)) do
       after_update {MODEL_DB << "BLAH after"}
     end
   end
@@ -242,11 +229,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
@@ -268,8 +251,7 @@ describe "Model#before_save && Model#after_save" do
   before do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items))
-    @c.class_eval do
+    @c = model_class.call(Sequel::Model(:items)) do
       columns :x
       after_save {MODEL_DB << "BLAH after"}
     end
@@ -279,22 +261,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
@@ -316,13 +290,8 @@ describe "Model#before_destroy && Model#after_destroy" do
   before do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items))
-    @c.class_eval do
+    @c = model_class.call(Sequel::Model(:items)) do
       after_destroy {MODEL_DB << "BLAH after"}
-      
-      def delete
-        MODEL_DB << "DELETE BLAH"
-      end
     end
   end
   
@@ -330,11 +299,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
@@ -355,8 +320,8 @@ describe "Model#before_validation && Model#after_validation" do
   before do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items))
-    @c.class_eval do
+    @c = model_class.call(Sequel::Model(:items)) do
+      plugin :validation_class_methods
       after_validation{MODEL_DB << "BLAH after"}
 
       def self.validate(o)
@@ -408,7 +373,7 @@ end
 
 describe "Model.has_hooks?" do
   before do
-    @c = Class.new(Sequel::Model(:items))
+    @c = model_class.call(Sequel::Model(:items))
   end
   
   specify "should return false if no hooks are defined" do
@@ -428,7 +393,8 @@ end
 
 describe "Model#add_hook_type" do
   before do
-    class Foo < Sequel::Model(:items)
+    class ::Foo < Sequel::Model(:items)
+      plugin :hook_class_methods
       add_hook_type :before_bar, :after_bar
 
       def bar
@@ -439,6 +405,9 @@ describe "Model#add_hook_type" do
     end
     @f = Class.new(Foo)
   end
+  after do
+    Object.send(:remove_const, :Foo)
+  end
 
   specify "should have before_bar and after_bar class methods" do
     @f.should respond_to(:before_bar)

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
@@ -54,8 +55,17 @@ describe "Sequel::Plugins::IdentityMap" do
     @c.identity_map_key(1).should_not == @c.identity_map_key(2)
   end
 
-  it "#identity_map_key should be different if the pk is nil" do
-    @c.identity_map_key(nil).should_not == @c.identity_map_key(nil)
+  it "#identity_map_key should be nil for an empty pk values" do
+    @c.identity_map_key(nil).should == nil
+    @c.identity_map_key([]).should == nil
+    @c.identity_map_key([nil]).should == nil
+  end
+
+  it "#load should work even if model doesn't have a primary key" do
+    c = Class.new(@c)
+    c.no_primary_key
+    proc{c.with_identity_map{c.load({})}}.should_not raise_error
+    c.with_identity_map{c.load({}).should_not equal(c.load({}))}
   end
 
   it "#load should return an object if there is no current identity map" do
@@ -105,9 +115,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 +128,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 +158,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 +175,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 +192,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 +209,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 +223,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