Browse Source

SONAR-12117 Database requires downgrade : incorrect error message

tags/7.8
Duarte Meneses 5 years ago
parent
commit
8897cc9d2e

+ 2
- 1
server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java View File

@@ -45,7 +45,8 @@ public class DatabaseServerCompatibility implements Startable {
public void start() {
DatabaseVersion.Status status = version.getStatus();
if (status == DatabaseVersion.Status.REQUIRES_DOWNGRADE) {
throw MessageException.of("Database was upgraded to a more recent of SonarQube. Backup must probably be restored or db settings are incorrect.");
throw MessageException.of("Database was upgraded to a more recent version of SonarQube. "
+ "A backup must probably be restored or the DB settings are incorrect.");
}
if (status == DatabaseVersion.Status.REQUIRES_UPGRADE) {
Optional<Long> currentVersion = this.version.getVersion();

+ 2
- 1
server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java View File

@@ -46,7 +46,8 @@ public class DatabaseServerCompatibilityTest {
@Test
public void fail_if_requires_downgrade() {
thrown.expect(MessageException.class);
thrown.expectMessage("Database was upgraded to a more recent of SonarQube. Backup must probably be restored or db settings are incorrect.");
thrown.expectMessage("Database was upgraded to a more recent version of SonarQube. "
+ "A backup must probably be restored or the DB settings are incorrect.");

DatabaseVersion version = mock(DatabaseVersion.class);
when(version.getStatus()).thenReturn(DatabaseVersion.Status.REQUIRES_DOWNGRADE);

Loading…
Cancel
Save