Changeset 2748

Timestamp:

10/26/05 13:20:02 (3 years ago)

Author:

david

Message:

Added :offset and :limit to the kinds of options that Base.constrain can use (closes #2466) [duane.johnson@gmail.com]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (2 diffs)
• trunk/activerecord/test/base_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added :offset and :limit to the kinds of options that Base.constrain can use #2466 [duane.johnson@gmail.com]
-
-* Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [schoenm@earthlink.net]

trunk/activerecord/lib/active_record/base.rb

@@ -810 +810 @@
-      
-      # Add constraints to all queries to the same model in the given block.
-
+
+
-      #
-      #   Article.constrain(:conditions => "blog_id = 1") do
@@ -884 +885 @@
-
-        def add_limit!(sql, options)
+          options[:limit]  ||= scope_constraints[:limit]  if scope_constraints[:limit]
+          options[:offset] ||= scope_constraints[:offset] if scope_constraints[:offset]
-          connection.add_limit_offset!(sql, options)
-        end

trunk/activerecord/test/base_test.rb

@@ -1040 +1040 @@
-  end
-
+  def test_constrain_conditions
+    developers = Developer.constrain(:conditions => 'salary > 90000') do
+      Developer.find(:all, :conditions => 'id < 5')
+    end
+    david = Developer.find(1)
+    assert !developers.include?(david) # David's salary is less than 90,000
+    assert_equal 3, developers.size
+  end
+  
+  def test_constrain_limit_offset
+    developers = Developer.constrain(:limit => 3, :offset => 2) do
+      Developer.find(:all, :order => 'id')
+    end    
+    david = Developer.find(1)
+    jamis = Developer.find(1)
+    assert !developers.include?(david) # David has id 1
+    assert !developers.include?(jamis) # Jamis has id 2
+    assert_equal 3, developers.size
+    
+    # Now test without constraints to make sure we get the whole thing
+    developers = Developer.find(:all, :order => 'id')
+    assert_equal 10, developers.size
+  end
+  
-  # FIXME: this test ought to run, but it needs to run sandboxed so that it
-  # doesn't b0rk the current test environment by undefing everything.