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

save the AR reference rather than delegating

Browse Source
This commit is contained in:
Aaron Patterson
2010-12-07 14:47:21 -08:00
parent 70ab450274
commit ef79658bd1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
activerecord/lib/active_record/associations/class_methods/join_dependency.rb
View File

@@ -6,9 +6,10 @@ module ActiveRecord
module Associations
module ClassMethods
class JoinDependency # :nodoc:
attr_reader :join_parts, :reflections, :table_aliases
attr_reader :join_parts, :reflections, :table_aliases, :active_record
def initialize(base, associations, joins)
@active_record = base
@table_joins = joins || ''
@join_parts = [JoinBase.new(base)]
@associations = {}
@@ -45,7 +46,7 @@ module ActiveRecord
def count_aliases_from_table_joins(name)
# quoted_name should be downcased as some database adapters (Oracle) return quoted name in uppercase
quoted_name = join_base.active_record.connection.quote_table_name(name.downcase).downcase
quoted_name = active_record.connection.quote_table_name(name.downcase).downcase
join_sql = @table_joins.downcase
join_sql.blank? ? 0 :
# Table names
@@ -61,11 +62,11 @@ module ActiveRecord
records = rows.map { |model|
primary_id = model[primary_key]
parent = parents[primary_id] ||= join_base.instantiate(model)
construct(parent, @associations, join_associations.dup, model)
construct(parent, @associations, join_associations, model)
parent
}.uniq
remove_duplicate_results!(join_base.active_record, records, @associations)
remove_duplicate_results!(active_record, records, @associations)
records
end