kotovalexarian-likes-github/kaminari--kaminari
1
0
Fork 0
mirror of https://github.com/kaminari/kaminari.git synced 2022-11-09 13:44:37 -05:00
Code Releases Activity

Remove workaround now that total_count allows options passthrough

Browse source
This commit is contained in:
Ben Simpson 2012-05-04 14:54:22 -04:00 committed by Ben Simpson
parent 83b1ff13e3
commit 8e0d22b0da
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/kaminari/models/active_record_relation_methods.rb
View file

@ -16,15 +16,9 @@ module Kaminari
# Remove includes only if they are irrelevant # Remove includes only if they are irrelevant
c = c.except(:includes) unless references_eager_loaded_tables? c = c.except(:includes) unless references_eager_loaded_tables?
# a workaround to count the actual model instances on distinct query because count + distinct returns wrong value in some cases. see https://github.com/amatsuda/kaminari/pull/160 # .group returns an OrderdHash that responds to #count
uses_distinct_sql_statement = c.to_sql =~ /DISTINCT/i c = c.count(column_name, options)
if uses_distinct_sql_statement c.respond_to?(:count) ? c.count(column_name, options) : c
c.length
else
# .group returns an OrderdHash that responds to #count
c = c.count(column_name, options)
c.respond_to?(:count) ? c.count(column_name, options) : c
end
end end
end end
end end