diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-28 10:29:03 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-28 10:29:03 -0200 |
| commit | 2cdd229fc2a3848cf7d77ccb718544594e0373eb (patch) | |
| tree | 37f10ce17adea1ce1427165e08af7a3528cc5808 /activerecord/lib | |
| parent | 99e4ebbac8dfd2cf1d39ae51f05549a6b6031388 (diff) | |
| parent | 5142d5411481c893f817c1431b0869be3745060f (diff) | |
| download | rails-2cdd229fc2a3848cf7d77ccb718544594e0373eb.tar.gz rails-2cdd229fc2a3848cf7d77ccb718544594e0373eb.tar.bz2 rails-2cdd229fc2a3848cf7d77ccb718544594e0373eb.zip | |
Merge pull request #17808 from yuki24/fix-bug-where-record-not-saved-loses-error-message
Fixed a bug where AR::RecordNotSaved loses the given error message
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/errors.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb index 14819aab54..fc28ab585f 100644 --- a/activerecord/lib/active_record/errors.rb +++ b/activerecord/lib/active_record/errors.rb @@ -54,9 +54,9 @@ module ActiveRecord class RecordNotSaved < ActiveRecordError attr_reader :record - def initialize(record) + def initialize(message, record = nil) @record = record - super() + super(message) end end diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index 8d84a3acae..99e104598b 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -139,7 +139,7 @@ module ActiveRecord # Attributes marked as readonly are silently ignored if the record is # being updated. def save!(*) - create_or_update || raise(RecordNotSaved, self) + create_or_update || raise(RecordNotSaved.new(nil, self)) end # Deletes the record in the database and freezes this instance to |