From 20a6c300ac45549d2f77ae9175d71d9def91b30e Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Tue, 11 Apr 2023 11:46:29 -0500 Subject: [PATCH] [NO JIRA] Fix DB migration name for v10.1 --- .../db/migration/MigrationConfigurationModule.java | 4 ++-- .../CreateIndexForEmailOnUsersTable.java | 2 +- .../CreateIndexForScmAccountOnScmAccountsTable.java | 6 +++--- .../{v110 => v101}/CreateScmAccountsTable.java | 2 +- .../DbVersion110.java => v101/DbVersion101.java} | 4 ++-- .../{v110 => v101}/DropScmAccountsInUsers.java | 2 +- .../MigrateScmAccountsFromUsersToScmAccounts.java | 2 +- .../CreateIndexForEmailOnUsersTableTest.java | 8 ++++---- ...reateIndexForScmAccountOnScmAccountsTableTest.java | 8 ++++---- .../{v110 => v101}/CreateScmAccountsTableTest.java | 11 +++++------ .../DbVersion101Test.java} | 6 +++--- .../{v110 => v101}/DropScmAccountsInUsersTest.java | 6 +++--- .../MigrateScmAccountsFromUsersToScmAccountsTest.java | 6 +++--- .../CreateIndexForEmailOnUsersTableTest/schema.sql | 0 .../schema.sql | 0 .../CreateIndexesForScmAccountsTest/schema.sql | 0 .../DropScmAccountsInUsersTest/schema.sql | 0 .../schema.sql | 0 18 files changed, 33 insertions(+), 34 deletions(-) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateIndexForEmailOnUsersTable.java (97%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateIndexForScmAccountOnScmAccountsTable.java (87%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateScmAccountsTable.java (97%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v110/DbVersion110.java => v101/DbVersion101.java} (96%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/DropScmAccountsInUsers.java (95%) rename server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/MigrateScmAccountsFromUsersToScmAccounts.java (98%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateIndexForEmailOnUsersTableTest.java (81%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateIndexForScmAccountOnScmAccountsTableTest.java (82%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateScmAccountsTableTest.java (78%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v110/DbVersion110Test.java => v101/DbVersion101Test.java} (89%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/DropScmAccountsInUsersTest.java (87%) rename server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/{v110 => v101}/MigrateScmAccountsFromUsersToScmAccountsTest.java (96%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateIndexForEmailOnUsersTableTest/schema.sql (100%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateIndexForScmAccountOnScmAccountsTableTest/schema.sql (100%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v110 => v101}/CreateIndexesForScmAccountsTest/schema.sql (100%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v110 => v101}/DropScmAccountsInUsersTest/schema.sql (100%) rename server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/{v110 => v101}/MigrateScmAccountsFromUsersToScmAccountsTest/schema.sql (100%) diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/MigrationConfigurationModule.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/MigrationConfigurationModule.java index 0bbcf637ee5..dbf2cc0f7fb 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/MigrationConfigurationModule.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/MigrationConfigurationModule.java @@ -29,7 +29,7 @@ import org.sonar.server.platform.db.migration.step.MigrationStepRegistryImpl; import org.sonar.server.platform.db.migration.step.MigrationStepsProvider; import org.sonar.server.platform.db.migration.version.v00.DbVersion00; import org.sonar.server.platform.db.migration.version.v100.DbVersion100; -import org.sonar.server.platform.db.migration.version.v110.DbVersion110; +import org.sonar.server.platform.db.migration.version.v101.DbVersion101; public class MigrationConfigurationModule extends Module { @Override @@ -39,7 +39,7 @@ public class MigrationConfigurationModule extends Module { // DbVersion implementations DbVersion00.class, DbVersion100.class, - DbVersion110.class, + DbVersion101.class, // migration steps MigrationStepRegistryImpl.class, diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTable.java similarity index 97% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTable.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTable.java index 34930f16b63..d305a0d0dd9 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTable.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTable.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import com.google.common.annotations.VisibleForTesting; import java.sql.Connection; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTable.java similarity index 87% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTable.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTable.java index eff8f4be2bf..d16913a53ca 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTable.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTable.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import com.google.common.annotations.VisibleForTesting; import java.sql.Connection; @@ -27,8 +27,8 @@ import org.sonar.db.DatabaseUtils; import org.sonar.server.platform.db.migration.sql.CreateIndexBuilder; import org.sonar.server.platform.db.migration.step.DdlChange; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.SCM_ACCOUNT_COLUMN_NAME; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.TABLE_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.SCM_ACCOUNT_COLUMN_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.TABLE_NAME; class CreateIndexForScmAccountOnScmAccountsTable extends DdlChange { diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateScmAccountsTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTable.java similarity index 97% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateScmAccountsTable.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTable.java index 8ce71c75d14..443b6899522 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/CreateScmAccountsTable.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTable.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import com.google.common.annotations.VisibleForTesting; import java.sql.SQLException; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/DbVersion110.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101.java similarity index 96% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/DbVersion110.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101.java index ac7a16bea1c..fda502b11aa 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/DbVersion110.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101.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.v110; +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; @@ -27,7 +27,7 @@ import org.sonar.server.platform.db.migration.version.v100.UpdateIsMainColumnInP // ignoring bad number formatting, as it's indented that we align the migration numbers to SQ versions @SuppressWarnings("java:S3937") -public class DbVersion110 implements DbVersion { +public class DbVersion101 implements DbVersion { /** * We use the start of the 10.X cycle as an opportunity to align migration numbers with the SQ version number. diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsers.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsers.java similarity index 95% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsers.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsers.java index ecbdbd03d17..63841481092 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsers.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsers.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import org.sonar.db.Database; import org.sonar.server.platform.db.migration.step.DropColumnChange; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccounts.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccounts.java similarity index 98% rename from server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccounts.java rename to server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccounts.java index 1a96820de92..7d27dad8b1e 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccounts.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccounts.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import com.google.common.annotations.VisibleForTesting; import java.sql.SQLException; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest.java similarity index 81% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTableTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest.java index 2e2287e56c4..012def57f09 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest.java @@ -17,16 +17,16 @@ * 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.v110; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; import org.sonar.db.CoreDbTester; -import static org.sonar.server.platform.db.migration.version.v110.CreateIndexForEmailOnUsersTable.COLUMN_NAME; -import static org.sonar.server.platform.db.migration.version.v110.CreateIndexForEmailOnUsersTable.INDEX_NAME; -import static org.sonar.server.platform.db.migration.version.v110.CreateIndexForEmailOnUsersTable.TABLE_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateIndexForEmailOnUsersTable.COLUMN_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateIndexForEmailOnUsersTable.INDEX_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateIndexForEmailOnUsersTable.TABLE_NAME; public class CreateIndexForEmailOnUsersTableTest { @Rule diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest.java similarity index 82% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTableTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest.java index 8ccc06c0715..8a4662be7fc 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest.java @@ -17,16 +17,16 @@ * 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.v110; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import org.junit.Rule; import org.junit.Test; import org.sonar.db.CoreDbTester; -import static org.sonar.server.platform.db.migration.version.v110.CreateIndexForScmAccountOnScmAccountsTable.INDEX_NAME; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.SCM_ACCOUNT_COLUMN_NAME; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.TABLE_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateIndexForScmAccountOnScmAccountsTable.INDEX_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.SCM_ACCOUNT_COLUMN_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.TABLE_NAME; public class CreateIndexForScmAccountOnScmAccountsTableTest { @Rule diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateScmAccountsTableTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTableTest.java similarity index 78% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateScmAccountsTableTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTableTest.java index 815d0e5f60e..4a311141e2e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/CreateScmAccountsTableTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/CreateScmAccountsTableTest.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import java.sql.Types; @@ -25,13 +25,12 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.db.CoreDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; -import org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.USER_UUID_SIZE; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.SCM_ACCOUNT_COLUMN_NAME; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.SCM_ACCOUNT_SIZE; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.TABLE_NAME; -import static org.sonar.server.platform.db.migration.version.v110.CreateScmAccountsTable.USER_UUID_COLUMN_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.SCM_ACCOUNT_COLUMN_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.SCM_ACCOUNT_SIZE; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.TABLE_NAME; +import static org.sonar.server.platform.db.migration.version.v101.CreateScmAccountsTable.USER_UUID_COLUMN_NAME; public class CreateScmAccountsTableTest { @Rule diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/DbVersion110Test.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101Test.java similarity index 89% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/DbVersion110Test.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101Test.java index 6cff42c046a..e0d5cc4ae93 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/DbVersion110Test.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DbVersion101Test.java @@ -17,15 +17,15 @@ * 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.v110; +package org.sonar.server.platform.db.migration.version.v101; import org.junit.Test; import static org.sonar.server.platform.db.migration.version.DbVersionTestUtils.verifyMigrationNotEmpty; import static org.sonar.server.platform.db.migration.version.DbVersionTestUtils.verifyMinimumMigrationNumber; -public class DbVersion110Test { - private final DbVersion110 underTest = new DbVersion110(); +public class DbVersion101Test { + private final DbVersion101 underTest = new DbVersion101(); @Test public void migrationNumber_starts_at_10_1_000() { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsersTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest.java similarity index 87% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsersTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest.java index db354f3d1ba..7770afbb5d3 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsersTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import java.sql.Types; @@ -26,8 +26,8 @@ import org.junit.Test; import org.sonar.db.CoreDbTester; import org.sonar.server.platform.db.migration.step.DdlChange; -import static org.sonar.server.platform.db.migration.version.v110.DropScmAccountsInUsers.COLUMN_NAME; -import static org.sonar.server.platform.db.migration.version.v110.DropScmAccountsInUsers.TABLE_NAME; +import static org.sonar.server.platform.db.migration.version.v101.DropScmAccountsInUsers.COLUMN_NAME; +import static org.sonar.server.platform.db.migration.version.v101.DropScmAccountsInUsers.TABLE_NAME; public class DropScmAccountsInUsersTest { diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccountsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest.java similarity index 96% rename from server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccountsTest.java rename to server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest.java index c5be86ea074..93763ceea72 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccountsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest.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.v110; +package org.sonar.server.platform.db.migration.version.v101; import java.sql.SQLException; import java.util.HashMap; @@ -31,13 +31,13 @@ import org.sonar.core.util.UuidFactory; import org.sonar.core.util.UuidFactoryFast; import org.sonar.db.CoreDbTester; import org.sonar.server.platform.db.migration.step.DataChange; -import org.sonar.server.platform.db.migration.version.v110.MigrateScmAccountsFromUsersToScmAccounts.ScmAccountRow; +import org.sonar.server.platform.db.migration.version.v101.MigrateScmAccountsFromUsersToScmAccounts.ScmAccountRow; import static java.lang.String.format; import static java.util.stream.Collectors.toSet; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; -import static org.sonar.server.platform.db.migration.version.v110.MigrateScmAccountsFromUsersToScmAccounts.SCM_ACCOUNTS_SEPARATOR_CHAR; +import static org.sonar.server.platform.db.migration.version.v101.MigrateScmAccountsFromUsersToScmAccounts.SCM_ACCOUNTS_SEPARATOR_CHAR; public class MigrateScmAccountsFromUsersToScmAccountsTest { diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/CreateIndexForEmailOnUsersTableTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/CreateIndexForEmailOnUsersTableTest/schema.sql diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTableTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/CreateIndexForScmAccountOnScmAccountsTableTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/CreateIndexForScmAccountOnScmAccountsTableTest/schema.sql diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/CreateIndexesForScmAccountsTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/CreateIndexesForScmAccountsTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/CreateIndexesForScmAccountsTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/CreateIndexesForScmAccountsTest/schema.sql diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsersTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/DropScmAccountsInUsersTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/DropScmAccountsInUsersTest/schema.sql diff --git a/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccountsTest/schema.sql b/server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest/schema.sql similarity index 100% rename from server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v110/MigrateScmAccountsFromUsersToScmAccountsTest/schema.sql rename to server/sonar-db-migration/src/test/resources/org/sonar/server/platform/db/migration/version/v101/MigrateScmAccountsFromUsersToScmAccountsTest/schema.sql -- 2.39.5