Ticket #7147: options_select_working_with_eager_loading.diff

test/associations/eager_test.rb

@@ -390 +390 @@
-      assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "length(comments.body) > 15")
-    end
-  end
+
+  def test_select_with_include
+    posts = Post.find(:all, :select => "title")
+    assert_equal ["title"], posts[0].attributes.keys
+    posts = Post.find(:all, :include => :comments)
+    post = posts.find { |p| p.id == 1 }
+    assert_equal 2, post.comments.size
+    assert post.comments.include?(comments(:greetings))
+    post = Post.find(:first, :include => :comments, :conditions => "posts.title = 'Welcome to the weblog'")
+    assert_equal 2, post.comments.size
+    assert_equal ["title", "body", "taggings_count", "type", "id", "author_id"].to_set, post.attributes.keys.to_set
+    post.comments.each do |comment|
+      assert_equal ["body", "type", "post_id", "id"].to_set, comment.attributes.keys.to_set
+    end
+    post = Post.find(:first, :include => :comments, :select => 'posts.id, posts.title' ,:conditions => "posts.title = 'Welcome to the weblog'")
+    assert_equal 2, post.comments.size
+    assert_equal ["title", "id"].to_set, post.attributes.keys.to_set
+    post.comments.each do |comment|
+      assert_equal ["id"].to_set, comment.attributes.keys.to_set
+    end
+    post = Post.find(:first, :include => :comments, :select => 'posts.id, posts.title, comments.body, comments.type' ,:conditions => "posts.title = 'Welcome to the weblog'")
+    assert_equal 2, post.comments.size
+    assert_equal ["title", "id"].to_set, post.attributes.keys.to_set
+    post.comments.each do |comment|
+      assert_equal ["id", "body", "type"].to_set, comment.attributes.keys.to_set
+    end
+    post = Post.find(:first, :include => :comments, :select => 'posts.*, comments.body, comments.type' ,:conditions => "posts.title = 'Welcome to the weblog'")
+    assert_equal 2, post.comments.size
+    assert_equal ["title", "body", "taggings_count", "type", "id", "author_id"].to_set, post.attributes.keys.to_set
+    post.comments.each do |comment|
+      assert_equal ["body", "type", "post_id", "id"].to_set, comment.attributes.keys.to_set
+    end
+  end
-end

lib/active_record/associations.rb

@@ -1227 +1227 @@
-
-        def construct_finder_sql_with_included_associations(options, join_dependency)
-          scope = scope(:find)
-
+, options
-          sql << join_dependency.join_associations.collect{|join| join.association_join }.join
- 
-          add_joins!(sql, options, scope)
@@ -1315 +1315 @@
-          reflections.reject { |r| [ :belongs_to, :has_one ].include?(r.macro) }.length.zero?
-        end
-
-
-
-
+, options = {}
+(options)
+ 
-        end
-
-        def add_association_callbacks(association_name, options)
@@ -1472 +1472 @@
-              active_record.table_name
-            end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-              unless @column_names_with_alias
-                @column_names_with_alias = []
-                ([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
-
+
+
+
-                end
-              end
-              return @column_names_with_alias