Permalink
Browse files

Ensure supplie :from has precedence over scoped :from [#1370 state:re…

…solved]
  • Loading branch information...
1 parent c896d56 commit 4863634a157a8e4a0033734617253b42325daf34 @lifo lifo committed Mar 6, 2009
Showing with 9 additions and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/base.rb
  2. +8 −0 activerecord/test/cases/finder_test.rb
@@ -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)
@@ -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)

2 comments on commit 4863634

jwulff commented on 4863634 Mar 6, 2009

Fantastic, thanks for committing.

http://rails.lighthouseapp.com/projects/8994/tickets/1370-activerecordbaseconstruct_finder_sql-gives-scopefrom-precedence-over-optionsfrom

Really glad to see this make it in, thanks!

http://rails.lighthouseapp.com/projects/8994/tickets/1370-activerecordbaseconstruct_finder_sql-gives-scopefrom-precedence-over-optionsfrom

Please sign in to comment.