Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: issue with multiple aliases against same table #1761

Merged
merged 1 commit into from
Dec 12, 2022
Merged

fix: issue with multiple aliases against same table #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ence.core/src/main/java/org/eclipse/persistence/internal/expressions/TableExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
14 changes: 14 additions & 0 deletions ...dvanced/src/main/java/org/eclipse/persistence/testing/models/jpa/advanced/Customizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions .../org/eclipse/persistence/testing/tests/jpa/advanced/JoinedAttributeAdvancedJunitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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.
Expand Down