diff options
Diffstat (limited to 'activerecord/lib/active_record/associations')
5 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 4da3f15abe..b0be44ff42 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -65,7 +65,7 @@ module ActiveRecord # Removes all records from this association. Returns +self+ so method calls may be chained. def clear - return self if length.zero? # forces load_target if hasn't happened already + return self if length.zero? # forces load_target if it hasn't happened already if @reflection.options[:dependent] && @reflection.options[:dependent] == :delete_all destroy_all diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 1fe1fee748..d2478fc84e 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -139,7 +139,7 @@ module ActiveRecord end # Can be overwritten by associations that might have the foreign key available for an association without - # having the object itself (and still being a new record). Currently, only belongs_to present this scenario. + # having the object itself (and still being a new record). Currently, only belongs_to presents this scenario. def foreign_key_present false end diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index aebe521ca0..917a7fa5e1 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -14,7 +14,7 @@ module ActiveRecord end def create(attributes = {}) - # Can't use Base.create since the foreign key may be a protected attribute. + # Can't use Base.create because the foreign key may be a protected attribute. if attributes.is_a?(Array) attributes.collect { |attr| create(attr) } else @@ -138,8 +138,8 @@ module ActiveRecord end # Join tables with additional columns on top of the two foreign keys must be considered ambigious unless a select - # clause has been explicitly defined. Otherwise you can get broken records back, if, say, the join column also has - # and id column, which will then overwrite the id column of the records coming back. + # clause has been explicitly defined. Otherwise you can get broken records back, if, for example, the join column also has + # an id column. This will then overwrite the id column of the records coming back. def finding_with_ambigious_select?(select_clause) !select_clause && @owner.connection.columns(@reflection.options[:join_table], "Join Table Columns").size != 2 end diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index ec093548da..de0d7cc8a9 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -67,7 +67,7 @@ module ActiveRecord [:push, :concat].each { |method| alias_method method, :<< } - # Remove +records+ from this association. Does not destroy +records+. + # Removes +records+ from this association. Does not destroy +records+. def delete(*records) records = flatten_deeper(records) records.each { |associate| raise_on_type_mismatch(associate) } diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 59e5486ad6..085de27cd5 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -76,7 +76,7 @@ module ActiveRecord end def new_record(replace_existing) - # make sure we load the target first, if we plan on replacing the existing + # Make sure we load the target first, if we plan on replacing the existing # instance. Otherwise, if the target has not previously been loaded # elsewhere, the instance we create will get orphaned. load_target if replace_existing |