Merge remote-tracking branch 'upstream/master'

2017-10-11 21:27:17 +02:00
parent 3cc6255a7e 6bc07d3de3
commit 0bf9261e65
12 changed files with 64 additions and 39 deletions
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -335,7 +335,10 @@ module Mastodon

      start_arel = table.project(table[:id]).order(table[:id].asc).take(1)
      start_arel = yield table, start_arel if block_given?
-      start_id = exec_query(start_arel.to_sql).to_hash.first['id'].to_i
+      first_row = exec_query(start_arel.to_sql).to_hash.first
+      # In case there are no rows but we didn't catch it in the estimated size:
+      return unless first_row
+      start_id = first_row['id'].to_i
      
      say "Migrating #{table_name}.#{column} (~#{total.to_i} rows)"