Changeset 4274

Timestamp:

04/26/06 06:37:04 (2 years ago)

Author:

marcel

Message:

Add support for :order option to with_scope. Closes #3887. [eric.daspet@survol.net]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add support for :order option to with_scope. Closes #3887. [eric.daspet@survol.net]
-
-* Prettify output of schema_dumper by making things line up. Closes #4241 [Caio  Chassot <caio@v2studio.com>]

trunk/activerecord/lib/active_record/base.rb

@@ -838 +838 @@
-
-        if f = method_scoping[:find]
-
+order, :
-          f[:readonly] = true if !f[:joins].blank? && !f.has_key?(:readonly)
-        end
@@ -1013 +1013 @@
-
-          sql << " GROUP BY #{options[:group]} " if options[:group]
-
-
+
+
-          add_limit!(sql, options, scope)
-
@@ -1034 +1034 @@
-          else
-            [o]
+          end
+        end
+
+        def add_order!(sql, order)
+          if order
+            sql << " ORDER BY #{order}"
+            sql << ", #{scope(:find, :order)}" if scoped?(:find, :order)
+          else
+            sql << " ORDER BY #{scope(:find, :order)}" if scoped?(:find, :order)
-          end
-        end

trunk/activerecord/test/base_test.rb

@@ -1165 +1165 @@
-  end
-
+  def test_scoped_find_order   
+    # Test order in scope   
+    scoped_developers = Developer.with_scope(:find => { :limit => 1, :order => 'salary DESC' }) do
+      Developer.find(:all)
+    end   
+    assert_equal 'Jamis', scoped_developers.first.name
+    assert scoped_developers.include?(developers(:jamis))
+    # Test scope without order and order in find
+    scoped_developers = Developer.with_scope(:find => { :limit => 1 }) do
+      Developer.find(:all, :order => 'salary DESC')
+    end   
+    # Test scope order + find order, find has priority
+    scoped_developers = Developer.with_scope(:find => { :limit => 3, :order => 'id DESC' }) do
+      Developer.find(:all, :order => 'salary ASC')
+    end
+    assert scoped_developers.include?(developers(:poor_jamis))
+    assert scoped_developers.include?(developers(:david))
+    assert scoped_developers.include?(developers(:dev_10))
+    # Test without scoped find conditions to ensure we get the right thing
+    developers = Developer.find(:all, :order => 'id', :limit => 1)
+    assert scoped_developers.include?(developers(:david))
+  end
+
-  def test_base_class
-    assert LoosePerson.abstract_class?