Makes validates_acceptance_of to not override database fields [#4460 …

…state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>

activemodel/lib/active_model/validations.rb

@@ -133,6 +133,9 @@ def validators_on(attribute)
         _validators[attribute.to_sym]
       end
 
+      def attribute_method?(attribute)
+        method_defined?(attribute)
+      end
     private
 
       def _merge_attributes(attr_names)

activemodel/lib/active_model/validations/acceptance.rb

@@ -14,8 +14,10 @@ def validate_each(record, attribute, value)
       def setup(klass)
         # Note: instance_methods.map(&:to_s) is important for 1.9 compatibility
         # as instance_methods returns symbols unlike 1.8 which returns strings.
-        new_attributes = attributes.reject { |name| klass.instance_methods.map(&:to_s).include?("#{name}=") }
-        klass.send(:attr_accessor, *new_attributes)        
+        attr_readers = attributes.reject { |name| klass.attribute_method?(name) }
+        attr_writers = attributes.reject { |name| klass.attribute_method?("#{name}=") }
+        klass.send(:attr_reader, *attr_readers)
+        klass.send(:attr_writer, *attr_writers)
       end
     end
 

activerecord/lib/active_record/base.rb

@@ -931,6 +931,10 @@ def reset_column_information_and_inheritable_attributes_for_all_subclasses#:nodo
         subclasses.each { |klass| klass.reset_inheritable_attributes; klass.reset_column_information }
       end
 
+      def attribute_method?(attribute)
+        super || column_names.include?(attribute.to_s.sub(/=$/, ''))
+      end
+
       # Set the lookup ancestors for ActiveModel.
       def lookup_ancestors #:nodoc:
         klass = self