Changeset 8270

Timestamp:

12/05/07 02:30:30 (5 months ago)

Author:

david

Message:

Fix that options[:from] table names should never be quoted [DHH]

Files:

• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/test/associations/eager_test.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/associations.rb

@@ -1248 +1248 @@
-        def construct_finder_sql_with_included_associations(options, join_dependency)
-          scope = scope(:find)
-connection.quote_table_name((scope && scope[:from]) || options[:from] || table_name)
+(scope && scope[:from]) || options[:from] || quoted_table_name
-          sql << join_dependency.join_associations.collect{|join| join.association_join }.join
- 

trunk/activerecord/test/associations/eager_test.rb

@@ -36 +36 @@
-      assert_equal posts(post), list[index]
-    end
+  end
+
+  def test_with_two_tables_in_from_without_getting_double_quoted
+    posts = Post.find(:all,
+      :select     => "posts.*",
+      :from       => "posts, authors",
+      :include    => :comments,
+      :conditions => "posts.author_id = authors.id"
+    )
+
+    assert_equal 2, posts.first.comments.size
-  end
-