fix: issue with multiple aliases against same table

eclipse-ee4j · Dec 6, 2022 · 0fb74b5 · 0fb74b5
1 parent e2ac8a6
commit 0fb74b5
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/...ence.core/src/main/java/org/eclipse/persistence/internal/expressions/TableExpression.java b/...ence.core/src/main/java/org/eclipse/persistence/internal/expressions/TableExpression.java
@@ -37,21 +37,6 @@ public TableExpression(DatabaseTable table) {
         this.table = table;
     }
 
-    /**
-     * INTERNAL:
-     * Alias a particular table within this node
-     */
-    @Override
-    protected void assignAlias(DatabaseTable alias, DatabaseTable table) {
-        if (this.baseExpression.isQueryKeyExpression()){
-            QueryKeyExpression qkExpression = ((QueryKeyExpression)this.baseExpression);
-            if (qkExpression.getTableAliases() != null && qkExpression.getTableAliases().keyAtValue(table) != null ) {
-                return;
-            }
-        }
-        super.assignAlias(alias, table);
-    }
-
     /**
      * INTERNAL:
      * Return if the expression is equal to the other.
@@ -69,6 +54,21 @@ public boolean equals(Object object) {
         return ((this.table == expression.table) || ((this.table != null) && this.table.equals(expression.table)));
     }
 
+    /**
+     * INTERNAL:
+     * Alias a particular table within this node
+     */
+    @Override
+    protected void assignAlias(DatabaseTable alias, DatabaseTable table) {
+        if (this.baseExpression.isQueryKeyExpression()){
+            QueryKeyExpression qkExpression = ((QueryKeyExpression)this.baseExpression);
+            if (qkExpression.getTableAliases() != null && qkExpression.getTableAliases().keyAtValue(table) != null ) {
+                return;
+            }
+        }
+        super.assignAlias(alias, table);
+    }
+
     /**
      * INTERNAL:
      * Compute a consistent hash-code for the expression.