aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods.rb
diff options
context:
space:
mode:
authorJim Jones <jjones@aantix.com>2014-09-10 21:40:00 -0700
committerJim Jones <jjones@aantix.com>2014-09-10 21:40:00 -0700
commit53e753bd8061d6258f97100020ecfe5f79bcaff6 (patch)
treea42aa36a559768d9bad6678e6c1581f367e7036d /activerecord/lib/active_record/attribute_methods.rb
parent1245a9e06c66e77813fda621e825afdeacf2cd49 (diff)
downloadrails-53e753bd8061d6258f97100020ecfe5f79bcaff6.tar.gz
rails-53e753bd8061d6258f97100020ecfe5f79bcaff6.tar.bz2
rails-53e753bd8061d6258f97100020ecfe5f79bcaff6.zip
Changed the DangerousAttributeError exception message to include messaging that the conflict could be because of a conflicting attribute.
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods.rb')
-rw-r--r--activerecord/lib/active_record/attribute_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index 36d0d63c71..f4a4e3f605 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -111,7 +111,7 @@ module ActiveRecord
# # => false
def instance_method_already_implemented?(method_name)
if dangerous_attribute_method?(method_name)
- raise DangerousAttributeError, "#{method_name} is defined by Active Record"
+ raise DangerousAttributeError, "#{method_name} is defined by Active Record. Check to make sure that you don't have an attribute or method with the same name."
end
if superclass == Base