2 files changed, 12 insertions, 2 deletions
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index 35b00b878a..9f79fc9b13 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -266,7 +266,7 @@ class BasicsTest < Test::Unit::TestCase
     if ActiveRecord::Base.generate_read_methods
       assert_readers(Topic,  %w(type replies_count))
       assert_readers(Firm,   %w(type))
-      assert_readers(Client, %w(type))
+      assert_readers(Client, %w(type ruby_type rating?))
     else
       [Topic, Firm, Client].each {|klass| assert_equal klass.read_methods, {}}
     end
@@ -1282,8 +1282,9 @@ class BasicsTest < Test::Unit::TestCase
   
   private
     def assert_readers(model, exceptions)
-      expected_readers = Set.new(model.column_names - (model.serialized_attributes.keys + exceptions + ['id']))
+      expected_readers = Set.new(model.column_names - (model.serialized_attributes.keys + ['id']))
       expected_readers += expected_readers.map { |col| "#{col}?" }
+      expected_readers -= exceptions
       assert_equal expected_readers, model.read_methods
     end
 end
diff --git a/activerecord/test/fixtures/company.rb b/activerecord/test/fixtures/company.rb
index b0694ff361..59a7cdd13e 100755
--- a/activerecord/test/fixtures/company.rb
+++ b/activerecord/test/fixtures/company.rb
@@ -57,6 +57,15 @@ class Client < Company
     end
     true
   end
+  
+  # Used to test that read and question methods are not generated for these attributes
+  def ruby_type
+    read_attribute :ruby_type
+  end
+  
+  def rating?
+    query_attribute :rating
+  end
 end