aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_one_association.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_one_association.rb14
1 files changed, 3 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index f1e01197b5..5107be1eaf 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -68,19 +68,11 @@ module ActiveRecord
scoped.first.tap { |record| set_inverse_instance(record) }
end
- def finder_options
- {
- :conditions => construct_conditions,
- :select => @reflection.options[:select],
- :include => @reflection.options[:include],
- :readonly => @reflection.options[:readonly],
- :order => @reflection.options[:order]
- }
+ def association_scope
+ super.order(@reflection.options[:order])
end
- def creation_attributes
- construct_owner_attributes
- end
+ alias creation_attributes construct_owner_attributes
def new_record
record = scoped.scoping { yield @reflection }