Permalink
Browse files

Fix typo of 'constrains' to 'contraints'. Closes #2069.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2510 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 89733ea commit f4d1af3085cbe95cd8363fae86696a723122c195 Marcel Molina committed Oct 9, 2005
Showing with 20 additions and 14 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +17 −13 activerecord/lib/active_record/base.rb
  3. +1 −1 activerecord/test/conditions_scoping_test.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fix typo of 'constrains' to 'contraints'. #2069. [Michael Schuerig <michael@schuerig.de>]
+
* Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. [skaes@web.de]
* Add ability to get all siblings, including the current child, with acts_as_tree. Recloses #2140. [Michael Schuerig <michael@schuerig.de>]
@@ -758,18 +758,18 @@ def silence
logger.level = old_logger_level if logger
end
- # Add constrains to all queries to the same model in the given block.
- # Currently supported constrains are <tt>:conditions</tt> and <tt>:joins</tt>
+ # Add constraints to all queries to the same model in the given block.
+ # Currently supported constraints are <tt>:conditions</tt> and <tt>:joins</tt>
#
# Article.constrain(:conditions => "blog_id = 1") do
# Article.find(1) # => SELECT * from articles WHERE blog_id = 1 AND id = 1
# end
def constrain(options = {}, &block)
begin
- self.scope_constrains = options
+ self.scope_constraints = options
block.call if block_given?
ensure
- self.scope_constrains = nil
+ self.scope_constraints = nil
end
end
@@ -823,13 +823,13 @@ def add_limit!(sql, options)
end
def add_joins!(sql, options)
- join = scope_constrains[:joins] || options[:joins]
+ join = scope_constraints[:joins] || options[:joins]
sql << " #{join} " if join
end
# Adds a sanitized version of +conditions+ to the +sql+ string. Note that it's the passed +sql+ string is changed.
def add_conditions!(sql, conditions)
- condition_segments = [scope_constrains[:conditions]]
+ condition_segments = [scope_constraints[:conditions]]
condition_segments << sanitize_sql(conditions) unless conditions.nil?
condition_segments << type_condition unless descends_from_active_record?
condition_segments.compact!
@@ -918,15 +918,19 @@ def subclasses
@@subclasses[self] + extra = @@subclasses[self].inject([]) {|list, subclass| list + subclass.subclasses }
end
- def scope_constrains
- Thread.current[:constrains] ||= {}
- Thread.current[:constrains][self] ||= {}
+ def scope_constraints
+ Thread.current[:constraints] ||= {}
+ Thread.current[:constraints][self] ||= {}
end
-
- def scope_constrains=(value)
- Thread.current[:constrains] ||= {}
- Thread.current[:constrains][self] = value
+ # backwards compatibility
+ alias_method :scope_constrains, :scope_constraints
+
+ def scope_constraints=(value)
+ Thread.current[:constraints] ||= {}
+ Thread.current[:constraints][self] = value
end
+ # backwards compatibility
+ alias_method :scope_constrains=, :scope_constraints=
# Returns the class type of the record using the current module as a prefix. So descendents of
# MyApp::Business::Account would be appear as MyApp::Business::AccountSubclass.
@@ -9,7 +9,7 @@ class ConditionsScopingTest < Test::Unit::TestCase
def test_set_conditions
Developer.constrain(:conditions => 'just a test...') do
- assert_equal 'just a test...', Thread.current[:constrains][Developer][:conditions]
+ assert_equal 'just a test...', Thread.current[:constraints][Developer][:conditions]
end
end

0 comments on commit f4d1af3

Please sign in to comment.