1
0
Fork 0
mirror of https://github.com/kaminari/kaminari.git synced 2022-11-09 13:44:37 -05:00
avoiding block + return
This commit is contained in:
Akira Matsuda 2011-12-12 02:33:24 +09:00
parent 21462b06e1
commit 83ce8a456f

View file

@ -19,14 +19,15 @@ module Kaminari
# Remove includes only if they are irrelevant
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
uses_distinct_sql_statement = c.to_sql =~ /DISTINCT/i
if uses_distinct_sql_statement
return c.length
c.length
else
# .group returns an OrderdHash that responds to #count
c = c.count
c.respond_to?(:count) ? c.count : c
end
# .group returns an OrderdHash that responds to #count
c = c.count
c.respond_to?(:count) ? c.count : c
end
end
end