SONAR-6840 Number are accepted in table name

diff --git a/sonar-db/src/main/java/org/sonar/db/version/ColumnDefValidation.java b/sonar-db/src/main/java/org/sonar/db/version/ColumnDefValidation.java
index ed017bcb70520be79d647b4e640e9ff5c4f3e4ce..786388fef963485d96a980b009e18af2ac562791 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/ColumnDefValidation.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/ColumnDefValidation.java
@@ -35,7 +35,8 @@ public class ColumnDefValidation {
 
   public static String validateColumnName(@Nullable String columnName) {
     String name = requireNonNull(columnName, "Column name cannot be null");
-    checkArgument(JAVA_LOWER_CASE.or(CharMatcher.anyOf("_")).matchesAllOf(name), String.format("Column name should only contains lowercase and _ characters, got '%s'", columnName));
+    checkArgument(JAVA_LOWER_CASE.or(CharMatcher.anyOf("_")).or(CharMatcher.DIGIT).matchesAllOf(name),
+      String.format("Column name should only contains lowercase and _ characters, got '%s'", columnName));
     return name;
   }
 }

diff --git a/sonar-db/src/test/java/org/sonar/db/version/ColumnDefValidationTest.java b/sonar-db/src/test/java/org/sonar/db/version/ColumnDefValidationTest.java
index 6cbdb35d58e3b93ec489d26a0b1fc9b44b85cc2f..423a49356bf87b8135b0659a12fc202594ae63bf 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/version/ColumnDefValidationTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/ColumnDefValidationTest.java
@@ -34,6 +34,7 @@ public class ColumnDefValidationTest {
   @Test
   public void accept_valid_table_name() throws Exception {
     validateColumnName("date_in_ms");
+    validateColumnName("date_in_ms_1");
   }
 
   @Test