Permalink
Browse files

Private ActiveRecord methods add_limit, add_joins, and add_conditions…

… take an OPTIONAL third argument 'scope' (closes #4456) [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4129 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
technoweenie committed Apr 1, 2006
1 parent eefc22f commit a3f20132dbdedefd1d0ac6c419df7d0af0dff638
Showing with 11 additions and 4 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +9 −4 activerecord/lib/active_record/base.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick]
+
* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [DHH]
* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [DHH]
@@ -1036,21 +1036,26 @@ def safe_to_array(o)
end
end
- def add_limit!(sql, options, scope)
- if scope
+ # The optional scope argument is for the current :find scope.
+ def add_limit!(sql, options, scope = nil)
+ if scope ||= scope(:find)
options[:limit] ||= scope[:limit]
options[:offset] ||= scope[:offset]
end
connection.add_limit_offset!(sql, options)
end
- def add_joins!(sql, options, scope)
+ # The optional scope argument is for the current :find scope.
+ def add_joins!(sql, options, scope = nil)
+ scope ||= scope(:find)
join = (scope && scope[:joins]) || options[:joins]
sql << " #{join} " if join
end
# Adds a sanitized version of +conditions+ to the +sql+ string. Note that the passed-in +sql+ string is changed.
- def add_conditions!(sql, conditions, scope)
+ # The optional scope argument is for the current :find scope.
+ def add_conditions!(sql, conditions, scope = nil)
+ scope ||= scope(:find)
segments = []
segments << sanitize_sql(scope[:conditions]) if scope && scope[:conditions]
segments << sanitize_sql(conditions) unless conditions.nil?

0 comments on commit a3f2013

Please sign in to comment.