Changeset 8051

Timestamp:

10/29/07 03:02:42 (2 years ago)

Author:

bitsweat

Message:

Associations: speedup duplicate record check. Closes #10011.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Associations: speedup duplicate record check.  #10011 [lifofifo]
-
-* Make sure that << works on has_many associations on unsaved records.  Closes #9989 [hasmanyjosh]

trunk/activerecord/lib/active_record/associations.rb

@@ -1403 +1403 @@
-              construct(@base_records_hash[primary_id], @associations, join_associations.dup, row)
-            end
+            remove_duplicate_results!(join_base.active_record, @base_records_in_order, @associations)
-            return @base_records_in_order
+          end
+
+          def remove_duplicate_results!(base, records, associations)
+            case associations
+              when Symbol, String
+                reflection = base.reflections[associations]
+                if reflection && [:has_many, :has_and_belongs_to_many].include?(reflection.macro)
+                  records.each { |record| record.send(reflection.name).target.uniq! }
+                end
+              when Array
+                associations.each do |association|
+                  remove_duplicate_results!(base, records, association)
+                end
+              when Hash
+                associations.keys.each do |name|
+                  reflection = base.reflections[name]
+                  is_collection = [:has_many, :has_and_belongs_to_many].include?(reflection.macro)
+
+                  parent_records = records.map do |record|
+                    next unless record.send(reflection.name)
+                    is_collection ? record.send(reflection.name).target.uniq! : record.send(reflection.name)
+                  end.flatten.compact
+
+                  remove_duplicate_results!(reflection.class_name.constantize, parent_records, associations[name]) unless parent_records.empty?
+                end
+            end
-          end
-
@@ -1462 +1489 @@
-                  return nil if record.id.to_s != join.parent.record_id(row).to_s or row[join.aliased_primary_key].nil?
-                  association = join.instantiate(row)
- unless collection.target.include?(association)
+
-                when :has_one
-                  return if record.id.to_s != join.parent.record_id(row).to_s