diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb index 327ef118d..6101a934c 100644 --- a/lib/danbooru/paginator/active_record_extension.rb +++ b/lib/danbooru/paginator/active_record_extension.rb @@ -73,6 +73,12 @@ module Danbooru c = c.reorder(nil) c = c.count c.respond_to?(:count) ? c.count : c + rescue ActiveRecord::StatementInvalid => e + if e.to_s =~ /statement timeout/ + 1_000_000 + else + raise + end end end end