@@ -197,7 +197,13 @@ module ActiveRecord joins = ["LEFT OUTER JOIN #{Tagging.table_name} ON #{Tag.table_name}.id = #{Tagging.table_name}.tag_id"] joins << sanitize_sql(["AND #{Tagging.table_name}.context = ?",options.delete(:on).to_s]) unless options[:on].nil? - joins << "LEFT OUTER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{Tagging.table_name}.taggable_id" + + joins << " INNER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{Tagging.table_name}.taggable_id" + unless self.descends_from_active_record? + # Current model is STI descendant, so add type checking to the join condition + joins << " AND #{table_name}.#{self.inheritance_column} = '#{self.name}'" + end + joins << scope[:joins] if scope && scope[:joins] at_least = sanitize_sql(['COUNT(*) >= ?', options.delete(:at_least)]) if options[:at_least] lib/acts_as_taggable_on/acts_as_taggable_on.rb @@ -143,5 +143,16 @@ describe "Taggable" do InheritingTaggableModel.find_tagged_with("fork", :on => :parts).should be_empty AlteredInheritingTaggableModel.find_tagged_with("fork", :on => :parts).first.should == @inherited_different end + + it "should have different tag_counts_on for inherited models" do + @inherited_same.tag_list = "bob, kelso" + @inherited_same.save! + @inherited_different.tag_list = "fork, spoon" + @inherited_different.save! + + InheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso) + AlteredInheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(fork spoon) + TaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso fork spoon) + end end end spec/acts_as_taggable_on/taggable_spec.rb eef7d7fcb0680deaa5c0e6c06129d20ae037042e Georg Ledermann ledermann@gmx.de http://github.com/mbleigh/acts-as-taggable-on/commit/68eedca0a660c46878d522252eb692a5e98fcb53 68eedca0a660c46878d522252eb692a5e98fcb53 2009-10-20T08:28:59-07:00 2009-10-01T01:14:14-07:00 Fix for tag_counts_on to work with STI a964c6d3982fb1d27a1973e86802d925c637a9e1 Michael Bleigh michael@intridea.com