aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-db-migration
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2020-11-03 11:35:05 +0100
committersonartech <sonartech@sonarsource.com>2020-11-03 20:05:45 +0000
commitaca2262d7379735f4ea01e84115da7a4ae19e9c3 (patch)
tree60fcfddf598d64febfbe3553a8b235527d0d8c21 /server/sonar-db-migration
parent07997af4347cde6e6554a985db1c5a866bc061b6 (diff)
downloadsonarqube-aca2262d7379735f4ea01e84115da7a4ae19e9c3.tar.gz
sonarqube-aca2262d7379735f4ea01e84115da7a4ae19e9c3.zip
SONAR-13913 Remove tables and indexes clean up used in Integration Tests
Diffstat (limited to 'server/sonar-db-migration')
-rw-r--r--server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/charset/ColumnDef.java2
-rw-r--r--server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/ColumnDefTest.java5
2 files changed, 1 insertions, 6 deletions
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/charset/ColumnDef.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/charset/ColumnDef.java
index a0695f79fc8..5666d5cf938 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/charset/ColumnDef.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/charset/ColumnDef.java
@@ -81,7 +81,7 @@ public class ColumnDef {
public boolean isInSonarQubeTable() {
String tableName = table.toLowerCase(Locale.ENGLISH);
- return SqTables.TABLES.contains(tableName) || SqTables.OLD_DROPPED_TABLES.contains(tableName);
+ return SqTables.TABLES.contains(tableName);
}
public enum ColumnDefRowConverter implements SqlExecutor.RowConverter<ColumnDef> {
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/ColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/ColumnDefTest.java
index c9ab3f9d4a0..f1c50ff4866 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/ColumnDefTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/ColumnDefTest.java
@@ -43,9 +43,4 @@ public class ColumnDefTest {
assertThat(underTest.isInSonarQubeTable()).isTrue();
}
- @Test
- public void isInSonarQubeTable_returns_true_if_table_existed_in_previous_versions_of_sonarqube() {
- ColumnDef underTest = new ColumnDef("activities", "kee", "charset", "collation", "NVARCHAR", 100L, false);
- assertThat(underTest.isInSonarQubeTable()).isTrue();
- }
}