1 files changed, 13 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 05c0aa0e39..40fbadc233 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -581,7 +581,15 @@ class Fixtures < YAML::Omap
           row[primary_key_name] = Fixtures.identify(label)
         end
 
-        model_class.reflect_on_all_associations.each do |association|
+        # If STI is used, find the correct subclass for association reflection
+        reflection_class =
+          if row.include?(inheritance_column_name)
+            row[inheritance_column_name].constantize rescue model_class
+          else
+            model_class
+          end
+
+        reflection_class.reflect_on_all_associations.each do |association|
           case association.macro
           when :belongs_to
             # Do not replace association name with association foreign key if they are named the same
@@ -650,6 +658,10 @@ class Fixtures < YAML::Omap
       end
     end
 
+    def inheritance_column_name
+      @inheritance_column_name ||= model_class && model_class.inheritance_column
+    end
+
     def column_names
       @column_names ||= @connection.columns(@table_name).collect(&:name)
     end