SONAR-18850 fixed the script for adding 'is_main' column

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranches.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranches.java
index 3d4b2005c8552737f65a3c499bfb23611650fb07..1aee6960f733cd1cb8c03fa9bf2d6abe3ece8a63 100644 (file)
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranches.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranches.java
@@ -34,13 +34,15 @@ public class UpdateIsMainColumnInProjectBranches extends DataChange {
   protected void execute(Context context) throws SQLException {
     MassUpdate massUpdate = context.prepareMassUpdate();
 
-    massUpdate.select("select uuid from project_branches where project_uuid = uuid");
+    massUpdate.select("select uuid, uuid = project_uuid from project_branches");
     massUpdate.update("update project_branches set is_main = ? where uuid = ?");
     massUpdate.execute((row, update) -> {
       String uuid = row.getString(1);
-      update.setBoolean(1, true);
+      boolean isMain = row.getBoolean(2);
+      update.setBoolean(1, isMain);
       update.setString(2, uuid);
       return true;
     });
+
   }
 }

diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranchesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranchesTest.java
index 1ac969a6b7a5657df69fdfe1bdb997c8c9c06d39..33bf84117d6c30798772630cba11845c4fdd2328 100644 (file)
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranchesTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranchesTest.java
@@ -100,7 +100,6 @@ public class UpdateIsMainColumnInProjectBranchesTest {
     map.put("PULL_REQUEST_BINARY", null);
     map.put("EXCLUDE_FROM_PURGE", true);
     map.put("NEED_ISSUE_SYNC", false);
-    map.put("IS_MAIN", false);
     db.executeInsert("project_branches", map);
     return uuid;
   }