Merge branch 'main' into glitch-soc/merge-upstream

2022-01-31 10:42:17 +01:00
parent b54e263712 aa45404578
commit 2fcf652fff
5 changed files with 223 additions and 5 deletions
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -295,7 +295,7 @@ module Mastodon
      table = Arel::Table.new(table_name)

      total = estimate_rows_in_table(table_name).to_i
-      if total == 0
+      if total < 1
        count_arel = table.project(Arel.star.count.as('count'))
        count_arel = yield table, count_arel if block_given?