Permalink
Browse files

Correct handling of complex order clauses with SQL Server limit emula…

…tion. Closes #2770.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2943 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 86aaa6e commit 97f418ce022da6b5da9cf24779932820e947414d @jeremy jeremy committed Nov 8, 2005
@@ -1,5 +1,7 @@
*SVN*
+* Correct handling of complex order clauses with SQL Server limit emulation. #2770 [Tom Ward <tom@popdog.net>, Matt B.]
+
* Correct whitespace problem in Oracle default column value parsing. #2788 [rick@rickbradley.com]
* Destroy associated has_and_belongs_to_many records after all before_destroy callbacks but before destroy. This allows you to act on the habtm association as you please while preserving referential integrity. #2065 [larrywilliams1@gmail.com, sam.kirchmeier@gmail.com, elliot@townx.org, Jeremy Kemper]
@@ -478,7 +478,7 @@ def change_order_direction(order)
case order
when /DESC/i then order.gsub(/DESC/i, "ASC")
when /ASC/i then order.gsub(/ASC/i, "DESC")
- else String.new(order).insert(-1, " DESC")
+ else String.new(order).split(',').join(' DESC,') + ' DESC'
end
end
@@ -325,6 +325,16 @@ def test_find_all_with_limit_and_offset
assert_equal 'fixture_9', last_two_developers.first.name
end
+ def test_find_all_with_limit_and_offset_and_multiple_order_clauses
+ first_three_posts = Post.find :all, :order => 'author_id, id', :limit => 3, :offset => 0
+ second_three_posts = Post.find :all, :order => ' author_id,id ', :limit => 3, :offset => 3
+ last_posts = Post.find :all, :order => ' author_id, id ', :limit => 3, :offset => 6
+
+ assert_equal [[0,3],[1,1],[1,2]], first_three_posts.map { |p| [p.author_id, p.id] }
+ assert_equal [[1,4],[1,5],[1,6]], second_three_posts.map { |p| [p.author_id, p.id] }
+ assert_equal [[2,7]], last_posts.map { |p| [p.author_id, p.id] }
+ end
+
def test_find_all_with_join
developers_on_project_one = Developer.find(
:all,

0 comments on commit 97f418c

Please sign in to comment.