TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ensure supplie :from has precedence over scoped :from [#1370 state:resolved]

Browse Source
This commit is contained in:
Pratik Naik 2009-03-06 18:36:30 +00:00
parent c896d56c6e
commit 4863634a15
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/base.rb
View File

@ -1690,7 +1690,7 @@ def default_select(qualified)
def construct_finder_sql(options)
scope = scope(:find)
sql = "SELECT #{options[:select] || (scope && scope[:select]) || default_select(options[:joins] || (scope && scope[:joins]))} "
sql << "FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
sql << "FROM #{options[:from] || (scope && scope[:from]) || quoted_table_name} "
add_joins!(sql, options[:joins], scope)
add_conditions!(sql, options[:conditions], scope)

8
activerecord/test/cases/finder_test.rb
View File

@ -1057,6 +1057,14 @@ def test_with_limiting_with_custom_select
assert_equal [0, 1, 1], posts.map(&:author_id).sort
end
def test_finder_with_scoped_from
all_topics = Topic.all
Topic.with_scope(:find => { :from => 'fake_topics' }) do
assert_equal all_topics, Topic.all(:from => 'topics')
end
end
protected
def bind(statement, *vars)
if vars.first.is_a?(Hash)