2 files changed, 16 insertions, 2 deletions
diff --git a/activerecord/test/association_inheritance_reload.rb b/activerecord/test/association_inheritance_reload.rb
new file mode 100644
index 0000000000..a3d5722841
--- /dev/null
+++ b/activerecord/test/association_inheritance_reload.rb
@@ -0,0 +1,14 @@
+require 'abstract_unit'
+require 'fixtures/company'
+
+class AssociationInheritanceReloadTest < Test::Unit::TestCase
+  fixtures :companies
+
+  def test_set_attributes
+    assert_equal ["errors.add_on_empty('name', \"can't be empty\")"], Firm.read_inheritable_attribute("validate"), "Second run"
+    # ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
+    remove_subclass_of(ActiveRecord::Base)
+    load 'fixtures/company.rb'
+    assert_equal ["errors.add_on_empty('name', \"can't be empty\")"], Firm.read_inheritable_attribute("validate"), "Second run"
+  end
+end
+\ No newline at end of file
diff --git a/activerecord/test/fixtures/company.rb b/activerecord/test/fixtures/company.rb
index 579590e909..f4df7203b8 100755
--- a/activerecord/test/fixtures/company.rb
+++ b/activerecord/test/fixtures/company.rb
@@ -12,10 +12,10 @@ class Firm < Company
   has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
   has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
   has_many :clients_using_counter_sql, :class_name => "Client",
-           :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}',
+           :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
            :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = #{id}'
   has_many :clients_using_zero_counter_sql, :class_name => "Client",
-           :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}',
+           :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
            :counter_sql => 'SELECT 0 FROM companies WHERE client_of = #{id}'
 
   has_one :account, :dependent => true