Active Record: fix stripping ORDER clause in paginate_by_sql

Closes mislav#120
calvincorreli · Sep 27, 2011 · 370c97b · 370c97b
1 parent 465eda2
commit 370c97b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/will_paginate/active_record.rb b/lib/will_paginate/active_record.rb
@@ -177,7 +177,7 @@ def paginate_by_sql(sql, options)
           pager.replace find_by_sql(query)
 
           unless pager.total_entries
-            count_query = original_query.sub /\bORDER\s+BY\s+[\w`,\s]+$/mi, ''
+            count_query = original_query.sub /\bORDER\s+BY\s+[\w`,\s.]+$/mi, ''
             count_query = "SELECT COUNT(*) FROM (#{count_query})"
 
             unless self.connection.adapter_name =~ /^(oracle|oci$)/i

diff --git a/spec/finders/active_record_spec.rb b/spec/finders/active_record_spec.rb
@@ -228,12 +228,15 @@
 
     it "should strip the order when counting" do
       lambda {
-        sql = "select id, title, content from topics order by title"
+        sql = "select id, title, content from topics order by topics.title"
         topics = Topic.paginate_by_sql sql, :page => 1, :per_page => 2
         topics.first.should == topics(:ar)
       }.should run_queries(2)
+
+      $query_sql.last.should include('COUNT')
+      $query_sql.last.should_not include('order by topics.title')
     end
-    
+
     it "shouldn't change the original query string" do
       query = 'select * from topics where 1 = 2'
       original_query = query.dup