aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-28 20:37:21 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-28 20:37:21 +0000
commit4c7555aef78decb8f9d515be72741c273114bc21 (patch)
tree47a07087bb8da4d218900e14e0dc1e1f6e4f8748 /activerecord/lib/active_record/base.rb
parent17ff70ac84b48ffc437551446814e77f1e0f0428 (diff)
downloadrails-4c7555aef78decb8f9d515be72741c273114bc21.tar.gz
rails-4c7555aef78decb8f9d515be72741c273114bc21.tar.bz2
rails-4c7555aef78decb8f9d515be72741c273114bc21.zip
Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's (closes #1861, #2477) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3707 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-xactiverecord/lib/active_record/base.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 88baaecfd3..1fd247e47b 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -21,6 +21,8 @@ module ActiveRecord #:nodoc:
end
class RecordNotFound < ActiveRecordError #:nodoc:
end
+ class RecordNotSaved < ActiveRecordError #:nodoc:
+ end
class StatementInvalid < ActiveRecordError #:nodoc:
end
class PreparedStatementInvalid < ActiveRecordError #:nodoc:
@@ -1285,9 +1287,15 @@ module ActiveRecord #:nodoc:
# * No record exists: Creates a new record with values matching those of the object attributes.
# * A record does exist: Updates the record with values matching those of the object attributes.
def save
- raise ActiveRecord::ReadOnlyRecord if readonly?
+ raise ReadOnlyRecord if readonly?
create_or_update
end
+
+ # Attempts to save the record, but instead of just returning false if it couldn't happen, it raises a
+ # RecordNotSaved exception
+ def save!
+ raise RecordNotSaved unless save
+ end
# Deletes the record in the database and freezes this instance to reflect that no changes should
# be made (since they can't be persisted).
@@ -1505,6 +1513,8 @@ module ActiveRecord #:nodoc:
"WHERE #{self.class.primary_key} = #{quote(id)}",
"#{self.class.name} Update"
)
+
+ return true
end
# Creates a new record with values matching those of the instance attributes.
@@ -1522,6 +1532,8 @@ module ActiveRecord #:nodoc:
)
@new_record = false
+
+ return true
end
# Sets the attribute used for single table inheritance to this class name if this is not the ActiveRecord descendent.