github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of separate reset_target! and reset_scopes_cache! methods

Browse Source
This commit is contained in:
Jon Leighton
2011-01-24 22:41:34 +00:00
parent 5dd3dadcdd
commit fdee153ff8
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
activerecord/lib/active_record/associations/association_collection.rb
View File

@@ -50,9 +50,9 @@ module ActiveRecord
alias_method :to_a, :to_ary
def reset
reset_target!
reset_scopes_cache!
@loaded = false
@_scopes_cache = {}
@loaded = false
@target = []
end
def build(attributes = {}, &block)
@@ -106,10 +106,20 @@ module ActiveRecord
#
# See delete for more info.
def delete_all
load_target
delete(@target)
reset_target!
reset_scopes_cache!
delete(load_target).tap do
reset
loaded!
end
end
# Destroy all the records from this association.
#
# See destroy for more info.
def destroy_all
destroy(load_target).tap do
reset
loaded!
end
end
# Calculate sum using SQL, not Enumerable
@@ -194,17 +204,6 @@ module ActiveRecord
self
end
# Destroy all the records from this association.
#
# See destroy for more info.
def destroy_all
load_target
destroy(@target).tap do
reset_target!
reset_scopes_cache!
end
end
def create(attrs = {})
if attrs.is_a?(Array)
attrs.collect { |attr| create(attr) }
@@ -395,14 +394,6 @@ module ActiveRecord
interpolate_sql(@reflection.options[:finder_sql])
end
def reset_target!
@target = []
end
def reset_scopes_cache!
@_scopes_cache = {}
end
def find_target
records =
if @reflection.options[:finder_sql]