Test fix for postgres

flowable · Jul 16, 2024 · e72ff6b · e72ff6b
1 parent 53130d5
commit e72ff6b
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/...e-app-rest/src/test/java/org/flowable/test/persistence/TableColumnTypeValidationTest.java b/...e-app-rest/src/test/java/org/flowable/test/persistence/TableColumnTypeValidationTest.java
@@ -110,12 +110,21 @@ public void validateColumnTypes(EntityHelperUtil.EntityMappingPackageInformation
     private String findTable(String entity, String mappingFileContent) {
 
         // CaseInstance is an exception: there's more ACT_RU_ENTITYLINK in there than case instance
+        String directMapping = null;
         if (entity.equalsIgnoreCase("CaseInstance")) {
-            return "ACT_CMMN_RU_CASE_INST";
+            directMapping = "ACT_CMMN_RU_CASE_INST";
         } else if (entity.equalsIgnoreCase("HistoricCaseInstance")) {
-            return "ACT_CMMN_HI_CASE_INST";
+            directMapping = "ACT_CMMN_HI_CASE_INST";
         } else if (entity.equalsIgnoreCase("Privilege")) {
-            return "ACT_ID_PRIV";
+            directMapping = "ACT_ID_PRIV";
+        }
+
+        if (directMapping != null) {
+            if (databaseType.equals(AbstractEngineConfiguration.DATABASE_TYPE_POSTGRES)) {
+                return directMapping.toLowerCase(Locale.ROOT);
+            } else {
+                return directMapping;
+            }
         }
 
         // Simplistic approach: check for ${prefix}<TABLE> patterns. The one that is most in the mapping file, is most likely the table name.
@@ -147,6 +156,10 @@ private String findTable(String entity, String mappingFileContent) {
             }
         }
 
+        if (databaseType.equals(AbstractEngineConfiguration.DATABASE_TYPE_POSTGRES)) {
+            result = result.toLowerCase(Locale.ROOT);
+        }
+
         return result.trim();
     }
 
@@ -204,10 +217,12 @@ protected Map<String, String> getColumnMetaData(String tableName) {
                         columnType = EntityParameterTypesOverview.PARAMETER_TYPE_TIMESTAMP;
 
                     } else if (columnType.equalsIgnoreCase("int")
+                            || columnType.equalsIgnoreCase("int2") // postgres
                             || columnType.equalsIgnoreCase("int4")) { // postgres
                         columnType = EntityParameterTypesOverview.PARAMETER_TYPE_INTEGER;
 
-                    } else if (columnType.equalsIgnoreCase("int8"))  { // postgres
+                    } else if (columnType.equalsIgnoreCase("int8") // postgres
+                            || columnType.equalsIgnoreCase("serial"))  { // postgres
                         columnType = EntityParameterTypesOverview.PARAMETER_TYPE_BIGINT;
 
                     } else if (columnType.equalsIgnoreCase("bit")