Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Moved the * strings out of construct_finder_sql to a new default_sele…

…ct method so it can be overridden by plugins cleanly

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1371 state:resolved]
  • Loading branch information...
commit 789a3f5b035fd293a9e235672a97b683a56ba0c3 1 parent d3fd997
@willbryant willbryant authored NZKoz committed
Showing with 9 additions and 1 deletion.
  1. +9 −1 activerecord/lib/active_record/base.rb
View
10 activerecord/lib/active_record/base.rb
@@ -1612,9 +1612,17 @@ def type_name_with_module(type_name)
end
end
+ def default_select(qualified)
+ if qualified
+ quoted_table_name + '.*'
+ else
+ '*'
+ end
+ end
+
def construct_finder_sql(options)
scope = scope(:find)
- sql = "SELECT #{options[:select] || (scope && scope[:select]) || ((options[:joins] || (scope && scope[:joins])) && quoted_table_name + '.*') || '*'} "
+ sql = "SELECT #{options[:select] || (scope && scope[:select]) || default_select(options[:joins] || (scope && scope[:joins]))} "
sql << "FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
add_joins!(sql, options[:joins], scope)
Please sign in to comment.
Something went wrong with that request. Please try again.