diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java index 706801da5..0e241b68f 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java @@ -27,9 +27,19 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.NamedNativeQueries; import javax.persistence.NamedNativeQuery; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; import javax.persistence.SqlResultSetMapping; import javax.persistence.Table; +@NamedQuery(name="FindXTwo", query="select s from simple s where s.name = :fname") + +@NamedQueries( { + @NamedQuery(name="FindOne", query="select s from simple s where s.name = :fname"), + @NamedQuery(name="FindOne", query="select s from simple s where s.name = :fname"), + @NamedQuery(name="FindAll", query="select s from simple s") +}) + @NamedNativeQueries( { @NamedNativeQuery(name = "findSimpleEntitites", query = "SELECT ID, NAME, VALUE FROM SIMPLE_ENTITY", diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java new file mode 100644 index 000000000..920fd2a01 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java @@ -0,0 +1,87 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.query; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; + +@NamedQuery(name="FindXTwo", query="select s from simple2 s where s.name = :fname") + +@NamedQueries( { + @NamedQuery(name="FindOne", query="select s from simple2 s where s.name = :fname"), + @NamedQuery(name="Find2One", query="select s from simple2 s where s.name = :fname"), + @NamedQuery(name="Find2All", query="select s from simple2 s") +}) + +@Entity(name = "simple2") +@Table(name = "SIMPLE_ENTITY2") +public class SimpleEntity2 { + + @Id + @GeneratedValue + @Column(name = "ID") + private long id; + + @Basic + @Column(name = "NAME") + private String name; + + @Basic + @Column(name = "VALUE") + private String value; + + public SimpleEntity2() { + } + + public SimpleEntity2(String name, String value) { + this(); + this.name = name; + this.value = value; + } + + public long getId() { + return this.id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java new file mode 100644 index 000000000..630a61878 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.query; + +import java.util.Iterator; +import java.util.List; +import javax.persistence.EntityManager; + +import junit.textui.TestRunner; +import org.apache.openjpa.persistence.test.SingleEMFTestCase; + +public class TestDupNamedQuery extends SingleEMFTestCase { + + public void setUp() { + setUp(SimpleEntity.class, SimpleEntity2.class, CLEAR_TABLES); + + EntityManager em = emf.createEntityManager(); + em.getTransaction().begin(); + em.persist(new SimpleEntity("Name One", "Value One")); + em.persist(new SimpleEntity("Name Two", "Value Two")); + em.persist(new SimpleEntity2("Name2 One", "Value2 One")); + em.persist(new SimpleEntity2("Name2 Two", "Value2 Two")); + em.getTransaction().commit(); + em.close(); + } + + public void testSimpleQuery() { + simpleQuery(false, "FindOne", "FindAll", "Name One", "Value One", + "Name Two", "Value Two"); + simpleQuery(true, "Find2One", "Find2All", "Name2 One", "Value2 One", + "Name2 Two", "Value2 Two"); + + simpleQuery(false, "FindXTwo", null, "Name Two", "Value Two", null, + null); + } + + private void simpleQuery(boolean simple2, String findOneQName, + String findAllQName, String nameOne, String ValueOne, String nameTwo, + String ValueTwo) { + EntityManager em = emf.createEntityManager(); + + List list = em.createNamedQuery(findOneQName).setParameter(1, nameOne) + .getResultList(); + assertNotNull(list); + assertEquals(list.size(), 1); + Object o = list.get(0); + assertSame(o.getClass(), simple2 ? SimpleEntity2.class + : SimpleEntity.class); + assertEquals(simple2 ? ((SimpleEntity2) o).getValue() + : ((SimpleEntity) o).getValue(), ValueOne); + + if (findAllQName != null) { + list = em.createNamedQuery(findAllQName).getResultList(); + assertNotNull(list); + assertEquals(list.size(), 2); + for (Iterator resultIter = list.iterator(); resultIter.hasNext();) { + o = resultIter.next(); + assertSame(o.getClass(), simple2 ? SimpleEntity2.class + : SimpleEntity.class); + String n = null; + String v = null; + if (simple2) { + n = ((SimpleEntity2) o).getName(); + v = ((SimpleEntity2) o).getValue(); + } else { + n = ((SimpleEntity) o).getName(); + v = ((SimpleEntity) o).getValue(); + } + if (n.equals(nameOne)) { + assertTrue(v.equals(ValueOne)); + } else if (n.equals(nameTwo)) { + assertTrue(v.equals(ValueTwo)); + } else { + assertTrue(false); + } + } + } + em.close(); + } + + public static void main(String[] args) { + TestRunner.run(TestDupNamedQuery.class); + } +}