Changeset 4758

Timestamp:

08/14/06 07:19:47 (2 years ago)

Author:

bitsweat

Message:

Fix for deep includes on the same association.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (2 diffs)
• trunk/activerecord/test/associations_cascaded_eager_loading_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/mixin.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/mixins.yml (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix for deep includes on the same association. [richcollins@gmail.com]
-
-* Tweak fixtures so they don't try to use a non-ActiveRecord class.  [Kevin Clark]

trunk/activerecord/lib/active_record/associations.rb

@@ -1394 +1394 @@
-              unless join_dependency.table_aliases[aliased_table_name].zero?
-                # if the table name has been used, then use an alias
-active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}"
+cascade_alias
-                table_index = join_dependency.table_aliases[aliased_table_name]
+                join_dependency.table_aliases[@aliased_table_name] += 1
-                @aliased_table_name = @aliased_table_name[0..active_record.connection.table_alias_length-3] + "_#{table_index+1}" if table_index > 0
-
-
+
+
+
-              
-              if reflection.macro == :has_and_belongs_to_many || (reflection.macro == :has_many && reflection.options[:through])
@@ -1530 +1532 @@
-                instance_eval("%@#{sql.gsub('@', '\@')}@")
-              end
+              
+            private
+              def cascade_alias
+                active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}"
+              end
-          end
-        end

trunk/activerecord/test/associations_cascaded_eager_loading_test.rb

@@ -104 +104 @@
-    end
-  end
+  
+  def test_eager_association_loading_with_recursive_cascaded_three_levels
+    root_node = RecursivelyCascadedTreeMixin.find(:first, :include=>{:children=>{:children=>:children}}, :order => 'mixins.id')
+    assert_equal mixins(:recursively_cascaded_tree_4), assert_no_queries { root_node.children.first.children.first.children.first }
+  end
-end

trunk/activerecord/test/fixtures/mixin.rb

@@ -9 +9 @@
-class TreeMixinWithoutOrder < Mixin
-    acts_as_tree :foreign_key => "parent_id"
+end
+
+class RecursivelyCascadedTreeMixin < Mixin
+  acts_as_tree :foreign_key => "parent_id"
-end
-

trunk/activerecord/test/fixtures/mixins.yml

@@ -39 +39 @@
-  type: TreeMixinWithoutOrder
-  parent_id:
+
+recursively_cascaded_tree_1:
+  id: 5005
+  type: RecursivelyCascadedTreeMixin
+  parent_id:
+
+recursively_cascaded_tree_2:
+  id: 5006
+  type: RecursivelyCascadedTreeMixin
+  parent_id: 5005
+
+recursively_cascaded_tree_3:
+  id: 5007
+  type: RecursivelyCascadedTreeMixin
+  parent_id: 5006
+
+recursively_cascaded_tree_4:
+  id: 5008
+  type: RecursivelyCascadedTreeMixin
+  parent_id: 5007
-
-# List mixins