From 5db0a10b86f273965bc8163c791a130aa03d5490 Mon Sep 17 00:00:00 2001 From: Benjamin Campomenosi Date: Fri, 14 Apr 2023 15:37:16 +0200 Subject: [PATCH] [NO_JIRA] move is_main migration script in version10.1 --- .../{v100 => v101}/AddIsMainColumnInProjectBranches.java | 2 +- .../{v100 => v101}/AlterIsMainColumnInProjectBranches.java | 2 +- .../platform/db/migration/version/v101/DbVersion101.java | 3 --- .../{v100 => v101}/UpdateIsMainColumnInProjectBranches.java | 2 +- .../{v100 => v101}/AddIsMainColumnInProjectBranchesTest.java | 2 +- .../{v100 => v101}/AlterIsMainColumnInProjectBranchesTest.java | 2 +- .../UpdateIsMainColumnInProjectBranchesTest.java | 2 +- .../AddIsMainColumnInProjectBranchesTest/schema.sql | 0 .../AlterIsMainColumnInProjectBranchesTest/schema.sql | 0 .../UpdateIsMainColumnInProjectBranchesTest/schema.sql | 0 10 files changed, 6 insertions(+), 9 deletions(-) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v100 => v101}/AddIsMainColumnInProjectBranches.java (97%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v100 => v101}/AlterIsMainColumnInProjectBranches.java (96%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v100 => v101}/UpdateIsMainColumnInProjectBranches.java (96%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v100 => v101}/AddIsMainColumnInProjectBranchesTest.java (96%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v100 => v101}/AlterIsMainColumnInProjectBranchesTest.java (96%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v100 => v101}/UpdateIsMainColumnInProjectBranchesTest.java (98%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v100 => v101}/AddIsMainColumnInProjectBranchesTest/schema.sql (100%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v100 => v101}/AlterIsMainColumnInProjectBranchesTest/schema.sql (100%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v100 => v101}/UpdateIsMainColumnInProjectBranchesTest/schema.sql (100%) diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranches.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranches.java similarity index 97% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranches.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranches.java index 7e4be1b97d4..15a1cd7a7d3 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranches.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranches.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.db.migration.version.v100; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.Connection; import java.sql.SQLException; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranches.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranches.java similarity index 96% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranches.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranches.java index b3a602e2f81..ffe748e4cae 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranches.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranches.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.db.migration.version.v100; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101.java index 29da7ba8698..f2479a6bfd1 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101.java @@ -21,9 +21,6 @@ package org.sonar.server.platform.db.migration.version.v101; import org.sonar.server.platform.db.migration.step.MigrationStepRegistry; import org.sonar.server.platform.db.migration.version.DbVersion; -import org.sonar.server.platform.db.migration.version.v100.AddIsMainColumnInProjectBranches; -import org.sonar.server.platform.db.migration.version.v100.AlterIsMainColumnInProjectBranches; -import org.sonar.server.platform.db.migration.version.v100.UpdateIsMainColumnInProjectBranches; // ignoring bad number formatting, as it's indented that we align the migration numbers to SQ versions @SuppressWarnings("java:S3937") 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/v101/UpdateIsMainColumnInProjectBranches.java similarity index 96% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranches.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranches.java index 238f99a98e6..a37d9ca869a 100644 --- 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/v101/UpdateIsMainColumnInProjectBranches.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.db.migration.version.v100; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.sonar.db.Database; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranchesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest.java similarity index 96% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranchesTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest.java index 3e28adfcfeb..1b4c344a769 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranchesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.db.migration.version.v100; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranchesTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest.java similarity index 96% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranchesTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest.java index cefc30bd618..a96600f0f95 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranchesTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.db.migration.version.v100; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; 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/v101/UpdateIsMainColumnInProjectBranchesTest.java similarity index 98% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranchesTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranchesTest.java index 33bf84117d6..1b79cd4aab1 100644 --- 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/v101/UpdateIsMainColumnInProjectBranchesTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.db.migration.version.v100; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import java.util.HashMap; diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranchesTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v100/AddIsMainColumnInProjectBranchesTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/AddIsMainColumnInProjectBranchesTest/schema.sql diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranchesTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v100/AlterIsMainColumnInProjectBranchesTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/AlterIsMainColumnInProjectBranchesTest/schema.sql diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranchesTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranchesTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v100/UpdateIsMainColumnInProjectBranchesTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/UpdateIsMainColumnInProjectBranchesTest/schema.sql -- 2.39.5