1 files changed, 6 insertions, 1 deletions
diff --git a/db/post_migrate/20190829131947_backfill_release_name_with_tag.rb b/db/post_migrate/20190829131947_backfill_release_name_with_tag.rb
index 0f4996cc695..a2a4f80b38f 100644
--- a/db/post_migrate/20190829131947_backfill_release_name_with_tag.rb
+++ b/db/post_migrate/20190829131947_backfill_release_name_with_tag.rb
@@ -8,11 +8,16 @@ class BackfillReleaseNameWithTag < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up
-    subquery = Arel.sql("select id from projects where visibility_level = #{Gitlab::VisibilityLevel::PUBLIC}")
+    table = Project.arel_table
+    subquery = table.project(table[:id]).where(table[:visibility_level].eq(Gitlab::VisibilityLevel::PUBLIC))
 
     update_column_in_batches(:releases, :name, Release.arel_table[:tag]) do |table, query|
       query.where(table[:name].eq(nil)).where(table[:project_id].in(subquery))
     end
+
+    update_column_in_batches(:releases, :name, Arel.sql("'release-' || id")) do |table, query|
+      query.where(table[:name].eq(nil)).where(table[:project_id].not_in(subquery))
+    end
   end
 
   def down