[Jboss-cvs] JBossAS SVN: r56689 - in branches/Branch_4_0/ejb3: docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean docs/tutorial/joininheritance docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean docs/tutorial/merge docs/tutorial/merge/src/org/jboss/tutorial/merge/bean docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean docs/tutorial/singleinheritance docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean docs/tutorial/tableperinheritance docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean src/resources/test src/test/org/jboss/ejb3/test src/test/org/jboss/ejb3/test/entity src/test/org/jboss/ejb3/test/entityexception src/test/org/jboss/ejb3/test/hbm src/test/org/jboss/ejb3/test/joininheritance src/test/org/jboss/ejb3/test/regression src/test/org/jboss/ejb3/test/regression/salesforce7123 src/test/org/jboss/ejb3/test/regressi! onHHH275 src/test/org/jboss/ejb3/test/singletableinheritance src/test/org/jboss/ejb3/test/tableperinheritance
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 8 21:57:24 EDT 2006
Author: bill.burke at jboss.com
Date: 2006-09-08 21:57:09 -0400 (Fri, 08 Sep 2006)
New Revision: 56689
Removed:
branches/Branch_4_0/ejb3/src/resources/test/pkg/
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/pkg/
Modified:
branches/Branch_4_0/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java
branches/Branch_4_0/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java
branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/join.html
branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java
branches/Branch_4_0/ejb3/docs/tutorial/merge/merge.html
branches/Branch_4_0/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java
branches/Branch_4_0/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java
branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/single.html
branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java
branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java
branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/table.html
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java
branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java
Log:
"From Customer C" syntax no longer allowed by hibernate.
Modified: branches/Branch_4_0/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/callbacks/src/org/jboss/tutorial/callback/bean/CustomerDAOBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -57,7 +57,7 @@
public List findByLastName(String last)
{
System.out.println("-- CustomerDAOBean.findByLastName(id)");
- return manager.createQuery("from Customer c where c.last = :last").setParameter("last", last).getResultList();
+ return manager.createQuery("select c from Customer c where c.last = :last").setParameter("last", last).getResultList();
}
public void merge(Customer c)
Modified: branches/Branch_4_0/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/dependent/src/org/jboss/tutorial/dependent/bean/CustomerDAOBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -49,7 +49,7 @@
public List findByLastName(String name)
{
- return manager.createQuery("from Customer c where c.name.last = :name").setParameter("name", name).getResultList();
+ return manager.createQuery("select c from Customer c where c.name.last = :name").setParameter("name", name).getResultList();
}
public void merge(Customer c)
Modified: branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/join.html
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/join.html 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/join.html 2006-09-09 01:57:09 UTC (rev 56689)
@@ -35,7 +35,7 @@
<pre>
public List findByWeight(double weight)
{
- return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+ return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
}
</pre>
</p><p>
Modified: branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/joininheritance/src/org/jboss/tutorial/joininheritance/bean/PetDAOBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -56,6 +56,6 @@
public List findByWeight(double weight)
{
- return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+ return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
}
}
Modified: branches/Branch_4_0/ejb3/docs/tutorial/merge/merge.html
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/merge/merge.html 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/merge/merge.html 2006-09-09 01:57:09 UTC (rev 56689)
@@ -37,7 +37,7 @@
<pre>
public List findByLastName(String name)
{
- return manager.createQuery("from Customer c where c.last = :name").setParameter("name", name).getResultList();
+ return manager.createQuery("select c from Customer c where c.last = :name").setParameter("name", name).getResultList();
}
</pre>
</p><p>
Modified: branches/Branch_4_0/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/merge/src/org/jboss/tutorial/merge/bean/CustomerDAOBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -49,7 +49,7 @@
public List findByLastName(String name)
{
- return manager.createQuery("from Customer c where c.last = :name").setParameter("name", name).getResultList();
+ return manager.createQuery("select c from Customer c where c.last = :name").setParameter("name", name).getResultList();
}
public void merge(Customer c)
Modified: branches/Branch_4_0/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/secondary/src/org/jboss/tutorial/secondary/bean/CustomerDAOBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -50,7 +50,7 @@
public List findByLastName(String name)
{
- return manager.createQuery("from Customer c where c.last = :name").setParameter("name", name).getResultList();
+ return manager.createQuery("select c from Customer c where c.last = :name").setParameter("name", name).getResultList();
}
public void merge(Customer c)
Modified: branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/single.html
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/single.html 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/single.html 2006-09-09 01:57:09 UTC (rev 56689)
@@ -39,7 +39,7 @@
<pre>
public List findByWeight(double weight)
{
- return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+ return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
}
</pre>
</p><p>
Modified: branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/singleinheritance/src/org/jboss/tutorial/singleinheritance/bean/PetDAOBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -54,6 +54,6 @@
public List findByWeight(double weight)
{
- return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+ return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
}
}
Modified: branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/src/org/jboss/tutorial/tableperinheritance/bean/PetDAOBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -55,6 +55,6 @@
public List findByWeight(double weight)
{
- return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+ return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
}
}
Modified: branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/table.html
===================================================================
--- branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/table.html 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/docs/tutorial/tableperinheritance/table.html 2006-09-09 01:57:09 UTC (rev 56689)
@@ -35,7 +35,7 @@
<pre>
public List findByWeight(double weight)
{
- return manager.createQuery("from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
+ return manager.createQuery("select p from Pet p where p.weight < :weight").setParameter("weight", weight).getResultList();
}
</pre>
</p><p>
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/Airport.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -36,8 +36,8 @@
*/
@Entity
@NamedQueries (
- {@NamedQuery(name="allAirports", query="from Airport"),
- @NamedQuery(name="airportById", query="from Airport a where a.id=:id")})
+ {@NamedQuery(name="allAirports", query="select a from Airport a"),
+ @NamedQuery(name="airportById", query="select a from Airport a where a.id=:id")})
public class Airport
{
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/EntityTestBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -75,7 +75,7 @@
Query q = manager.createQuery("SELECT c FROM Customer c");
List l = q.getResultList();
if (l.size() == 0) throw new RuntimeException("failed");
- org.hibernate.Query q2 = session.createQuery("FROM Customer c");
+ org.hibernate.Query q2 = session.createQuery("Select c FROM Customer c");
l = q2.list();
if (l.size() == 0) throw new RuntimeException("failed");
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entity/FieldAirport.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -34,7 +34,7 @@
* @version $Revision$
*/
@Entity
- at NamedQuery(name="airportByCode", query="from FieldAirport a where a.code=:code")
+ at NamedQuery(name="airportByCode", query="select a from FieldAirport a where a.code=:code")
public class FieldAirport
{
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -253,7 +253,7 @@
createEntry(new Person(12, "B"));
createEntry(new Person(13, "C"));
- Query query = manager.createQuery("from Person");
+ Query query = manager.createQuery("select p from Person p");
try
{
query.getSingleResult();
@@ -263,7 +263,7 @@
{
}
- Query query2 = manager.createQuery("from Person where id=999");
+ Query query2 = manager.createQuery("select p from Person p where id=999");
try
{
query2.getSingleResult();
@@ -279,7 +279,7 @@
try
{
- Query query = manager.createQuery("from Person");
+ Query query = manager.createQuery("select p from Person p");
query.setHint("org.hibernate.timeout", "Not an integer");
throw new RuntimeException("IllegalArgumentException not thrown for setHint");
}
@@ -287,7 +287,7 @@
{
}
- Query query = manager.createQuery("from Person where id=:id and name=:name");
+ Query query = manager.createQuery("select p from Person p where id=:id and name=:name");
try
{
query.setParameter("nosuchparam", "Whateverrrr");
@@ -307,7 +307,7 @@
{
}
- query = manager.createQuery("from Person where id=? and name=?");
+ query = manager.createQuery("select p from Person p where id=? and name=?");
query.setParameter(0, 1);
query.setParameter(1, "XXX");
try
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/hbm/EntityTestBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -58,11 +58,11 @@
public List findAnnotated()
{
- return em.createQuery("from Annotated an").getResultList();
+ return em.createQuery("select an from Annotated an").getResultList();
}
public List findHBM()
{
- return em.createQuery("from HBM hbm").getResultList();
+ return em.createQuery("select hbm from HBM hbm").getResultList();
}
}
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/joininheritance/EntityTestBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -95,13 +95,13 @@
public void test1() throws Exception
{
- assertEquals(manager.createQuery("from Person").getResultList().size(), 3);
- assertEquals(manager.createQuery("from Person p where p.class = Customer").getResultList().size(), 1);
+ assertEquals(manager.createQuery("select p from Person p").getResultList().size(), 3);
+ assertEquals(manager.createQuery("select p from Person p where p.class = Customer").getResultList().size(), 1);
}
public void test2() throws Exception
{
- List customers = manager.createQuery("from Customer c left join fetch c.salesperson").getResultList();
+ List customers = manager.createQuery("select c from Customer c left join fetch c.salesperson").getResultList();
for (Iterator iter = customers.iterator(); iter.hasNext();)
{
Customer c = (Customer) iter.next();
@@ -112,7 +112,7 @@
public void test3() throws Exception
{
- List customers = manager.createQuery("from Customer").getResultList();
+ List customers = manager.createQuery("select c from Customer c").getResultList();
for (Iterator iter = customers.iterator(); iter.hasNext();)
{
Customer c = (Customer) iter.next();
@@ -128,10 +128,10 @@
Person yomomma = manager.find(Person.class, new Long(ids[2]));
mark.setZip("30306");
- assertEquals(manager.createQuery("from Person p where p.zip = '30306'").getResultList().size(), 1);
+ assertEquals(manager.createQuery("select p from Person p where p.zip = '30306'").getResultList().size(), 1);
manager.remove(mark);
manager.remove(joe);
manager.remove(yomomma);
- assertTrue(manager.createQuery("from Person").getResultList().isEmpty());
+ assertTrue(manager.createQuery("select p from Person p").getResultList().isEmpty());
}
}
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/InheritanceSessionBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -81,7 +81,7 @@
public List getContacts()
{
- Query query = em.createQuery("from Contact");
+ Query query = em.createQuery("select c from Contact c");
return query.getResultList();
}
}
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regression/salesforce7123/DataAccessBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -51,7 +51,7 @@
public List findMyBeans()
{
- List list = manager.createQuery("FROM BaseData base").getResultList();
+ List list = manager.createQuery("SELECT base FROM BaseData base").getResultList();
for (Object obj : list)
{
BaseData data = (BaseData)obj;
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/regressionHHH275/SearchDAO.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -60,7 +60,7 @@
public int find()
{
- Query q = em.createQuery("From SavedSearch s WHERE (s.id = 'u1' OR s.id = 'USER_ALL_USERS') AND s.searchTitle = 'CRAP'");
+ Query q = em.createQuery("select s From SavedSearch s WHERE (s.id = 'u1' OR s.id = 'USER_ALL_USERS') AND s.searchTitle = 'CRAP'");
return q.getResultList().size();
}
}
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/singletableinheritance/EntityTestBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -94,15 +94,15 @@
public void test1() throws Exception
{
- assertEquals(manager.createQuery("from java.io.Serializable").getResultList().size(), 0);
+ assertEquals(manager.createQuery("select s from java.io.Serializable s").getResultList().size(), 0);
- assertEquals(manager.createQuery("from Person").getResultList().size(), 3);
- assertEquals(manager.createQuery("from Person p where p.class = Customer").getResultList().size(), 1);
+ assertEquals(manager.createQuery("select p from Person p").getResultList().size(), 3);
+ assertEquals(manager.createQuery("select p from Person p where p.class = Customer").getResultList().size(), 1);
}
public void test2() throws Exception
{
- List customers = manager.createQuery("from Customer c left join fetch c.salesperson").getResultList();
+ List customers = manager.createQuery("select c from Customer c left join fetch c.salesperson").getResultList();
for (Iterator iter = customers.iterator(); iter.hasNext();)
{
Customer c = (Customer) iter.next();
@@ -113,7 +113,7 @@
public void test3() throws Exception
{
- List customers = manager.createQuery("from Customer").getResultList();
+ List customers = manager.createQuery("select c from Customer c").getResultList();
for (Iterator iter = customers.iterator(); iter.hasNext();)
{
Customer c = (Customer) iter.next();
@@ -129,10 +129,10 @@
Person yomomma = manager.find(Person.class, new Long(ids[2]));
mark.setZip("30306");
- assertEquals(manager.createQuery("from Person p where p.zip = '30306'").getResultList().size(), 1);
+ assertEquals(manager.createQuery("select p from Person p where p.zip = '30306'").getResultList().size(), 1);
manager.remove(mark);
manager.remove(joe);
manager.remove(yomomma);
- assertTrue(manager.createQuery("from Person").getResultList().isEmpty());
+ assertTrue(manager.createQuery("select p from Person p").getResultList().isEmpty());
}
}
Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java 2006-09-09 01:25:19 UTC (rev 56688)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/tableperinheritance/EntityTestBean.java 2006-09-09 01:57:09 UTC (rev 56689)
@@ -100,14 +100,14 @@
public void test1() throws Exception
{
- assertEquals(manager.createQuery("from java.io.Serializable").getResultList().size(), 0);
+ assertEquals(manager.createQuery("select s from java.io.Serializable s").getResultList().size(), 0);
- assertEquals(manager.createQuery("from Person").getResultList().size(), 3);
+ assertEquals(manager.createQuery("select p from Person p").getResultList().size(), 3);
}
public void test2() throws Exception
{
- List customers = manager.createQuery("from Customer c left join fetch c.salesperson").getResultList();
+ List customers = manager.createQuery("select c from Customer c left join fetch c.salesperson").getResultList();
for (Iterator iter = customers.iterator(); iter.hasNext();)
{
Customer c = (Customer) iter.next();
@@ -118,7 +118,7 @@
public void test3() throws Exception
{
- List customers = manager.createQuery("from Customer").getResultList();
+ List customers = manager.createQuery("select c from Customer c").getResultList();
for (Iterator iter = customers.iterator(); iter.hasNext();)
{
Customer c = (Customer) iter.next();
@@ -134,10 +134,10 @@
Person yomomma = manager.find(Person.class, new Long(ids[2]));
mark.setZip("30306");
- assertEquals(manager.createQuery("from Person p where p.zip = '30306'").getResultList().size(), 1);
+ assertEquals(manager.createQuery("select p from Person p where p.zip = '30306'").getResultList().size(), 1);
manager.remove(mark);
manager.remove(joe);
manager.remove(yomomma);
- assertTrue(manager.createQuery("from Person").getResultList().isEmpty());
+ assertTrue(manager.createQuery("select p from Person p").getResultList().isEmpty());
}
}
More information about the jboss-cvs-commits
mailing list