CAY-2871 QualifierTranslator breaks on a relationship with a compound FK

apache · Sep 4, 2024 · a036d3f · a036d3f
1 parent 2ae50e6
commit a036d3f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
@@ -69,7 +69,9 @@ class QualifierTranslator implements TraversalHandler {
     QualifierTranslator(TranslatorContext context) {
         this.context = context;
         this.pathTranslator = context.getPathTranslator();
-        this.expressionsToSkip = new HashSet<>();
+        // must use identity comparison for the node skipping, or it could skip the wrong node
+        // and mess everything up, see for example CAY-2871
+        this.expressionsToSkip = Collections.newSetFromMap(new IdentityHashMap<>());
         this.nodeStack = new ArrayDeque<>();
     }
 

diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
@@ -36,6 +36,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -56,6 +58,7 @@ public void setUp() throws Exception {
         TableHelper tCompoundPKTest = new TableHelper(dbHelper, "COMPOUND_PK_TEST");
         tCompoundPKTest.setColumns("KEY1", "KEY2", "NAME");
         tCompoundPKTest.insert("PK1", "PK2", "BBB");
+        tCompoundPKTest.insert("PK3", "PK4", "CCC");
     }
 
     @Test
@@ -81,4 +84,29 @@ public void testCompoundPK() {
         assertEquals(" ( ( ( t0.F_KEY1 = 'PK1' ) AND ( t0.F_KEY2 = 'PK2' ) ) AND t0.NAME LIKE 'test%' ) AND t0.NAME LIKE '%a%'", visitor.getSQLString());
     }
 
+    @Test
+    public void testMultipleCompoundPK() {
+        List<CompoundPkTestEntity> testEntity = ObjectSelect.query(CompoundPkTestEntity.class)
+                .limit(2)
+                .select(context);
+        assertNotNull(testEntity);
+        assertEquals(2, testEntity.size());
+
+        ObjectSelect<CompoundFkTestEntity> query = ObjectSelect.query(CompoundFkTestEntity.class)
+                .where(CompoundFkTestEntity.TO_COMPOUND_PK.eq(testEntity.get(0)))
+                .or(CompoundFkTestEntity.TO_COMPOUND_PK.eq(testEntity.get(1)));
+
+        DefaultSelectTranslator translator
+                = new DefaultSelectTranslator(query, runtime.getDataDomain().getDefaultNode().getAdapter(), context.getEntityResolver());
+
+        QualifierTranslator qualifierTranslator = translator.getContext().getQualifierTranslator();
+
+        Node node = qualifierTranslator.translate(query.getWhere());
+
+        SQLGenerationVisitor visitor = new SQLGenerationVisitor(new StringBuilderAppendable());
+        node.visit(visitor);
+
+        assertEquals(" ( ( t0.F_KEY1 = 'PK1' ) AND ( t0.F_KEY2 = 'PK2' ) ) OR ( ( t0.F_KEY1 = 'PK3' ) AND ( t0.F_KEY2 = 'PK4' ) )", visitor.getSQLString());
+    }
+
 }