rails_pagination 2.0.7 → 2.0.8

data/lib/rails_pagination/active_record/base.rb

@@ -3,13 +3,16 @@ module RailsPagination
     module Base
 
       def inherited(subclass)
-        if subclass.superclass == ::ActiveRecord::Base
-          subclass.scope :page, Proc.new {|number|
-            subclass.limit(subclass.default_per_page).offset(subclass.default_per_page * ([number.to_i, 1].max - 1))
-          } do
-            include RailsPagination::ActiveRecord::Relation
+        subclass.class_eval do
+          if superclass == ::ActiveRecord::Base
+            scope :page, Proc.new { |number|
+              limit(default_per_page).offset(default_per_page * ([number.to_i, 1].max - 1))
+            } do
+              include RailsPagination::ActiveRecord::Relation
+            end
           end
-        end       
+        end
+        super
       end
 
       def default_per_page(value=nil)

data/lib/rails_pagination/active_record/relation.rb

@@ -17,8 +17,7 @@ module RailsPagination
         @total_count ||= begin
           c = except(:offset, :limit, :order)
           c = c.except(:includes) unless references_eager_loaded_tables?
-          uses_distinct_sql_statement = c.to_sql =~ /DISTINCT/i
-          if uses_distinct_sql_statement
+          if c.to_sql =~ /DISTINCT/i
             c.length
           else
             c = c.count

data/lib/rails_pagination/version.rb

@@ -1,5 +1,5 @@
 module RailsPagination
 
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 
 end