fix: issue with multiple aliases against same table

eclipse-ee4j · Dec 8, 2022 · a944a69 · a944a69
1 parent e2ac8a6
commit a944a69
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
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
@@ -45,7 +45,7 @@ public TableExpression(DatabaseTable table) {
     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 ) {
+            if (!qkExpression.hasQueryKey && qkExpression.getTableAliases() != null && qkExpression.getTableAliases().keyAtValue(table) != null ) {
                 return;
             }
         }

diff --git a/...dvanced/src/main/java/org/eclipse/persistence/testing/models/jpa/advanced/Customizer.java b/...dvanced/src/main/java/org/eclipse/persistence/testing/models/jpa/advanced/Customizer.java
@@ -19,6 +19,7 @@
 import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.descriptors.SerializedObjectPolicy;
 import org.eclipse.persistence.descriptors.VersionLockingPolicy;
+import org.eclipse.persistence.expressions.Expression;
 import org.eclipse.persistence.expressions.ExpressionBuilder;
 import org.eclipse.persistence.internal.databaseaccess.DatasourceAccessor;
 import org.eclipse.persistence.internal.helper.DatabaseField;
@@ -218,6 +219,19 @@ protected void addCustomQueryKeys(ClassDescriptor descriptor) {
                     builder.getTable("CMP3_EMP_PROJ").getField("EMPLOYEES_EMP_ID").equal(
                     builder.getField("CMP3_EMPLOYEE.EMP_ID")))));
             descriptor.addQueryKey(employesQueryKey);
+
+            // Project leader's manager
+            ManyToManyQueryKey projectLeaderManager = new ManyToManyQueryKey();
+            projectLeaderManager.setName("projectLeaderManager");
+            projectLeaderManager.setReferenceClass(Employee.class);
+            builder = new ExpressionBuilder();
+
+            projectLeaderManager.setJoinCriteria(
+                    (builder.getParameter("CMP3_PROJECT.LEADER_ID").equal(
+                            builder.getTable("CMP3_EMPLOYEE").getField("EMP_ID")).and(
+                            builder.getTable("CMP3_EMPLOYEE").getField("MANAGER_EMP_ID").equal(
+                                    builder.getField("CMP3_EMPLOYEE.EMP_ID")))));
+            descriptor.addQueryKey(projectLeaderManager);
         }
     }
     //**temp

diff --git a/.../org/eclipse/persistence/testing/tests/jpa/advanced/JoinedAttributeAdvancedJunitTest.java b/.../org/eclipse/persistence/testing/tests/jpa/advanced/JoinedAttributeAdvancedJunitTest.java
@@ -169,6 +169,7 @@ public static Test suiteSpring() {
         suite.addTest(new JoinedAttributeAdvancedJunitTest("testManagedProjects"));
         suite.addTest(new JoinedAttributeAdvancedJunitTest("testManagedLargeProjects"));
         suite.addTest(new JoinedAttributeAdvancedJunitTest("testProjectsQK"));
+        suite.addTest(new JoinedAttributeAdvancedJunitTest("testProjectLeaderManagerQK"));
         suite.addTest(new JoinedAttributeAdvancedJunitTest("testLargeProjects"));
 //        suite.addTest(new JoinedAttributeAdvancedJunitTest("testResponsibilitiesQK"));
         suite.addTest(new JoinedAttributeAdvancedJunitTest("testOwner"));
@@ -1051,6 +1052,24 @@ public void testProjectsQK() {
         }
     }
 
+    public void testProjectLeaderManagerQK() {
+        final String projectLeaderManagerFirstName = "Jim-bob";
+        ReadAllQuery query = new ReadAllQuery(Project.class);
+        ExpressionBuilder eb = query.getExpressionBuilder();
+        query.setSelectionCriteria(eb.anyOf("projectLeaderManager").get("firstName").equal(projectLeaderManagerFirstName));
+        @SuppressWarnings({"unchecked"})
+        List<Project> projects = (List<Project>)getDbSession().executeQuery(query);
+
+        // choose example that actually selects something
+        if(projects.isEmpty()) {
+            fail();
+        }
+
+        for(final Project project : projects) {
+            assertEquals(projectLeaderManagerFirstName, project.getTeamLeader().getManager().getFirstName());
+        }
+    }
+
     public void testLargeProjects() {
         // TODO: currently the test verifies that the query doesn't blow up.
         // Add control query so that the results could be verified.