kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

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

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8270 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2007-12-05 02:30:30 +00:00
parent 0aec2423ed
commit a5fded3e88
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/associations.rb
View file

@ -1247,7 +1247,7 @@ module ActiveRecord
def construct_finder_sql_with_included_associations(options, join_dependency) def construct_finder_sql_with_included_associations(options, join_dependency)
scope = scope(:find) 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 sql << join_dependency.join_associations.collect{|join| join.association_join }.join
add_joins!(sql, options, scope) add_joins!(sql, options, scope)

11
activerecord/test/associations/eager_test.rb
View file

@ -37,6 +37,17 @@ class EagerAssociationTest < Test::Unit::TestCase
end end
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 def test_loading_with_multiple_associations
posts = Post.find(:all, :include => [ :comments, :author, :categories ], :order => "posts.id") posts = Post.find(:all, :include => [ :comments, :author, :categories ], :order => "posts.id")
assert_equal 2, posts.first.comments.size assert_equal 2, posts.first.comments.size