[Cayenne-dev] Re: [jira] Updated: (CAY-1484) Flattened attribute queries are incorrectly generated

Hi Xenia,

Thanks for looking into this. I reviewed the patch - looks correct to me (the unit test fails with an error before changes to SelectTranslator, and passes after doing the join stack reset), so please feel free to use your new committer powers to apply it. A few notes:

(1) Don't forget to add the newly generated CompoundPaintingLongNames.java and _CompoundPaintingLongNames.java (not included in the patch).

(2) I think we may even go with a more general fix - instead of conditionally resetting the stack after a flattened attribute, always do a reset before any attribute or relationship:

diff --git a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java b/framework/cayen
index 4ddee21..0d1c64f 100644
--- a/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
+++ b/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
@@ -364,6 +365,8 @@ public class SelectTranslator extends QueryAssembler {
}

private void visitRelationship(ArcProperty property) {
+ resetJoinStack();
+
ObjRelationship rel = property.getRelationship();
DbRelationship dbRel = rel.getDbRelationships().get(0);

The reset is a rather cheap operation, and the above seems to be just a little more consistent (hmm... I wonder if not resetting it inside 'visitRelationship' would result in bugs similar to CAY-1484 for entities with multiple flattened relationships??)

Andrus