Changeset 4776

Timestamp:

08/16/06 18:10:52 (3 years ago)

Author:

bitsweat

Message:

Included associations: go deep.

Files:

• trunk/activerecord/lib/active_record/associations.rb (modified) (5 diffs)
• trunk/activerecord/test/associations_cascaded_eager_loading_test.rb (modified) (3 diffs)
• trunk/activerecord/test/fixtures/db_definitions/schema.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/edge.rb (added)
• trunk/activerecord/test/fixtures/edges.yml (added)
• trunk/activerecord/test/fixtures/mixin.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/vertex.rb (added)
• trunk/activerecord/test/fixtures/vertices.yml (added)

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
-cascade_alias
+active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}"
-                table_index = join_dependency.table_aliases[aliased_table_name]
-@
+
-                @aliased_table_name = @aliased_table_name[0..active_record.connection.table_alias_length-3] + "_#{table_index+1}" if table_index > 0
-              else
@@ -1407 +1407 @@
-                  @aliased_join_table_name = active_record.connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}_join"
-                  table_index = join_dependency.table_aliases[aliased_join_table_name]
+                  join_dependency.table_aliases[aliased_join_table_name] += 1
-                  @aliased_join_table_name = @aliased_join_table_name[0..active_record.connection.table_alias_length-3] + "_#{table_index+1}" if table_index > 0
+                else
+                  join_dependency.table_aliases[aliased_join_table_name] += 1
-                end
-                join_dependency.table_aliases[aliased_join_table_name] += 1
-              end
-            end
@@ -1420 +1422 @@
-                     aliased_join_table_name,
-                     options[:foreign_key] || reflection.active_record.to_s.classify.foreign_key,
-reflection.active_record.
+parent.aliased_
-                  " LEFT OUTER JOIN %s ON %s.%s = %s.%s " % [
-                     table_name_and_alias, aliased_table_name, klass.primary_key,
@@ -1458 +1460 @@
-                            when :belongs_to
-                              first_key  = primary_key
-
+source_reflection.
-                            when :has_many
-                              first_key  = through_reflection.klass.to_s.classify.foreign_key
-                              second_key = options[:foreign_key] || primary_key
-                          end
-                          
-                          " LEFT OUTER JOIN %s ON %s.%s = %s.%s "  % [
-aliased_join_table_name,
-
+
+aliased_join_table_name, 
-                            parent.aliased_table_name, parent.primary_key] +
-                          " LEFT OUTER JOIN %s ON %s.%s = %s.%s " % [
@@ -1532 +1533 @@
-                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

@@ -12 +12 @@
-
-class CascadedEagerLoadingTest < Test::Unit::TestCase
-categorizations, :
+
-
-  def test_eager_association_loading_with_cascaded_two_levels
@@ -95 +95 @@
-    end
-  end
-
+
-  def test_eager_association_loading_of_stis_with_multiple_references
-    authors = Author.find(:all, :include => { :posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } } }, :order => 'comments.body, very_special_comments_posts.body', :conditions => 'posts.id = 4')
@@ -104 +104 @@
-    end
-  end
-
-ed_three_levels
+
+ing_three_levels_has_many
-    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
+
+  def test_eager_association_loading_with_recursive_cascading_three_levels_has_one
+    root_node = RecursivelyCascadedTreeMixin.find(:first, :include=>{:first_child=>{:first_child=>:first_child}}, :order => 'mixins.id')
+    assert_equal mixins(:recursively_cascaded_tree_4), assert_no_queries { root_node.first_child.first_child.first_child }
+  end
+
+  def test_eager_association_loading_with_recursive_cascading_three_levels_belongs_to
+    leaf_node = RecursivelyCascadedTreeMixin.find(:first, :include=>{:parent=>{:parent=>:parent}}, :order => 'mixins.id DESC')
+    assert_equal mixins(:recursively_cascaded_tree_1), assert_no_queries { leaf_node.parent.parent.parent }
+  end
-end
+
+
+require 'fixtures/vertex'
+require 'fixtures/edge'
+class CascadedEagerLoadingTest < Test::Unit::TestCase
+  fixtures :edges, :vertices
+
+  def test_eager_association_loading_with_recursive_cascading_four_levels_has_many_through
+    source = Vertex.find(:first, :include=>{:sinks=>{:sinks=>{:sinks=>:sinks}}}, :order => 'vertices.id')
+    assert_equal vertices(:vertex_4), assert_no_queries { source.sinks.first.sinks.first.sinks.first }
+  end
+
+  def test_eager_association_loading_with_recursive_cascading_four_levels_has_and_belongs_to_many
+    sink = Vertex.find(:first, :include=>{:sources=>{:sources=>{:sources=>:sources}}}, :order => 'vertices.id DESC')
+    assert_equal vertices(:vertex_1), assert_no_queries { sink.sources.first.sources.first.sources.first.sources.first }
+  end
+end

trunk/activerecord/test/fixtures/db_definitions/schema.rb

@@ -40 +40 @@
-    t.column :favorite_author_id, :integer
-  end
+
+  create_table :vertices, :force => true do |t|
+    t.column :label, :string
+  end
+
+  create_table :edges, :force => true do |t|
+    t.column :source_id, :integer, :null => false
+    t.column :sink_id,   :integer, :null => false
+  end
+  add_index :edges, [:source_id, :sink_id], :unique => true
-end

trunk/activerecord/test/fixtures/mixin.rb

@@ -13 +13 @@
-class RecursivelyCascadedTreeMixin < Mixin
-  acts_as_tree :foreign_key => "parent_id"
+  has_one :first_child, :class_name => 'RecursivelyCascadedTreeMixin', :foreign_key => :parent_id
-end
-