Chunk |
---|
Conflicting content |
---|
} @Test <<<<<<< HEAD public void Treat() { QCat cat = QCat.cat; JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT); QueryMetadata md = new DefaultQueryMetadata(); md.addJoin(JoinType.DEFAULT, cat); md.addJoin(JoinType.JOIN, cat.mate.as((Path)QDomesticCat.domesticCat)); md.addProjection(QDomesticCat.domesticCat); serializer.serialize(md, false, null); assertEquals("select domesticCat\n" + "from Cat cat\n" + " inner join treat(cat.mate as DomesticCat) as domesticCat", serializer.toString()); ======= public void OpenJPA_Variables() { QCat cat = QCat.cat; JPQLSerializer serializer = new JPQLSerializer(OpenJPATemplates.DEFAULT); QueryMetadata md = new DefaultQueryMetadata(); md.addJoin(JoinType.DEFAULT, cat); md.addJoin(JoinType.INNERJOIN, cat.mate); md.addJoinCondition(cat.mate.alive); serializer.serialize(md, false, null); assertEquals("select cat_\nfrom Cat cat_\n inner join cat_.mate on cat_.mate.alive", serializer.toString()); >>>>>>> 56f7c3654001ccdc77464f9ad985cdf98518c14f } } |
Solution content |
---|
} @Test public void Treat() { QCat cat = QCat.cat; JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT); QueryMetadata md = new DefaultQueryMetadata(); md.addJoin(JoinType.DEFAULT, cat); md.addJoin(JoinType.JOIN, cat.mate.as((Path) QDomesticCat.domesticCat)); md.addProjection(QDomesticCat.domesticCat); serializer.serialize(md, false, null); assertEquals("select domesticCat\n" + "from Cat cat\n" + " inner join treat(cat.mate as DomesticCat) as domesticCat", serializer.toString()); } @Test public void OpenJPA_Variables() { QCat cat = QCat.cat; JPQLSerializer serializer = new JPQLSerializer(OpenJPATemplates.DEFAULT); QueryMetadata md = new DefaultQueryMetadata(); md.addJoin(JoinType.DEFAULT, cat); md.addJoin(JoinType.INNERJOIN, cat.mate); md.addJoinCondition(cat.mate.alive); serializer.serialize(md, false, null); assertEquals("select cat_\nfrom Cat cat_\n inner join cat_.mate on cat_.mate.alive", serializer.toString()); } } |
File |
---|
JPQLSerializerTest.java |
Developer's decision |
---|
Concatenation |
Kind of conflict |
---|
Method invocation |
Method signature |
Variable |