fix type of INTEGER columns on Oracle

Correct type is NUMBER(38,0) but not INTEGER

Signed-off-by: Simon Brandhof <simon.brandhof@sonarsource.com>

diff --git a/sonar-db/src/main/java/org/sonar/db/version/IntegerColumnDef.java b/sonar-db/src/main/java/org/sonar/db/version/IntegerColumnDef.java
index 8b41a8a4ed8cb52c72b1c1994d60f65706e060e9..6a75b6859b1ab4a15900afb2d3394b8cdb8982fe 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/IntegerColumnDef.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/IntegerColumnDef.java
@@ -43,12 +43,13 @@ public class IntegerColumnDef extends AbstractColumnDef {
   public String generateSqlType(Dialect dialect) {
     switch (dialect.getId()) {
       case PostgreSql.ID:
-      case Oracle.ID:
       case MySql.ID:
       case H2.ID:
         return "INTEGER";
       case MsSql.ID:
         return "INT";
+      case Oracle.ID:
+        return "NUMBER(38,0)";
       default:
         throw new IllegalArgumentException("Unsupported dialect id " + dialect.getId());
     }

diff --git a/sonar-db/src/test/java/org/sonar/db/version/CreateTableBuilderTest.java b/sonar-db/src/test/java/org/sonar/db/version/CreateTableBuilderTest.java
index 2b11ff4eb89ff82f022f42650c9a7b20f22e2a6d..3f8958d884ca65c12ef162bccbf87e250ec1f2ad 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/version/CreateTableBuilderTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/CreateTableBuilderTest.java
@@ -253,7 +253,7 @@ public class CreateTableBuilderTest {
       .build();
     assertThat(stmts).hasSize(3);
     assertThat(stmts.get(0))
-      .isEqualTo("CREATE TABLE table_42 (id INTEGER NOT NULL, CONSTRAINT pk_table_42 PRIMARY KEY (id))");
+      .isEqualTo("CREATE TABLE table_42 (id NUMBER(38,0) NOT NULL, CONSTRAINT pk_table_42 PRIMARY KEY (id))");
     assertThat(stmts.get(1))
       .isEqualTo("CREATE SEQUENCE table_42_seq START WITH 1 INCREMENT BY 1");
     assertThat(stmts.get(2))

diff --git a/sonar-db/src/test/java/org/sonar/db/version/IntegerColumnDefTest.java b/sonar-db/src/test/java/org/sonar/db/version/IntegerColumnDefTest.java
index 935fb96cfd8948b41253ec211712de78dad181e2..556dba13768b80e9ad2c87db9c5fcf264c96a91d 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/version/IntegerColumnDefTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/IntegerColumnDefTest.java
@@ -87,7 +87,7 @@ public class IntegerColumnDefTest {
 
   @Test
   public void generateSqlType_for_Oracle() {
-    assertThat(underTest.generateSqlType(new Oracle())).isEqualTo("INTEGER");
+    assertThat(underTest.generateSqlType(new Oracle())).isEqualTo("NUMBER(38,0)");
   }
 
   @Test