Drop unused Dialect#getActiveRecordDialectCode()

because Ruby on Rails has been dropped.

12 files changed, 6 insertions, 23 deletions

diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/AbstractDialect.java b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/AbstractDialect.java
index f442c088c21..72c202bbbf7 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/AbstractDialect.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/AbstractDialect.java
@@ -27,16 +27,14 @@ import java.util.List;
  */
 abstract class AbstractDialect implements Dialect {
   private final String id;
-  private final String activeRecordDialectCode;
   private final String defaultDriverClassName;
   private final String trueSqlValue;
   private final String falseSqlValue;
   private final String validationQuery;
 
-  protected AbstractDialect(String id, String activeRecordDialectCode, String defaultDriverClassName, String trueSqlValue, String falseSqlValue,
+  protected AbstractDialect(String id, String defaultDriverClassName, String trueSqlValue, String falseSqlValue,
     String validationQuery) {
     this.id = id;
-    this.activeRecordDialectCode = activeRecordDialectCode;
     this.defaultDriverClassName = defaultDriverClassName;
     this.trueSqlValue = trueSqlValue;
     this.falseSqlValue = falseSqlValue;
@@ -49,11 +47,6 @@ abstract class AbstractDialect implements Dialect {
   }
 
   @Override
-  public String getActiveRecordDialectCode() {
-    return activeRecordDialectCode;
-  }
-
-  @Override
   public String getDefaultDriverClassName() {
     return defaultDriverClassName;
   }
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Dialect.java b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Dialect.java
index a7f02670fb9..17bec41db99 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Dialect.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Dialect.java
@@ -32,11 +32,6 @@ public interface Dialect {
   String getId();
 
   /**
-   * @return the activerecord dialect to be used
-   */
-  String getActiveRecordDialectCode();
-
-  /**
    * Used to autodetect a dialect for a given driver URL
    *
    * @param jdbcConnectionURL a jdbc driver url such as jdbc:mysql://localhost:3306/sonar
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/H2.java b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/H2.java
index e94cbf0a348..b4ae8f513a7 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/H2.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/H2.java
@@ -29,7 +29,7 @@ public class H2 extends AbstractDialect {
   public static final String ID = "h2";
 
   public H2() {
-    super(ID, ".h2.", "org.h2.Driver", "true", "false", "SELECT 1");
+    super(ID, "org.h2.Driver", "true", "false", "SELECT 1");
   }
 
   @Override
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MsSql.java b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MsSql.java
index 802688af9b3..43f4cddf756 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MsSql.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MsSql.java
@@ -26,7 +26,7 @@ public class MsSql extends AbstractDialect {
   public static final String ID = "mssql";
 
   public MsSql() {
-    super(ID, "sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "1", "0", "SELECT 1");
+    super(ID, "com.microsoft.sqlserver.jdbc.SQLServerDriver", "1", "0", "SELECT 1");
   }
 
   @Override
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MySql.java b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MySql.java
index bb16869d798..534400b80b0 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MySql.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/MySql.java
@@ -29,7 +29,7 @@ public class MySql extends AbstractDialect {
   public static final String ID = "mysql";
 
   public MySql() {
-    super(ID, "mysql", "com.mysql.jdbc.Driver", "true", "false", "SELECT 1");
+    super(ID, "com.mysql.jdbc.Driver", "true", "false", "SELECT 1");
   }
 
   @Override
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Oracle.java b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Oracle.java
index ac49a24a9ad..6f12a90eb66 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Oracle.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/Oracle.java
@@ -32,7 +32,7 @@ public class Oracle extends AbstractDialect {
   private static final List<String> INIT_STATEMENTS = ImmutableList.of("ALTER SESSION SET NLS_SORT='BINARY'");
 
   public Oracle() {
-    super(ID, "oracle", "oracle.jdbc.OracleDriver", "1", "0", "SELECT 1 FROM DUAL");
+    super(ID, "oracle.jdbc.OracleDriver", "1", "0", "SELECT 1 FROM DUAL");
   }
 
   @Override
diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/PostgreSql.java b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/PostgreSql.java
index bdb81f80abc..791b20deffc 100644
--- a/server/sonar-db-core/src/main/java/org/sonar/db/dialect/PostgreSql.java
+++ b/server/sonar-db-core/src/main/java/org/sonar/db/dialect/PostgreSql.java
@@ -32,7 +32,7 @@ public class PostgreSql extends AbstractDialect {
   static final List<String> INIT_STATEMENTS = ImmutableList.of("SET standard_conforming_strings=on", "SET backslash_quote=off");
 
   public PostgreSql() {
-    super(ID, "postgre", "org.postgresql.Driver", "true", "false", "SELECT 1");
+    super(ID, "org.postgresql.Driver", "true", "false", "SELECT 1");
   }
 
   @Override
diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java
index 93249a6d59c..41925a35843 100644
--- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java
@@ -42,7 +42,6 @@ public class H2Test {
   @Test
   public void should_configure() {
     assertThat(dialect.getId()).isEqualTo("h2");
-    assertThat(dialect.getActiveRecordDialectCode()).isEqualTo(".h2.");
     assertThat(dialect.getDefaultDriverClassName()).isEqualTo("org.h2.Driver");
     assertThat(dialect.getValidationQuery()).isEqualTo("SELECT 1");
   }
diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java
index 0b03fa6bc0f..bdf46f42346 100644
--- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java
@@ -44,7 +44,6 @@ public class MsSqlTest {
   @Test
   public void should_configure() {
     assertThat(msSql.getId()).isEqualTo("mssql");
-    assertThat(msSql.getActiveRecordDialectCode()).isEqualTo("sqlserver");
     assertThat(msSql.getDefaultDriverClassName()).isEqualTo("com.microsoft.sqlserver.jdbc.SQLServerDriver");
     assertThat(msSql.getValidationQuery()).isEqualTo("SELECT 1");
   }
diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java
index e191124a9ed..27d3dc7f2fe 100644
--- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java
@@ -45,7 +45,6 @@ public class MySqlTest {
   @Test
   public void should_configure() {
     assertThat(mySql.getId()).isEqualTo("mysql");
-    assertThat(mySql.getActiveRecordDialectCode()).isEqualTo("mysql");
     assertThat(mySql.getDefaultDriverClassName()).isEqualTo("com.mysql.jdbc.Driver");
     assertThat(mySql.getValidationQuery()).isEqualTo("SELECT 1");
   }
diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java
index 6b3698a6e2e..3091c3669f7 100644
--- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java
@@ -42,7 +42,6 @@ public class OracleTest {
   @Test
   public void should_configure() {
     assertThat(underTest.getId()).isEqualTo("oracle");
-    assertThat(underTest.getActiveRecordDialectCode()).isEqualTo("oracle");
     assertThat(underTest.getDefaultDriverClassName()).isEqualTo("oracle.jdbc.OracleDriver");
     assertThat(underTest.getValidationQuery()).isEqualTo("SELECT 1 FROM DUAL");
   }
diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java
index c42c50d7db5..abdc87dc5f8 100644
--- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java
@@ -47,7 +47,6 @@ public class PostgreSqlTest {
   @Test
   public void should_configure() {
     assertThat(dialect.getId()).isEqualTo("postgresql");
-    assertThat(dialect.getActiveRecordDialectCode()).isEqualTo("postgre");
     assertThat(dialect.getDefaultDriverClassName()).isEqualTo("org.postgresql.Driver");
     assertThat(dialect.getValidationQuery()).isEqualTo("SELECT 1");
   }