Bug 578686: Remove OrderBy parameter binding use case
Signed-off-by: Will Dazey <dazeydev.3@gmail.com>
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/SQLSelectStatement.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/SQLSelectStatement.java
index 4fa9a39..5a4c1ab 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/SQLSelectStatement.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/SQLSelectStatement.java
@@ -764,12 +764,6 @@
for (Iterator<Expression> expressionsEnum = getOrderByExpressions().iterator(); expressionsEnum.hasNext();) {
Expression expression = expressionsEnum.next();
- if(!printer.getPlatform().supportsOrderByParameters()) {
- if(expression.isParameterExpression() || expression.isConstantExpression()) {
- printer.getCall().setUsesBinding(false);
- }
- }
-
expression.printSQL(printer);
if (expressionsEnum.hasNext()) {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryOrderBy.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryOrderBy.java
index 87e0363..29f97d6 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryOrderBy.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/query/TestQueryOrderBy.java
@@ -26,19 +26,24 @@
import jakarta.persistence.criteria.ParameterExpression;
import jakarta.persistence.criteria.Root;
+import org.eclipse.persistence.internal.databaseaccess.Platform;
+import org.eclipse.persistence.internal.jpa.EntityManagerFactoryImpl;
import org.eclipse.persistence.jpa.test.framework.DDLGen;
import org.eclipse.persistence.jpa.test.framework.Emf;
import org.eclipse.persistence.jpa.test.framework.EmfRunner;
import org.eclipse.persistence.jpa.test.framework.Property;
+import org.eclipse.persistence.jpa.test.framework.SQLCallListener;
import org.eclipse.persistence.jpa.test.query.model.EntityTbl01;
import org.eclipse.persistence.jpa.test.query.model.EntityTbl01_;
+import org.eclipse.persistence.platform.database.DatabasePlatform;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(EmfRunner.class)
public class TestQueryOrderBy {
- @Emf(createTables = DDLGen.DROP_CREATE, classes = { EntityTbl01.class },
- properties = { @Property(name="eclipselink.logging.level", value="FINE")})
+ @Emf(name = "DefaultPersistenceUnit", createTables = DDLGen.DROP_CREATE, classes = { EntityTbl01.class },
+ properties = {
+ @Property(name="eclipselink.logging.level", value="FINE")})
private EntityManagerFactory emf;
@Emf(name = "BindLiteralsPersistenceUnit", classes = { EntityTbl01.class },
@@ -47,6 +52,12 @@
@Property(name="eclipselink.logging.level", value="FINE")})
private EntityManagerFactory emf2;
+ @SQLCallListener(name = "DefaultPersistenceUnit")
+ List<String> _sql;
+
+ @SQLCallListener(name = "BindLiteralsPersistenceUnit")
+ List<String> _sql2;
+
private static boolean POPULATED = false;
@Test
@@ -66,7 +77,6 @@
List<Integer> dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
query = em.createQuery(""
+ "SELECT t.itemInteger1 FROM EntityTbl01 t ORDER BY 1 ASC", Integer.class);
@@ -74,7 +84,6 @@
dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
// equivalent CriteriaBuilder
CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -88,7 +97,6 @@
dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -107,8 +115,15 @@
if(!POPULATED)
populate();
+ Platform platform = getPlatform(emf);
EntityManager em = emf2.createEntityManager();
+ // DB2 and Derby does not support untyped parameter binding in ORDER BY clause
+ // 'emf2' sets 'shouldBindLiterals=true', which makes literal values bind as untyped parameters
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ return;
+ }
+
try {
TypedQuery<Integer> query = em.createQuery(""
+ "SELECT t.itemInteger1 FROM EntityTbl01 t ORDER BY 1", Integer.class);
@@ -116,7 +131,6 @@
List<Integer> dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
query = em.createQuery(""
+ "SELECT t.itemInteger1 FROM EntityTbl01 t ORDER BY 1 ASC", Integer.class);
@@ -124,7 +138,6 @@
dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
// equivalent CriteriaBuilder
CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -138,7 +151,144 @@
dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
+ } finally {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ if(em.isOpen()) {
+ em.close();
+ }
+ }
+ }
+
+ @Test
+ public void testQueryOrderByLiterals3() {
+ if (emf == null)
+ return;
+
+ if(!POPULATED)
+ populate();
+
+ Platform platform = getPlatform(emf);
+ EntityManager em = emf.createEntityManager();
+
+ try {
+ TypedQuery<Integer> query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = 'B' ORDER BY 1", Integer.class);
+
+ List<Integer> dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ?", _sql.remove(0));
+ }
+
+ query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = 'B' ORDER BY 1 ASC", Integer.class);
+
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql.remove(0));
+ }
+
+ // equivalent CriteriaBuilder
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery<Integer> cquery = cb.createQuery(Integer.class);
+ Root<EntityTbl01> root = cquery.from(EntityTbl01.class);
+ cquery.multiselect(root.get(EntityTbl01_.itemInteger1));
+ cquery.where(cb.equal(root.get(EntityTbl01_.itemString2), cb.literal("B")));
+ cquery.orderBy(cb.asc(cb.literal(1)));
+
+ query = em.createQuery(cquery);
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql.remove(0));
+ }
+ } finally {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ if(em.isOpen()) {
+ em.close();
+ }
+ }
+ }
+
+ @Test
+ public void testQueryOrderByLiterals4() {
+ if (emf2 == null)
+ return;
+
+ if(!POPULATED)
+ populate();
+
+ Platform platform = getPlatform(emf2);
+ EntityManager em = emf2.createEntityManager();
+
+ // DB2 and Derby does not support untyped parameter binding in ORDER BY clause
+ // 'emf2' sets 'shouldBindLiterals=true', which makes literal values bind as untyped parameters
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ return;
+ }
+
+ try {
+ TypedQuery<Integer> query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = 'B' ORDER BY 1", Integer.class);
+
+ List<Integer> dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql2.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1", _sql2.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ?", _sql2.remove(0));
+ }
+
+ query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = 'B' ORDER BY 1 ASC", Integer.class);
+
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql2.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql2.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql2.remove(0));
+ }
+
+ // equivalent CriteriaBuilder
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery<Integer> cquery = cb.createQuery(Integer.class);
+ Root<EntityTbl01> root = cquery.from(EntityTbl01.class);
+ cquery.multiselect(root.get(EntityTbl01_.itemInteger1));
+ cquery.where(cb.equal(root.get(EntityTbl01_.itemString2), cb.literal("B")));
+ cquery.orderBy(cb.asc(cb.literal(1)));
+
+ query = em.createQuery(cquery);
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql2.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql2.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql2.remove(0));
+ }
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -157,8 +307,14 @@
if(!POPULATED)
populate();
+ Platform platform = getPlatform(emf);
EntityManager em = emf.createEntityManager();
+ // DB2 and Derby does not support untyped parameter binding in ORDER BY clause
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ return;
+ }
+
try {
TypedQuery<Integer> query = em.createQuery(""
+ "SELECT t.itemInteger1 FROM EntityTbl01 t ORDER BY ?1", Integer.class);
@@ -167,7 +323,6 @@
List<Integer> dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
query = em.createQuery(""
+ "SELECT t.itemInteger1 FROM EntityTbl01 t ORDER BY ?1 ASC", Integer.class);
@@ -176,7 +331,6 @@
dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
// equivalent CriteriaBuilder
CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -192,7 +346,231 @@
dto01 = query.getResultList();
assertNotNull(dto01);
assertEquals(4, dto01.size());
- assertEquals(new Integer(29), dto01.get(1));
+ } finally {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ if(em.isOpen()) {
+ em.close();
+ }
+ }
+ }
+
+ @Test
+ public void testQueryOrderByParameters2() {
+ if (emf == null)
+ return;
+
+ if(!POPULATED)
+ populate();
+
+ Platform platform = getPlatform(emf);
+ EntityManager em = emf.createEntityManager();
+
+ // DB2 and Derby does not support untyped parameter binding in ORDER BY clause
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ return;
+ }
+
+ try {
+ TypedQuery<Integer> query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = ?1 ORDER BY ?2", Integer.class);
+ query.setParameter(1, "B");
+ query.setParameter(2, 1);
+
+ List<Integer> dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY 1", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ?", _sql.remove(0));
+ }
+
+ query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = ?1 ORDER BY ?2 ASC", Integer.class);
+ query.setParameter(1, "B");
+ query.setParameter(2, 1);
+
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY 1 ASC", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql.remove(0));
+ }
+
+ // equivalent CriteriaBuilder
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery<Integer> cquery = cb.createQuery(Integer.class);
+ Root<EntityTbl01> root = cquery.from(EntityTbl01.class);
+ cquery.multiselect(root.get(EntityTbl01_.itemInteger1));
+ ParameterExpression<String> strParam1 = cb.parameter(String.class);
+ ParameterExpression<Integer> intParam2 = cb.parameter(Integer.class);
+ cquery.where(cb.equal(root.get(EntityTbl01_.itemString2), strParam1));
+ cquery.orderBy(cb.asc(intParam2));
+
+ query = em.createQuery(cquery);
+ query.setParameter(strParam1, "B");
+ query.setParameter(intParam2, 1);
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY 1 ASC", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql.remove(0));
+ }
+ } finally {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ if(em.isOpen()) {
+ em.close();
+ }
+ }
+ }
+
+ @Test
+ public void testQueryOrderByMix1() {
+ if (emf == null)
+ return;
+
+ if(!POPULATED)
+ populate();
+
+ Platform platform = getPlatform(emf);
+ EntityManager em = emf.createEntityManager();
+
+ try {
+ TypedQuery<Integer> query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = ?1 ORDER BY 1", Integer.class);
+ query.setParameter(1, "B");
+
+ List<Integer> dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY 1", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ?", _sql.remove(0));
+ }
+
+ query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = ?1 ORDER BY 1 ASC", Integer.class);
+ query.setParameter(1, "B");
+
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql.remove(0));
+ }
+
+ // equivalent CriteriaBuilder
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery<Integer> cquery = cb.createQuery(Integer.class);
+ Root<EntityTbl01> root = cquery.from(EntityTbl01.class);
+ cquery.multiselect(root.get(EntityTbl01_.itemInteger1));
+ ParameterExpression<String> strParam1 = cb.parameter(String.class);
+ cquery.where(cb.equal(root.get(EntityTbl01_.itemString2), strParam1));
+ cquery.orderBy(cb.asc(cb.literal(1)));
+
+ query = em.createQuery(cquery);
+ query.setParameter(strParam1, "B");
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql.remove(0));
+ }
+ } finally {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ if(em.isOpen()) {
+ em.close();
+ }
+ }
+ }
+
+ @Test
+ public void testQueryOrderByMix2() {
+ if (emf2 == null)
+ return;
+
+ if(!POPULATED)
+ populate();
+
+ Platform platform = getPlatform(emf2);
+ EntityManager em = emf2.createEntityManager();
+
+ // DB2 and Derby does not support untyped parameter binding in ORDER BY clause
+ // 'emf2' sets 'shouldBindLiterals=true', which makes literal values bind as untyped parameters
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ return;
+ }
+
+ try {
+ TypedQuery<Integer> query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = ?1 ORDER BY 1", Integer.class);
+ query.setParameter(1, "B");
+
+ List<Integer> dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql2.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1", _sql2.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ?", _sql2.remove(0));
+ }
+
+ query = em.createQuery(""
+ + "SELECT t.itemInteger1 FROM EntityTbl01 t WHERE t.itemString2 = ?1 ORDER BY 1 ASC", Integer.class);
+ query.setParameter(1, "B");
+
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql2.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql2.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql2.remove(0));
+ }
+
+ // equivalent CriteriaBuilder
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery<Integer> cquery = cb.createQuery(Integer.class);
+ Root<EntityTbl01> root = cquery.from(EntityTbl01.class);
+ cquery.multiselect(root.get(EntityTbl01_.itemInteger1));
+ ParameterExpression<String> strParam1 = cb.parameter(String.class);
+ cquery.where(cb.equal(root.get(EntityTbl01_.itemString2), strParam1));
+ cquery.orderBy(cb.asc(cb.literal(1)));
+
+ query = em.createQuery(cquery);
+ query.setParameter(strParam1, "B");
+ dto01 = query.getResultList();
+ assertNotNull(dto01);
+ assertEquals(3, dto01.size());
+ assertEquals(1, _sql2.size());
+ if(platform.isDB2Z() || platform.isDB2() || platform.isDerby()) {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = 'B') ORDER BY 1 ASC", _sql2.remove(0));
+ } else {
+ assertEquals("SELECT ITEM_INTEGER1 FROM SIMPLE_TBL01 WHERE (ITEM_STRING2 = ?) ORDER BY ? ASC", _sql2.remove(0));
+ }
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -247,10 +625,16 @@
em.getTransaction().commit();
POPULATED = true;
+ _sql.clear();
+ _sql2.clear();
} finally {
if(em.isOpen()) {
em.close();
}
}
}
+
+ private DatabasePlatform getPlatform(EntityManagerFactory emf) {
+ return ((EntityManagerFactoryImpl)emf).getServerSession().getPlatform();
+ }
}
