Merge branch 'fix-migration' into 'master'

Fix ci_projects migration by using the value only from latest row [ci skip] This is needed, because for some projects we have duplicate ci_projects. This was introduced by lack of DB uniqueness on ci_projects.gitlab_id. The MR fixes edge case by selecting value from latest. /cc @yorickpeterse Fixes: gitlab-org/gitlab-ce#4123 See merge request !2133

Merge branch 'fix-migration' into 'master'
110a5f9c · Kamil Trzciński · 61a1bdd7 · e136a976 · 110a5f9c
Commit 110a5f9c authored Dec 17, 2015 by Kamil Trzciński
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

20151210125930_migrate_ci_to_project.rb db/migrate/20151210125930_migrate_ci_to_project.rb +2 -1

No files found.
--- a/db/migrate/20151210125930_migrate_ci_to_project.rb
+++ b/db/migrate/20151210125930_migrate_ci_to_project.rb
@@ -26,7 +26,8 @@ class MigrateCiToProject < ActiveRecord::Migration
  def migrate_project_column(column, new_column = nil)
    new_column ||= column
-    subquery = "SELECT ci_projects.#{column} FROM ci_projects WHERE projects.id = ci_projects.gitlab_id"
+    subquery = "SELECT ci_projects.#{column} FROM ci_projects WHERE projects.id = ci_projects.gitlab_id " \
+      'ORDER BY ci_projects.updated_at DESC LIMIT 1'
    execute("UPDATE projects SET #{new_column}=(#{subquery}) WHERE (#{subquery}) IS NOT NULL")
  end