Permalink
Browse files

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

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8270 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 0aec242 commit a5fded3e88147769f4461d36bd60764ebcb95bc3 @dhh dhh committed Dec 5, 2007
Showing with 12 additions and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/associations.rb
  2. +11 −0 activerecord/test/associations/eager_test.rb
@@ -1247,7 +1247,7 @@ def select_all_rows(options, join_dependency)
def construct_finder_sql_with_included_associations(options, join_dependency)
scope = scope(:find)
- sql = "SELECT #{column_aliases(join_dependency)} FROM #{connection.quote_table_name((scope && scope[:from]) || options[:from] || table_name)} "
+ sql = "SELECT #{column_aliases(join_dependency)} FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
sql << join_dependency.join_associations.collect{|join| join.association_join }.join
add_joins!(sql, options, scope)
@@ -37,6 +37,17 @@ def test_with_ordering
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
+
def test_loading_with_multiple_associations
posts = Post.find(:all, :include => [ :comments, :author, :categories ], :order => "posts.id")
assert_equal 2, posts.first.comments.size

0 comments on commit a5fded3

Please sign in to comment.