Made eager loading work with inheritance hierarchies #1065 [Ryan Carver]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1131 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 5 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index c27bcecdd6..3a1a590be8 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -732,9 +732,11 @@ module ActiveRecord #:nodoc:
         end
         
         def type_condition
-          " (" + subclasses.inject("#{inheritance_column} = '#{Inflector.demodulize(name)}' ") do |condition, subclass| 
-            condition << "OR #{inheritance_column} = '#{Inflector.demodulize(subclass.name)}' "
-          end + ") "
+          type_condition = subclasses.inject("#{table_name}.#{inheritance_column} = '#{name.demodulize}' ") do |condition, subclass| 
+            condition << "OR #{table_name}.#{inheritance_column} = '#{subclass.name.demodulize}' "
+          end
+          
+          return " (#{type_condition})"
         end
 
         # Guesses the table name, but does not decorate it with prefix and suffix information.