aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/singular_association.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/associations/singular_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/singular_association.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index 7f92d9712a..0aa647c63d 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -1,6 +1,6 @@
module ActiveRecord
module Associations
- class SingularAssociation < AssociationProxy #:nodoc:
+ class SingularAssociation < Association #:nodoc:
def create(attributes = {})
new_record(:create, attributes)
end
@@ -29,7 +29,7 @@ module ActiveRecord
end
def check_record(record)
- record = record.target if AssociationProxy === record
+ record = record.target if Association === record
raise_on_type_mismatch(record) if record
record
end