Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix has many through not quoting table names [rails#1163 state:resolved]
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
  • Loading branch information
Karthik Krishnan authored and lifo committed Dec 20, 2008
1 parent c092dbe commit 75a133f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/associations.rb
Expand Up @@ -2198,7 +2198,7 @@ def association_join
protected

def aliased_table_name_for(name, suffix = nil)
if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{name.downcase}\son}
if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{active_record.connection.quote_table_name name.downcase}\son}
@join_dependency.table_aliases[name] += 1
end

Expand Down
Expand Up @@ -160,9 +160,9 @@ def construct_joins(custom_joins = nil)
end

"INNER JOIN %s ON %s.%s = %s.%s %s #{@reflection.options[:joins]} #{custom_joins}" % [
@reflection.through_reflection.table_name,
@reflection.table_name, reflection_primary_key,
@reflection.through_reflection.table_name, source_primary_key,
@reflection.through_reflection.quoted_table_name,
@reflection.quoted_table_name, reflection_primary_key,
@reflection.through_reflection.quoted_table_name, source_primary_key,
polymorphic_join
]
end
Expand Down
Expand Up @@ -204,6 +204,10 @@ def test_count_with_include_should_alias_join_table
assert_equal 2, people(:michael).posts.count(:include => :readers)
end

def test_inner_join_with_quoted_table_name
assert_equal 2, people(:michael).jobs.size
end

def test_get_ids
assert_equal [posts(:welcome).id, posts(:authorless).id].sort, people(:michael).post_ids.sort
end
Expand Down

0 comments on commit 75a133f

Please sign in to comment.