From 1aff68d61574410fa942aa34ec261c68565e48c1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 20 Mar 2006 06:45:34 +0000
Subject: Fix bug introduced by changeset 3679 which caused custom attribute?
 methods to be overridden. Also ensure that ? methods are defined even if read
 method is customised. (closes #3677) [jonathan@bluewire.net.nz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4002 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/test/base_test.rb        | 5 +++--
 activerecord/test/fixtures/company.rb | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'activerecord/test')

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
 
 
-- 
cgit v1.2.3