aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/singular_association.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-01-16 19:47:58 +0000
committerAaron Patterson <aaron.patterson@gmail.com>2011-01-16 13:43:53 -0800
commitf1a15c2197d5da8e0c38bd59aa19973c9cfc0a01 (patch)
treea492aca08aa10e5e74dabaa168f44a19b48a61d2 /activerecord/lib/active_record/associations/singular_association.rb
parent115eedbb410c52364e3353266316c218a29e5998 (diff)
downloadrails-f1a15c2197d5da8e0c38bd59aa19973c9cfc0a01.tar.gz
rails-f1a15c2197d5da8e0c38bd59aa19973c9cfc0a01.tar.bz2
rails-f1a15c2197d5da8e0c38bd59aa19973c9cfc0a01.zip
Abstract a bit more into SingularAssociation
Diffstat (limited to 'activerecord/lib/active_record/associations/singular_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/singular_association.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index 023f7caf68..4b457bd881 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -26,6 +26,12 @@ module ActiveRecord
def set_new_record(record)
replace(record)
end
+
+ def check_record(record)
+ record = record.target if AssociationProxy === record
+ raise_on_type_mismatch(record) if record
+ record
+ end
end
end
end