jakartaee/persistence#431 - add SchemaManager

Fixed failing tests with Oracle DB. Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
eclipse-ee4j · Dec 20, 2023 · 05df5c0 · 05df5c0
1 parent a6bff23
commit 05df5c0
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 5 deletions.
diff --git a/...re/src/main/java/org/eclipse/persistence/internal/databaseaccess/FieldTypeDefinition.java b/...re/src/main/java/org/eclipse/persistence/internal/databaseaccess/FieldTypeDefinition.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Objects;
 import java.util.Set;
 
@@ -345,13 +346,62 @@ public void setName(String name) {
      * Check whether provided type name matches any known type alias.
      * Check is case-insensitive. Provided type name shall not be null.
      *
-     * @param nameAlias type name to check, not {@code null}
+     * @param typeName type name to check, not {@code null}
+     * @param checkSize whether to include {@code nameAlias} size definition in the check
      * @return Value of {@code true} when provided name matches type name
      *         or any of its name aliases or {@code false} otherwise.
      */
-    public boolean isTypeName(String nameAlias) {
-        Objects.requireNonNull(nameAlias, "Checked type name is null.");
-        return nameAlias.equalsIgnoreCase(name) || aliases.contains(nameAlias.toUpperCase());
+    public boolean isTypeName(String typeName, boolean checkSize) {
+        Objects.requireNonNull(typeName, "Checked type name is null.");
+        // Remove size definition from DB type name, e.g. VARCHAR(64) -> VARCHAR
+        if (!checkSize) {
+            typeName = removeSizeFromTypeName(typeName);
+            // Try exact match against type name and aliases
+            boolean match = typeName.equalsIgnoreCase(name) || aliases.contains(typeName.toUpperCase());
+            if (!match) {
+                // PERF: Following checks require full iteration over all type names defined for current field type
+                // Try match against model type name with size definition removed
+                match = checkTypeNameWithSizeRemoved(typeName, name, match);
+                // Try match against model type name aliases with size definition removed
+                if (!match) {
+                    for (Iterator<String> i = aliases.iterator(); !match && i.hasNext(); ) {
+                        String alias = i.next();
+                        match = checkTypeNameWithSizeRemoved(typeName, alias, match);
+                    }
+                }
+            }
+            return match;
+        } else {
+            return typeName.equalsIgnoreCase(name) || aliases.contains(typeName.toUpperCase());
+        }
+    }
+
+    // Helper for isTypeName: remove size definition from DB type name, e.g. VARCHAR(64) -> VARCHAR
+    private static String removeSizeFromTypeName(String typeName) {
+        int sizeBeg = typeName.indexOf('(');
+        if (sizeBeg > 0) {
+            typeName = typeName.substring(0, sizeBeg);
+        }
+        return typeName;
+    }
+
+    // Helper for isTypeName: match against removed size definition from provided type name, e.g. VARCHAR(64) -> VARCHAR
+    /**
+     * Match against removed size definition from provided type name, e.g. VARCHAR(64) -> VARCHAR.
+     *
+     * @param dbTypeName database type name, shall have size definition already removed
+     * @param typeName model type name, may contain size definition
+     * @param match current matching result, value of {@code false} means check should continue with this step
+     * @return whether database type name matches model type name with size definition removed
+     */
+    private static boolean checkTypeNameWithSizeRemoved(String dbTypeName, String typeName, boolean match) {
+        if (!match) {
+            int sizeBeg = typeName.indexOf('(');
+            if (sizeBeg > 0) {
+                match = dbTypeName.equalsIgnoreCase(typeName.substring(0, sizeBeg));
+            }
+        }
+        return match;
     }
 
     /**

diff --git a/...stence.core/src/main/java/org/eclipse/persistence/tools/schemaframework/TableCreator.java b/...stence.core/src/main/java/org/eclipse/persistence/tools/schemaframework/TableCreator.java
@@ -791,7 +791,7 @@ private void checkExisting(FieldDefinition fieldDefinition, DatabaseField databa
                 String dbTypeName = (String) dbRecord.get("TYPE_NAME");
                 if (dbTypeName != null) {
                     // Type mismatch. DB typeName may be an alias, e.g. INT/INTEGER!
-                    if (!expectedDbType.isTypeName(dbTypeName)) {
+                    if (!expectedDbType.isTypeName(dbTypeName, false)) {
                         existingColumnsDiff.add(
                                 new TableValidationException.DifferentColumns.TypeDifference(databaseField.getName(),
                                                                                              expectedDbType.getName(),