Merge branch 'dm-fix-mysql-failure' into 'master'

Fix MySQL build failure Closes #32106 See merge request !11277

Merge branch 'dm-fix-mysql-failure' into 'master'
Fix MySQL build failure Closes #32106 See merge request !11277
667005d5 · Sean McGivern · 934e8d1a · 965b4176 · 667005d5 · 667005d5
--- a/db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
+++ b/db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
@@ -30,7 +30,7 @@ def down
  private

  def pending_delete_batch
-    connection.exec_query(find_batch).map{ |row| row['id'] }
+    connection.exec_query(find_batch).map{ |row| row['id'].to_i }
  end

  BATCH_SIZE = 5000

--- a/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
+++ b/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
@@ -15,7 +15,7 @@
      project = build(:empty_project, pending_delete: true, namespace_id: nil)
      project.save(validate: false)

-      expect(NamespacelessProjectDestroyWorker).to receive(:bulk_perform_async).with([[project.id.to_s]])
+      expect(NamespacelessProjectDestroyWorker).to receive(:bulk_perform_async).with([[project.id]])

      described_class.new.up
    end