Nabble - OpenJPA Commits

svn commit: r883808 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java

2009-11-24T10:37:53Z

Author: ppoddar
Date: Tue Nov 24 18:37:52 2009
New Revision: 883808

URL: http://svn.apache.org/viewvc?rev=883808&view=rev
Log:
Set proper return type on evaluated expression.

Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java?rev=883808&r1=883807&r2=883808&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java Tue Nov 24 18:37:52 2009
@@ -281,7 +281,9 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.abs(Expressions.toValue(e, factory, q));
+ Value value = factory.abs(Expressions.toValue(e, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

public StringBuilder asValue(AliasContext q) {
@@ -321,7 +323,9 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.avg(Expressions.toValue(e, factory, q));
+ Value value = factory.avg(Expressions.toValue(e, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

@Override
@@ -337,7 +341,9 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.sqrt(Expressions.toValue(e, factory, q));
+ Value value = factory.sqrt(Expressions.toValue(e, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

public StringBuilder asValue(AliasContext q) {
@@ -352,7 +358,9 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.max(Expressions.toValue(e, factory, q));
+ Value value = factory.max(Expressions.toValue(e, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

public StringBuilder asValue(AliasContext q) {
@@ -367,7 +375,9 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.min(Expressions.toValue(e, factory, q));
+ Value value = factory.min(Expressions.toValue(e, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

public StringBuilder asValue(AliasContext q) {
@@ -649,11 +659,13 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return (e2 == null)
+ Value value= (e2 == null)
? factory.sum(Expressions.toValue(e1, factory, q))
: factory.add(
Expressions.toValue(e1, factory, q),
Expressions.toValue(e2, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

@Override
@@ -705,9 +717,11 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.subtract(
+ Value value = factory.subtract(
Expressions.toValue(e1, factory, q),
Expressions.toValue(e2, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

@Override
@@ -732,9 +746,11 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.divide(
+ Value value = factory.divide(
Expressions.toValue(e1, factory, q),
Expressions.toValue(e2, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

@Override
@@ -756,9 +772,11 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- return factory.mod(
+ Value value = factory.mod(
Expressions.toValue(e1, factory, q),
Expressions.toValue(e2, factory, q));
+ value.setImplicitType(getJavaType());
+ return value;
}

@Override
@@ -1277,8 +1295,7 @@
}

@Override
- public org.apache.openjpa.kernel.exps.Value toValue(
- ExpressionFactory factory, CriteriaQueryImpl<?> q) {
+ public org.apache.openjpa.kernel.exps.Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
Value[] vs = new Value[values.size()];
int i = 0;
for (Expression<?> e : values)
@@ -1312,8 +1329,7 @@
}

@Override
- public org.apache.openjpa.kernel.exps.Value toValue(
- ExpressionFactory factory, CriteriaQueryImpl<?> q) {
+ public org.apache.openjpa.kernel.exps.Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
Value value1 = Expressions.toValue((ExpressionImpl<?>)val1, factory, q);
Value value2 = Expressions.toValue((ExpressionImpl<?>)val2, factory, q);
return factory.nullIfExpression(value1, value2);
@@ -1495,8 +1511,7 @@
}

@Override
- public org.apache.openjpa.kernel.exps.Value toValue(
- ExpressionFactory factory, CriteriaQueryImpl<?> q) {
+ public org.apache.openjpa.kernel.exps.Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
int size = whens.size();
org.apache.openjpa.kernel.exps.Expression[] exps = new org.apache.openjpa.kernel.exps.Expression[size];
for (int i = 0; i < size; i++) {
@@ -1575,8 +1590,7 @@
}

@Override
- public org.apache.openjpa.kernel.exps.Value toValue(
- ExpressionFactory factory, CriteriaQueryImpl<?> q) {
+ public org.apache.openjpa.kernel.exps.Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
Value caseOperandExpr = Expressions.toValue((ExpressionImpl<?>)caseOperand, factory, q);
int size = whens.size();
org.apache.openjpa.kernel.exps.Expression[] exps = new org.apache.openjpa.kernel.exps.Expression[size];
@@ -1769,8 +1783,7 @@
}

@Override
- public org.apache.openjpa.kernel.exps.Value toValue(
- ExpressionFactory factory, CriteriaQueryImpl<?> q) {
+ public org.apache.openjpa.kernel.exps.Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
org.apache.openjpa.kernel.exps.Value e = actual.toValue(factory, q);
e.setImplicitType(getJavaType());
return e;
@@ -1799,8 +1812,7 @@
}

@Override
- public org.apache.openjpa.kernel.exps.Arguments toValue(
- ExpressionFactory factory, CriteriaQueryImpl<?> q) {
+ public org.apache.openjpa.kernel.exps.Arguments toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
org.apache.openjpa.kernel.exps.Value[] kvs = new org.apache.openjpa.kernel.exps.Value[_args.length];
int i = 0;
for (ExpressionImpl<?> arg : _args) {

Pinaki

svn commit: r882358 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/

2009-11-19T15:28:46Z

Author: allee8285
Date: Thu Nov 19 23:28:45 2009
New Revision: 882358

URL: http://svn.apache.org/viewvc?rev=882358&view=rev
Log:
OPENJPA-1394 - DB2 supports Order By clause with recording locking using "WITH R*" construct. By enabling this feature in the DB2 dictionary, row locking can be perform with the fetch and eliminate the time window other thread snike in to fetch the same row.

Added:
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java (with props)
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java (with props)
openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java (with props)
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=882358&r1=882357&r2=882358&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Thu Nov 19 23:28:45 2009
@@ -122,6 +122,7 @@
supportsDeferredConstraints = false;
supportsDefaultDeleteAction = false;
supportsAlterTableWithDropColumn = false;
+ supportsLockingWithOrderClause = true;

supportsNullTableForGetColumns = false;
requiresCastForMathFunctions = true;

Added: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java?rev=882358&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java (added)
+++ openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java Thu Nov 19 23:28:45 2009
@@ -0,0 +1,79 @@
+/*
+ * 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.lockmgr;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class Department implements Externalizable {
+
+ private int id;
+
+ private String name;
+
+ private Collection<Employee> employees;
+
+ @OneToMany(cascade=CascadeType.ALL, mappedBy="department")
+ public Collection<Employee> getEmployees() {
+ return employees;
+ }
+
+ @Id
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String toString() {
+ return this.getClass().getName() + '@'
+ + Integer.toHexString(System.identityHashCode(this)) + "[id="
+ + getId() + "] first=" + getName();
+ }
+
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
+ id = in.readInt();
+ name = (String) in.readObject();
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeInt(id);
+ out.writeObject(name);
+ }
+}

Propchange: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java?rev=882358&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java (added)
+++ openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java Thu Nov 19 23:28:45 2009
@@ -0,0 +1,94 @@
+/*
+ * 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.lockmgr;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Employee implements Externalizable {
+
+ private int id;
+
+ private String firstName;
+ private String lastName;
+ private Department department;
+
+ @Id
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ @ManyToOne
+ @JoinColumn(name="FK_DEPT")
+ public Department getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(Department department) {
+ this.department = department;
+ }
+
+ public String toString() {
+ return this.getClass().getName() + '@'
+ + Integer.toHexString(System.identityHashCode(this)) + "[id="
+ + getId() + "] first=" + getFirstName()
+ + ", last=" + getLastName();
+ }
+
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
+ id = in.readInt();
+ firstName = (String) in.readObject();
+ lastName = (String) in.readObject();
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeInt(id);
+ out.writeObject(firstName);
+ out.writeObject(lastName);
+ }
+}

Propchange: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java?rev=882358&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java (added)
+++ openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java Thu Nov 19 23:28:45 2009
@@ -0,0 +1,242 @@
+/*
+ * 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.lockmgr;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.persistence.PessimisticLockException;
+import javax.persistence.Query;
+import javax.persistence.QueryTimeoutException;
+
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+/**
+ * Test Pessimistic Lock and exception behavior against EntityManager and Query interface methods.
+ */
+public class TestPessimisticLocks extends SQLListenerTestCase {
+
+ public void setUp() {
+ setSupportedDatabases(
+// org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
+// org.apache.openjpa.jdbc.sql.OracleDictionary.class,
+ org.apache.openjpa.jdbc.sql.DB2Dictionary.class);
+ if (isTestsDisabled()) {
+ return;
+ }
+
+ setUp(Employee.class, Department.class, "openjpa.LockManager", "mixed");
+ String empTable = getMapping(Employee.class).getTable().getFullName();
+ String deptTable = getMapping(Department.class).getTable().getFullName();
+
+ EntityManager em = null;
+ try {
+ em = emf.createEntityManager();
+ em.getTransaction().begin();
+
+ em.createQuery("delete from " + empTable).executeUpdate();
+ em.createQuery("delete from " + deptTable).executeUpdate();
+
+ em.getTransaction().commit();
+
+ Employee e1, e2;
+ Department d1, d2;
+ d1 = new Department();
+ d1.setId(10);
+ d1.setName("D10");
+
+ e1 = new Employee();
+ e1.setId(1);
+ e1.setDepartment(d1);
+ e1.setFirstName("first.1");
+ e1.setLastName("last.1");
+
+ d2 = new Department();
+ d2.setId(20);
+ d2.setName("D20");
+
+ e2 = new Employee();
+ e2.setId(2);
+ e2.setDepartment(d2);
+ e2.setFirstName("first.2");
+ e2.setLastName("last.2");
+
+ em.getTransaction().begin();
+ em.persist(d1);
+ em.persist(d2);
+ em.persist(e1);
+ em.persist(e2);
+ em.getTransaction().commit();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (em != null && em.isOpen()) {
+ em.close();
+ }
+ }
+ }
+
+ /*
+ * Test a find with pessimistic lock after a query with pessimistic lock and expect PessimisticLockException.
+ */
+ public void testFindWithLockTimeoutAfterQueryWithPessimisticLocks() {
+ EntityManager em1 = emf.createEntityManager();
+ EntityManager em2 = emf.createEntityManager();
+ try {
+ em1.getTransaction().begin();
+
+ Query query = em1.createQuery(
+ "select e from Employee e where e.id < 10 order by e.id").setFirstResult(1);
+ query.setLockMode(LockModeType.PESSIMISTIC_READ);
+ List<Employee> q = query.getResultList();
+ assertEquals("Expected 1 element with emplyee id=2", q.size(), 1);
+ assertEquals("Test Employee first name = 'first.2'", q.get(0).getFirstName(), "first.2");
+
+ em2.getTransaction().begin();
+
+ Map<String,Object> map = new HashMap<String,Object>();
+ map.put("javax.persistence.lock.timeout", 2000);
+ em2.find(Employee.class, 2, LockModeType.PESSIMISTIC_READ, map);
+ fail("Unexcpected find succeeded. Should throw a PessimisticLockException.");
+ } catch (QueryTimeoutException e) {
+ // TODO: DB2: This is the current unexpected exception due to OPENJPA-991.
+ // Remove this when the problem is fixed
+// System.out.println("Caught " + e.getClass().getName() + ":" + e.getMessage());
+ } catch (PessimisticLockException e) {
+ // TODO: This is the expected exception but will be fixed under OPENJPA-991
+// System.out.println("Caught " + e.getClass().getName() + ":" + e.getMessage());
+ } catch (Exception ex) {
+ fail("Caught unexpected " + ex.getClass().getName() + ":" + ex.getMessage());
+ } finally {
+ if( em1.getTransaction().isActive())
+ em1.getTransaction().rollback();
+ if( em2.getTransaction().isActive())
+ em2.getTransaction().rollback();
+ }
+
+ try {
+ em1.getTransaction().begin();
+
+ Query query = em1.createQuery(
+ "select e.department from Employee e where e.id < 10 order by e.department.id").setFirstResult(1);
+ query.setLockMode(LockModeType.PESSIMISTIC_READ);
+ List<Department> q = query.getResultList();
+ assertEquals("Expected 1 element with department id=20", q.size(), 1);
+ assertEquals("Test department name = 'D20'", q.get(0).getName(), "D20");
+
+ em2.getTransaction().begin();
+
+ Map<String,Object> map = new HashMap<String,Object>();
+ map.put("javax.persistence.lock.timeout", 2000);
+ Employee emp = em2.find(Employee.class, 1, LockModeType.PESSIMISTIC_READ, map);
+ assertNotNull("Query locks department but find locks Employee.", emp);
+ fail("Unexcpected find succeeded. Should throw a PessimisticLockException.");
+ } catch (QueryTimeoutException e) {
+ // TODO: This is the current unexpected exception due to OPENJPA-991. Remove this when the problem is fixed
+// System.out.println("Caught " + e.getClass().getName() + ":" + e.getMessage());
+ } catch (PessimisticLockException e) {
+ // TODO: This is the expected exception but will be fixed under OPENJPA-991
+// System.out.println("Caught " + e.getClass().getName() + ":" + e.getMessage());
+ } catch (Exception ex) {
+ fail("Caught unexpected " + ex.getClass().getName() + ":" + ex.getMessage());
+ } finally {
+ if( em1.getTransaction().isActive())
+ em1.getTransaction().rollback();
+ if( em2.getTransaction().isActive())
+ em2.getTransaction().rollback();
+ }
+ em1.close();
+ em2.close();
+ }
+
+ /*
+ * Test a query with pessimistic lock after a find with pessimistic lock and expect PessimisticLockException.
+ */
+ public void testQueryAfterFindWithPessimisticLocks() {
+ EntityManager em1 = emf.createEntityManager();
+ EntityManager em2 = emf.createEntityManager();
+ try {
+ em2.getTransaction().begin();
+
+ Map<String,Object> map = new HashMap<String,Object>();
+ map.put("javax.persistence.lock.timeout", 2000);
+ em2.find(Employee.class, 1, LockModeType.PESSIMISTIC_READ, map);
+
+ em1.getTransaction().begin();
+
+ Query query = em1.createQuery(
+ "select e.department from Employee e where e.id < 10 order by e.department.id").setFirstResult(1);
+ query.setLockMode(LockModeType.PESSIMISTIC_READ);
+ List<Department> q = query.getResultList();
+
+ fail("Unexcpected find succeeded. Should throw a PessimisticLockException.");
+ } catch (PessimisticLockException e) {
+ // This is the expected exception.
+ } catch (Exception ex) {
+ fail("Caught unexpected " + ex.getClass().getName() + ":" + ex.getMessage());
+ } finally {
+ if( em1.getTransaction().isActive())
+ em1.getTransaction().rollback();
+ if (em2.getTransaction().isActive())
+ em2.getTransaction().rollback();
+ }
+ em1.close();
+ em2.close();
+ }
+
+ /*
+ * Test a query with pessimistic lock with query timeout set after a find
+ * with pessimistic lock and expect QueryTimeoutException.
+ */
+ public void testQueryWithQueryTimeoutAfterFindWithPessimisticLocks() {
+ EntityManager em1 = emf.createEntityManager();
+ EntityManager em2 = emf.createEntityManager();
+ try {
+ em2.getTransaction().begin();
+
+ Map<String,Object> map = new HashMap<String,Object>();
+ map.put("javax.persistence.lock.timeout", 2000);
+ em2.find(Employee.class, 1, LockModeType.PESSIMISTIC_READ, map);
+
+ em1.getTransaction().begin();
+
+ Query query = em1.createQuery(
+ "select e.department from Employee e where e.id < 10 order by e.department.id").setFirstResult(1);
+ query.setLockMode(LockModeType.PESSIMISTIC_READ);
+ query.setHint("javax.persistence.query.timeout", 2000);
+ List<Department> q = query.getResultList();
+
+ fail("Unexcpected find succeeded. Should throw a PessimisticLockException.");
+ } catch (QueryTimeoutException e) {
+ // This is the expected exception.
+ } catch (Exception ex) {
+ fail("Caught unexpected " + ex.getClass().getName() + ":" + ex.getMessage());
+ } finally {
+ if( em1.getTransaction().isActive())
+ em1.getTransaction().rollback();
+ if( em2.getTransaction().isActive())
+ em2.getTransaction().rollback();
+ }
+ em1.close();
+ em2.close();
+ }
+}

Propchange: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
------------------------------------------------------------------------------
svn:eol-style = native

svn commit: r882285 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java

2009-11-19T12:37:46Z

Author: ppoddar
Date: Thu Nov 19 20:37:45 2009
New Revision: 882285

URL: http://svn.apache.org/viewvc?rev=882285&view=rev
Log:
OPENJPA-1350: Test case (by Rick Curtis) to test early registration of type alias to avoid/minimze risk of multi-threaded repository initialization. Original change was revision 826944

Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java (with props)

Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java?rev=882285&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java (added)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java Thu Nov 19 20:37:45 2009
@@ -0,0 +1,106 @@
+/*
+ * 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.meta;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.EntityManagerFactory;
+
+import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestQueryTypeAliasRegistration extends SingleEMFTestCase {
+ private final int threads = 100;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp(MdrTestEntity.class);
+ assertNotNull(emf);
+ // Create the Entity which we're going to try to get MetaData for using
+ // an alias. Do this to ensure that it has been registered to the PCRegistry.
+ new MdrTestEntity();
+ }
+
+ /**
+ * This method tests a timing window where more than one thread requests MetaData using an alias
+ * at the same time. All threads should get data back and no threads should receive an
+ * exception.
+ */
+ public void testMultiThreadGetMetaDataAlias() throws Exception {
+ try {
+ List<Worker> workers = new ArrayList<Worker>();
+ Set<Exception> exceptions = new HashSet<Exception>();
+ for (int i = 0; i < threads; i++) {
+ Worker w = new Worker(emf);
+ workers.add(w);
+ }
+ for (Worker w : workers) {
+ w.start();
+ }
+ for (Worker w : workers) {
+ w.join();
+ Exception e = w.getException();
+ if (e != null) {
+ exceptions.add(w.getException());
+ }
+ }
+ assertTrue("Caught " + exceptions.toString(), exceptions.size() == 0);
+ } finally {
+ if (emf != null) {
+ emf.close();
+ }
+ }
+ }
+
+ class Worker extends Thread {
+ OpenJPAEntityManagerFactorySPI emf;
+ OpenJPAEntityManagerSPI em;
+ MetaDataRepository repo;
+ Exception ex;
+
+ Worker(EntityManagerFactory e) {
+ emf = (OpenJPAEntityManagerFactorySPI) e;
+ // Create an EM here because that triggers registering the MDR as a class registration
+ // listener with the PCRegistry.
+ em = emf.createEntityManager();
+ repo = em.getConfiguration().getMetaDataRepositoryInstance();
+ }
+
+ Exception getException() {
+ return ex;
+ }
+
+ @Override
+ public void run() {
+ try {
+ repo.getMetaData("MdrTestEntity", Thread.currentThread().getContextClassLoader(), true);
+ } catch (Exception e) {
+ ex = e;
+ e.printStackTrace();
+ } finally {
+ em.close();
+ }
+ }
+ }
+}

Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java
------------------------------------------------------------------------------
svn:eol-style = native

Pinaki

svn commit: r882172 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/meta/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed...

2009-11-19T07:12:37Z

Author: faywang
Date: Thu Nov 19 15:12:36 2009
New Revision: 882172

URL: http://svn.apache.org/viewvc?rev=882172&view=rev
Log:
OPENJPA-1396: fix metadata-complete problem so that it will override @Transient annotation in the entity class

Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/embed-orm.xml
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java Thu Nov 19 15:12:36 2009
@@ -151,6 +151,10 @@
}

public void populate(ClassMetaData meta, int access) {
+ populate(meta, access, false);
+ }
+
+ public void populate(ClassMetaData meta, int access, boolean ignoreTransient) {
if (meta.getDescribedType() == Object.class)
return;
meta.setAccessType(access);
@@ -161,7 +165,7 @@
if (!_pcRegistry || !populateFromPCRegistry(meta)) {
if (log.isTraceEnabled())
log.trace(_loc.get("meta-reflect"));
- populateFromReflection(meta);
+ populateFromReflection(meta, ignoreTransient);
}
}

@@ -197,15 +201,15 @@
}
}

- protected abstract List<Member> getPersistentMembers(ClassMetaData meta);
+ protected abstract List<Member> getPersistentMembers(ClassMetaData meta, boolean ignoreTransient);
/**
* Generate the given meta-data using reflection.
* Adds FieldMetaData for each persistent state.
* Delegate to concrete implementation to determine the persistent
* members.
*/
- private void populateFromReflection(ClassMetaData meta) {
- List<Member> members = getPersistentMembers(meta);
+ private void populateFromReflection(ClassMetaData meta, boolean ignoreTransient) {
+ List<Member> members = getPersistentMembers(meta, ignoreTransient);
boolean iface = meta.getDescribedType().isInterface();
// If access is mixed or if the default is currently unknown,
// process all fields, otherwise only process members of the class
@@ -220,7 +224,7 @@
if (name == null || isReservedFieldName(name))
continue;

- def = isDefaultPersistent(meta, member, name);
+ def = isDefaultPersistent(meta, member, name, ignoreTransient);
if (!def && _ignore)
continue;

@@ -311,7 +315,7 @@
* @param name the field name from {@link #getFieldName}
*/
protected abstract boolean isDefaultPersistent(ClassMetaData meta,
- Member member, String name);
+ Member member, String name, boolean ignoreTransient);

/**
* Gets the backing member of the given field. If the field has not been

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java Thu Nov 19 15:12:36 2009
@@ -81,6 +81,13 @@
public void populate(ClassMetaData meta, int access);

/**
+ * Populate the given metadata with default settings.
+ *
+ * @param access access type constant from {@link ClassMetaData}
+ */
+ public void populate(ClassMetaData meta, int access, boolean ignoreTransient);
+
+ /**
* Return the backing member for the given field metadata.
*/
public Member getBackingMember(FieldMetaData field);

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java Thu Nov 19 15:12:36 2009
@@ -889,11 +889,22 @@
* the access type to use in populating metadata
*/
public ClassMetaData addMetaData(Class<?> cls, int access) {
+ return addMetaData(cls, access, false);
+ }
+
+ /**
+ * Create a new metadata, populate it with default information, add it to the repository, and
+ * return it.
+ *
+ * @param access
+ * the access type to use in populating metadata
+ */
+ public ClassMetaData addMetaData(Class<?> cls, int access, boolean ignoreTransient) {
if (cls == null || cls.isPrimitive())
return null;

ClassMetaData meta = newClassMetaData(cls);
- _factory.getDefaults().populate(meta, access);
+ _factory.getDefaults().populate(meta, access, ignoreTransient);

// synchronize on this rather than the map, because all other methods
// that access _metas are synchronized on this

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java Thu Nov 19 15:12:36 2009
@@ -128,6 +128,9 @@
public void populate(ClassMetaData meta, int access) {
}

+ public void populate(ClassMetaData meta, int access, boolean ignoreTransient) {
+ }
+
public Member getBackingMember(FieldMetaData fmd) {
return null;
}

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmbedXml.java Thu Nov 19 15:12:36 2009
@@ -19,13 +19,17 @@
package org.apache.openjpa.persistence.embed;

import javax.persistence.Embeddable;
+import javax.persistence.Transient;

+@Embeddable
public class EmbedXml {
// owned by BasicA via Embed4
// can not contain a collection of basic types if BasicA contains
// a collection of Embed4
protected int intVal1;
protected int intVal2;
+
+ @Transient
protected int intVal3;

public int getIntVal1() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/embed-orm.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/embed-orm.xml?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/embed-orm.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/embed-orm.xml Thu Nov 19 15:12:36 2009
@@ -259,13 +259,7 @@
</embeddable>

<embeddable class="org.apache.openjpa.persistence.embed.EmbedXml"
- access="FIELD">
- <attributes>
- <basic name="intVal1"></basic>
- <basic name="intVal2"></basic>
- <basic name="intVal3"></basic>
- </attributes>
- </embeddable>
+ access="FIELD" metadata-complete="true"/>

<embeddable class="org.apache.openjpa.persistence.embed.attrOverrides.BasicEmbedXML">
<attributes>

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java Thu Nov 19 15:12:36 2009
@@ -145,11 +145,20 @@
* no strategy.
*/
public static PersistenceStrategy getPersistenceStrategy
- (FieldMetaData fmd, Member member) {
+ (FieldMetaData fmd, Member member) {
+ return getPersistenceStrategy(fmd, member, false);
+ }
+
+ /**
+ * Return the code for the strategy of the given member. Return null if
+ * no strategy.
+ */
+ public static PersistenceStrategy getPersistenceStrategy
+ (FieldMetaData fmd, Member member, boolean ignoreTransient) {
if (member == null)
return null;
AnnotatedElement el = (AnnotatedElement) member;
- if ((AccessController.doPrivileged(J2DoPrivHelper
+ if (!ignoreTransient && (AccessController.doPrivileged(J2DoPrivHelper
.isAnnotationPresentAction(el, Transient.class))).booleanValue())
return TRANSIENT;
if (fmd != null
@@ -248,13 +257,26 @@
*/
@Override
public void populate(ClassMetaData meta, int access) {
+ populate(meta, access, false);
+ }
+
+ /**
+ * Populates the given class metadata. The access style determines which
+ * field and/or getter method will contribute as the persistent property
+ * of the given class. If the given access is unknown, then the access
+ * type is to be determined at first.
+ *
+ * @see #determineAccessType(ClassMetaData)
+ */
+ @Override
+ public void populate(ClassMetaData meta, int access, boolean ignoreTransient) {
if (AccessCode.isUnknown(access)) {
access = determineAccessType(meta);
}
if (AccessCode.isUnknown(access)) {
error(meta, _loc.get("access-unknown", meta));
}
- super.populate(meta, access);
+ super.populate(meta, access, ignoreTransient);
meta.setDetachable(true);
// do not call get*Fields as it will lock down the fields.
}
@@ -425,7 +447,7 @@
* Gets the fields that are possible candidate for being persisted. The
* result depends on the current access style of the given class.
*/
- List<Field> getPersistentFields(ClassMetaData meta) {
+ List<Field> getPersistentFields(ClassMetaData meta, boolean ignoreTransient) {
boolean explicit = meta.isExplicitAccess();
boolean unknown = AccessCode.isUnknown(meta);
boolean isField = AccessCode.isField(meta);
@@ -434,7 +456,8 @@
Field[] fields = AccessController.doPrivileged(J2DoPrivHelper.
getDeclaredFieldsAction(meta.getDescribedType()));

- return filter(fields, fieldFilter, nonTransientFilter,
+ return filter(fields, fieldFilter,
+ ignoreTransient ? null : nonTransientFilter,
unknown || isField ? null : annotatedFilter,
explicit ? (isField ? null : fieldAccessFilter) : null);
}
@@ -445,7 +468,7 @@
* Gets the methods that are possible candidate for being persisted. The
* result depends on the current access style of the given class.
*/
- List<Method> getPersistentMethods(ClassMetaData meta) {
+ List<Method> getPersistentMethods(ClassMetaData meta, boolean ignoreTransient) {
boolean explicit = meta.isExplicitAccess();
boolean unknown = AccessCode.isUnknown(meta.getAccessType());
boolean isProperty = AccessCode.isProperty(meta.getAccessType());
@@ -455,7 +478,8 @@
J2DoPrivHelper.getDeclaredMethodsAction(meta.getDescribedType()));

List<Method> getters = filter(publicMethods, methodFilter,
- getterFilter, nonTransientFilter,
+ getterFilter,
+ ignoreTransient ? null : nonTransientFilter,
unknown || isProperty ? null : annotatedFilter,
explicit ? (isProperty ? null : propertyAccessFilter) : null);
List<Method> setters = filter(publicMethods, setterFilter);
@@ -475,10 +499,10 @@
* no access type set, this method will set it.
*/
@Override
- public List<Member> getPersistentMembers(ClassMetaData meta) {
+ public List<Member> getPersistentMembers(ClassMetaData meta, boolean ignoreTransient) {
List<Member> members = new ArrayList<Member>();
- List<Field> fields = getPersistentFields(meta);
- List<Method> getters = getPersistentMethods(meta);
+ List<Field> fields = getPersistentFields(meta, ignoreTransient);
+ List<Method> getters = getPersistentMethods(meta, ignoreTransient);

boolean isMixed = !fields.isEmpty() && !getters.isEmpty();
boolean isEmpty = fields.isEmpty() && getters.isEmpty();
@@ -532,16 +556,21 @@

@Override
protected List<String> getFieldAccessNames(ClassMetaData meta) {
- return toNames(getPersistentFields(meta));
+ return toNames(getPersistentFields(meta, false));
}

@Override
protected List<String> getPropertyAccessNames(ClassMetaData meta) {
- return toNames(getPersistentMethods(meta));
+ return toNames(getPersistentMethods(meta, false));
}

protected boolean isDefaultPersistent(ClassMetaData meta, Member member,
String name) {
+ return isDefaultPersistent(meta, member, name, false);
+ }
+
+ protected boolean isDefaultPersistent(ClassMetaData meta, Member member,
+ String name, boolean ignoreTransient) {
int mods = member.getModifiers();
if (Modifier.isTransient(mods))
return false;
@@ -581,7 +610,7 @@
}
}

- PersistenceStrategy strat = getPersistenceStrategy(null, member);
+ PersistenceStrategy strat = getPersistenceStrategy(null, member, ignoreTransient);
if (strat == null || strat == PersistenceStrategy.TRANSIENT)
return false;
return true;

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java?rev=882172&r1=882171&r2=882172&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java Thu Nov 19 15:12:36 2009
@@ -829,8 +829,10 @@
@Override
protected boolean startClass(String elem, Attributes attrs)
throws SAXException {
+ boolean metaDataComplete = false;
super.startClass(elem, attrs);
if (isMetaDataComplete(attrs)) {
+ metaDataComplete = true;
setAnnotationParser(null);
} else if (!_isXMLMappingMetaDataComplete){
resetAnnotationParser();
@@ -874,7 +876,13 @@
// be UNKNOWN)
if (accessCode == AccessCode.UNKNOWN)
accessCode = _access;
- meta = repos.addMetaData(_cls, accessCode);
+ meta = repos.addMetaData(_cls, accessCode, metaDataComplete);
+ FieldMetaData[] fmds = meta.getFields();
+ if (metaDataComplete) {
+ for (int i = 0; i < fmds.length; i++) {
+ fmds[i].setExplicit(true);
+ }
+ }
meta.setEnvClassLoader(_envLoader);
meta.setSourceMode(MODE_NONE);

svn commit: r881977 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria: AbstractCriteriaTestCase.java TestJPQLSubquery.java TestTypesafeCriteria.java

2009-11-18T14:44:02Z

Author: ppoddar
Date: Wed Nov 18 22:44:01 2009
New Revision: 881977

URL: http://svn.apache.org/viewvc?rev=881977&view=rev
Log:
Run CriteriaTest on MySQL as well.

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java?rev=881977&r1=881976&r2=881977&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java Wed Nov 18 22:44:01 2009
@@ -206,7 +206,7 @@
fail("JPQL " + jpql + " failed to execute\r\n" + w);
}

- if (!(dict instanceof DerbyDictionary))
+ if (!(dict instanceof DerbyDictionary || dict instanceof MySQLDictionary))
return;

for (int i = 0; i < jSQL.size(); i++) {
@@ -229,7 +229,7 @@
fail(w.toString());
}

- if (!(dict instanceof DerbyDictionary))
+ if (!(dict instanceof DerbyDictionary || dict instanceof MySQLDictionary))
return;

String jSql = jSQL.get(0).trim();

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java?rev=881977&r1=881976&r2=881977&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Wed Nov 18 22:44:01 2009
@@ -34,6 +34,7 @@
import javax.persistence.criteria.SetJoin;
import javax.persistence.criteria.Subquery;

+import org.apache.openjpa.jdbc.sql.DerbyDictionary;
import org.apache.openjpa.persistence.criteria.AbstractCriteriaTestCase.QueryDecorator;
import org.apache.openjpa.persistence.embed.Division;

@@ -771,9 +772,12 @@
+ " (select distinct o.id from LineItem i, Order o"
+ " where i.quantity > 10 and o.count > 1000 and i.id = o.id)";

+ String crossJoin = (getDictionary() instanceof DerbyDictionary)
+ ? "JOIN CR_ODR t2 ON (1 = 1)"
+ : "CROSS JOIN CR_ODR t2";
String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.id IN ("
+ "SELECT DISTINCT t2.id "
- + "FROM CR_ODR t1 JOIN CR_ODR t2 ON (1 = 1), CR_LI t3 WHERE ("
+ + "FROM CR_ODR t1 " + crossJoin + ", CR_LI t3 WHERE ("
+ "t3.quantity > ? AND t2.cnt > ? AND t3.id = t2.id)))";

executeAndCompareSQL(jpql, expectedSQL);
@@ -1086,8 +1090,11 @@
+ " where o1.quantity = "
+ " any(select o2.quantity from in(c.orders) o2)";

+ String crossJoin = getDictionary() instanceof DerbyDictionary
+ ? "JOIN CR_CUST t1 ON (1 = 1)"
+ : "CROSS JOIN CR_CUST t1";
String expectedSQL = "SELECT t0.id, t1.name " +
- "FROM CR_ODR t0 JOIN CR_CUST t1 ON (1 = 1) WHERE (t0.quantity = ANY (" +
+ "FROM CR_ODR t0 " + crossJoin + " WHERE (t0.quantity = ANY (" +
"SELECT t3.quantity FROM CR_ODR t2, CR_ODR t3 WHERE (t2.id = t3.id) AND (t1.id = t2.CUSTOMER_ID)))";

executeAndCompareSQL(jpql, expectedSQL);
@@ -1182,8 +1189,11 @@
+ " (select o.quantity*2 from LineItem i, Order o"
+ " where i.quantity > 10 and o.quantity > 1000 and i.id = "
+ "o.id)";
+ String crossJoin = (getDictionary() instanceof DerbyDictionary)
+ ? "JOIN CR_ODR t2 ON (1 = 1)"
+ : "CROSS JOIN CR_ODR t2";
String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.quantity > ("
- + "SELECT (t2.quantity * ?) FROM CR_ODR t1 JOIN CR_ODR t2 ON (1 = 1), CR_LI t3 WHERE ("
+ + "SELECT (t2.quantity * ?) FROM CR_ODR t1 " + crossJoin + ", CR_LI t3 WHERE ("
+ "t3.quantity > ? AND t2.quantity > ? AND t3.id = t2.id)))";
executeAndCompareSQL(jpql, expectedSQL);

@@ -1208,10 +1218,13 @@
String jpql = "select o.id from Order o where o.customer.name ="
+ " (select substring(o2.customer.name, 3) from Order o2"
+ " where o.customer.id = o2.customer.id)";
-
+
+ String useCast = (getDictionary() instanceof DerbyDictionary)
+ ? "SUBSTR(CAST((t3.name) AS VARCHAR(1000)), 3) "
+ : "SUBSTRING(t3.name, 3) ";
String expectedSQL = "SELECT t0.id FROM CR_ODR t0 "
+ "INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id WHERE (t1.name = ("
- + "SELECT SUBSTR(CAST((t3.name) AS VARCHAR(1000)), 3) "
+ + "SELECT " + useCast
+ "FROM CR_ODR t2 INNER JOIN CR_CUST t3 ON t2.CUSTOMER_ID = t3.id "
+ "WHERE (t0.CUSTOMER_ID = t2.CUSTOMER_ID)))";
executeAndCompareSQL(jpql, expectedSQL);
@@ -1280,10 +1293,12 @@
String jpql = "select o.id from Order o where o.customer.name in"
+ " (select CONCAT(o.customer.name, 'XX') from Order o"
+ " where o.quantity > 10)";
-
+ String useCast = getDictionary() instanceof DerbyDictionary
+ ? "(CAST(t1.name AS VARCHAR(1000)) || CAST(? AS VARCHAR(1000))) "
+ : "CONCAT(t1.name,?) ";
String expectedSQL = "SELECT t2.id FROM CR_ODR t2 "
+ "INNER JOIN CR_CUST t3 ON t2.CUSTOMER_ID = t3.id WHERE (t3.name IN ("
- + "SELECT (CAST(t1.name AS VARCHAR(1000)) || CAST(? AS VARCHAR(1000))) "
+ + "SELECT " + useCast
+ "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id WHERE (t0.quantity > ?)))";

executeAndCompareSQL(jpql, expectedSQL);

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java?rev=881977&r1=881976&r2=881977&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java Wed Nov 18 22:44:01 2009
@@ -1406,19 +1406,25 @@
}

public void testCountDistinct() {
- // JPQL Parser does not do well with the following
- String jpql = "select DISTINCT COUNT(a.name) from Account a";
+ String jpql = "select COUNT(DISTINCT a.name) from Account a";

CriteriaQuery<Long> c = cb.createQuery(Long.class);
Root<Account> a = c.from(Account.class);
c.select(cb.countDistinct(a.get(Account_.name)));

- // hence we do not check equivalence against JPQL
- // assertEquivalence(c, jpql);
- // but check against SQL
- String expectedSQL = "SELECT COUNT(DISTINCT t0.name) FROM CR_ACCT t0";
- executeAndCompareSQL(c, expectedSQL);
+ assertEquivalence(c, jpql);
+ }
+
+ public void testCountDistinctOnJoin() {
+ String jpql = "select COUNT(DISTINCT a.b.age) from A a";
+
+ CriteriaQuery<Long> c = cb.createQuery(Long.class);
+ Root<A> a = c.from(A.class);
+ c.select(cb.countDistinct(a.get(A_.b).get(B_.age)));
+
+ assertEquivalence(c, jpql);
}
+

public void testSizeReturnsInteger() {
String jpql = "select SIZE(c.accounts) from Customer c";

Pinaki

svn commit: r881917 - /openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java

2009-11-18T12:15:38Z

Author: curtisr7
Date: Wed Nov 18 20:15:38 2009
New Revision: 881917

URL: http://svn.apache.org/viewvc?rev=881917&view=rev
Log: (empty)

Modified:
openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java

Modified: openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?rev=881917&r1=881916&r2=881917&view=diff
==============================================================================
--- openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java (original)
+++ openjpa/sandboxes/perf/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java Wed Nov 18 20:15:38 2009
@@ -156,10 +156,9 @@
new LifecycleEventManager.ListenerList(3);

private ReentrantLock _lock = new ReentrantLock();
- protected boolean _eagerPersistentMetaData = false;
- protected boolean _noLock = false;
+ protected boolean _preload = false;

- private static final String EAGER_PERSISTENT_META_DATA = "EagerPersistentMetaData";
+ private static final String PRELOAD_STR = "preload";

/**
* Default constructor. Configure via {@link Configurable}.
@@ -286,40 +285,33 @@
else
_sourceMode &= ~mode;
}
-
+
/**
- * Sets whether this repository will load all MetaData for all known persistent classes at initialization.
- * Defaults to false.
+ * Sets whether this repository will load all MetaData for all known persistent classes at
+ * initialization and remove all locking. Defaults to false.
*/
- public void setEagerPersistentMetaData(boolean b) {
- _eagerPersistentMetaData = b;
+ public void setPreload(boolean p) {
+ _preload = p;
}

/**
* Sets whether this repository will load all MetaData for all known persistent classes at initialization.
* Defaults to false.
*/
- public boolean getEagerPersistentMetaData() {
- return _eagerPersistentMetaData;
+ public boolean getPreload() {
+ return _preload;
}

- public void setNoLock(boolean b){
- _noLock = b;
- }
- public boolean getNoLock(){
- return _noLock;
- }
/**
- * If the openjpa.MetaDataRepository plugin value EagerPersistentMetaData=false , this method will noop. If EagerPersistentMetaData=true, this
- * method will load all persistent classes and ALL MetaData for those persistent classes.
- * <p>
- * If noLock=true, calling this method will remove ALL locking from this class if EagerPersistentMetaData=true.
+ * If the openjpa.MetaDataRepository plugin value Preload=true is set, this method will load all
+ * MetaData for all persistent classes and will remove locking from this class.
* <p>
*
- * NOTE : This method is not thread safe and should ONLY be called by the PersistenceProviderImpl.
+ * NOTE : This method is not thread safe and should ONLY be called by the
+ * PersistenceProviderImpl.
*/
- public void initializeEager() {
- if (_eagerPersistentMetaData == false) {
+ public void preload() {
+ if (_preload == false) {
return;
}
// If pooling EMFs, this method may be invoked more than once. Only perform this work once.
@@ -328,7 +320,7 @@
}

if (_log.isTraceEnabled()) {
- _log.trace("MetaDataRepository NoLock=" + _noLock + ", EagerPersistentMetaData=" + _eagerPersistentMetaData);
+ _log.trace("MetaDataRepository Preload=" + _preload);
}

MultiClassLoader multi = AccessController.doPrivileged(J2DoPrivHelper.newMultiClassLoaderAction());
@@ -361,9 +353,7 @@
// Hook in this class as a listener and process registered classes list to populate _aliases list.
PCRegistry.addRegisterClassListener(this);
processRegisteredClasses(multi);
- if (_noLock == true) {
- _lock = null;
- }
+ _lock = null;
_eagerProcessingComplete = true;
}

@@ -1748,7 +1738,7 @@
if (_implGen == null) {
_implGen = new InterfaceImplGenerator(this);
}
- if (_eagerPersistentMetaData == true && _noLock == true) {
+ if (_preload == true) {
_oids = new HashMap();
_impls = new HashMap();
_ifaces = new HashMap();
@@ -2268,11 +2258,11 @@
}

/**
- * This helper method returns true if Options paramater has the property EagerPersistentTypes or
- * EagerPersistentMetaData set to true.
+ * This helper method returns true if Options paramater has the property Preload
+ * set to true.
*/
- public static boolean needsInitializeEager(Options o) {
- if (o.getBooleanProperty(EAGER_PERSISTENT_META_DATA) == true) {
+ public static boolean needsPreload(Options o) {
+ if (o.getBooleanProperty(PRELOAD_STR) == true) {
return true;
}
return false;

svn commit: r881916 - in /openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence: PersistenceProductDerivation.java PersistenceProviderImpl.java

2009-11-18T12:15:33Z

Author: curtisr7
Date: Wed Nov 18 20:15:32 2009
New Revision: 881916

URL: http://svn.apache.org/viewvc?rev=881916&view=rev
Log: (empty)

Modified:
openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java

Modified: openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=881916&r1=881915&r2=881916&view=diff
==============================================================================
--- openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Wed Nov 18 20:15:32 2009
@@ -30,7 +30,6 @@
import java.util.List;
import java.util.Map;
import java.util.MissingResourceException;
-
import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.PersistenceUnitTransactionType;

@@ -454,8 +453,6 @@
_source = source;
}

- static final int MAX_PERF_LEVEL = 1;
-
@Override
public void setInto(Configuration conf) {
if (conf instanceof OpenJPAConfiguration) {
@@ -476,49 +473,6 @@
addProperty(key, Configurations.combinePlugins(orig,
(String) override));
}
-
- // Setup Performance configuration properties.
- Map props = getProperties();
- Object perfLevel = props.get(ProductDerivations.getConfigurationKey("Performance", getProperties()));
- if (perfLevel instanceof String) {
- int level = 0;
- try {
- level = Integer.parseInt((String) perfLevel);
- if(level > MAX_PERF_LEVEL){
- level = MAX_PERF_LEVEL;
- Log log = oconf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
- // We missed translation. What to do about this?
- if(log.isInfoEnabled()){
- // LOG ME
- }
- }
- } catch (NumberFormatException nfe) {
- if (Boolean.parseBoolean((String) perfLevel) == true) {
- // If true, set to maximum perfLevel.
- level = MAX_PERF_LEVEL;
- } else {
- level = 0;
- }
- }// end catch
-
- // The reason that there is a switch here is that in the future when(if) there is another
- // performance level, the new level will include the older(lower) levels. ie: Level 2 would include
- // changes that were a part of Level 1.
- switch (level) {
- case 1:
- // TODO -- add a trace point if we found a user property conflicting with
- // the performance prop?
- String key = ProductDerivations.getConfigurationKey("MetaDataRepository", getProperties());
- if (props.containsKey(key) == false) {
- addProperty(key, "NoLock=true,EagerPersistentMetaData=true");
- }
- key = ProductDerivations.getConfigurationKey("BrokerImpl", getProperties());
- if (props.containsKey(key) == false) {
- addProperty(key, "SuppressBatchOleLogging=true");
- }
- break;
- }
- }
}

super.setInto(conf, null);

Modified: openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java?rev=881916&r1=881915&r2=881916&view=diff
==============================================================================
--- openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java (original)
+++ openjpa/sandboxes/perf/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java Wed Nov 18 20:15:32 2009
@@ -85,22 +85,7 @@
return null;

BrokerFactory factory = getBrokerFactory(cp, poolValue, null);
-
- // We need to wait to initializeEager until after we get back a fully configured/instantiated
- // BrokerFactory. This is because it is possible that someone has extended OpenJPA
- // functions and they need to be allowed time to configure themselves before we go off and
- // start instanting configurable objects (ie:openjpa.MetaDataRepository). Don't catch
- // any exceptions here because we want to fail-fast.
- OpenJPAConfiguration conf = factory.getConfiguration();
- Options o = Configurations.parseProperties(Configurations.getProperties(conf.getMetaDataRepository()));
- if (MetaDataRepository.needsInitializeEager(o) == true) {
- MetaDataRepository mdr = conf.getMetaDataRepositoryInstance();
- mdr.setValidate(MetaDataRepository.VALIDATE_RUNTIME, true);
- mdr.setResolve(MetaDataRepository.MODE_MAPPING_INIT, true);
- ((AbstractBrokerFactory) factory).loadPersistentTypes((ClassLoader) AccessController.doPrivileged(
- J2DoPrivHelper.getContextClassLoaderAction()));
- conf.getMetaDataRepositoryInstance().initializeEager();
- }
+ preloadMetaDataRepository(factory);

return JPAFacadeHelper.toEntityManagerFactory(factory);
} catch (Exception e) {
@@ -176,22 +161,7 @@
_loc.get("transformer-registration-error", pui));
}
}
- // We need to wait to initializeEager until after we get back a fully configured/instantiated
- // BrokerFactory. This is because it is possible that someone has extended OpenJPA
- // functions and they need to be allowed time to configure themselves before we go off and
- // start instanting configurable objects (ie:openjpa.MetaDataRepository). Don't catch
- // any exceptions here because we want to fail-fast.
- OpenJPAConfiguration conf = factory.getConfiguration();
- Options o = Configurations.parseProperties(Configurations.getProperties(conf.getMetaDataRepository()));
- if (MetaDataRepository.needsInitializeEager(o) == true) {
- MetaDataRepository mdr = conf.getMetaDataRepositoryInstance();
- mdr.setValidate(MetaDataRepository.VALIDATE_RUNTIME, true);
- mdr.setResolve(MetaDataRepository.MODE_MAPPING_INIT, true);
- ((AbstractBrokerFactory) factory).loadPersistentTypes((ClassLoader) AccessController
- .doPrivileged(J2DoPrivHelper.getContextClassLoaderAction()));
- conf.getMetaDataRepositoryInstance().initializeEager();
- }
-
+ preloadMetaDataRepository(factory);
return JPAFacadeHelper.toEntityManagerFactory(factory);
} catch (Exception e) {
throw PersistenceExceptions.toPersistenceException(e);
@@ -216,6 +186,30 @@
protected OpenJPAConfiguration newConfigurationImpl() {
return new OpenJPAConfigurationImpl();
}
+
+ /**
+ * Private worker method that will call to the MetaDataRepository to preload if the provided
+ * BrokerFactory is configured to do so.
+ */
+ private void preloadMetaDataRepository(BrokerFactory factory){
+ // We need to wait to preload until after we get back a fully configured/instantiated
+ // BrokerFactory. This is because it is possible that someone has extended OpenJPA
+ // functions and they need to be allowed time to configure themselves before we go off and
+ // start instanting configurable objects (ie:openjpa.MetaDataRepository). Don't catch
+ // any exceptions here because we want to fail-fast.
+ OpenJPAConfiguration conf = factory.getConfiguration();
+ Options o = Configurations.parseProperties(Configurations.getProperties(conf.getMetaDataRepository()));
+ if (MetaDataRepository.needsPreload(o) == true) {
+ MetaDataRepository mdr = conf.getMetaDataRepositoryInstance();
+ mdr.setValidate(MetaDataRepository.VALIDATE_RUNTIME, true);
+ mdr.setResolve(MetaDataRepository.MODE_MAPPING_INIT, true);
+
+ // Load persistent classes and hook in subclasser
+ ((AbstractBrokerFactory) factory).loadPersistentTypes((ClassLoader) AccessController
+ .doPrivileged(J2DoPrivHelper.getContextClassLoaderAction()));
+ mdr.preload();
+ }
+ }

/**
* Java EE 5 class transformer.

svn commit: r881892 - in /openjpa/branches/1.3.x: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/

2009-11-18T11:29:13Z

Author: fancy
Date: Wed Nov 18 19:29:13 2009
New Revision: 881892

URL: http://svn.apache.org/viewvc?rev=881892&view=rev
Log:
OPENJPA-1388 JPQL named parameter using a reserved word (:vlaue) resulting in ArgumentException

Added:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java
Modified:
openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
openjpa/branches/1.3.x/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt

Modified: openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=881892&r1=881891&r2=881892&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java (original)
+++ openjpa/branches/1.3.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java Wed Nov 18 19:29:13 2009
@@ -810,7 +810,7 @@
return eval(firstChild(node));

case JJTNAMEDINPUTPARAMETER:
- return getParameter(node.text, false);
+ return getParameter(onlyChild(node).text, false);

case JJTPOSITIONALINPUTPARAMETER:
return getParameter(node.text, true);

Modified: openjpa/branches/1.3.x/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt?rev=881892&r1=881891&r2=881892&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt (original)
+++ openjpa/branches/1.3.x/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt Wed Nov 18 19:29:13 2009
@@ -1,1308 +1,1307 @@
-/*
- * 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.
- */
-
-/**
- * An JP QL grammar parser.
- *
- * Samples:
- * SELECT COUNT(p) FROM Person AS p
- * SELECT OBJECT(identifier) FROM schema identifier
- * SELECT identifier FROM schema AS identifier
- *
- * @author Patrick Linskey
- * @author Marc Prud'hommeaux
- */
-options {
- NODE_PREFIX = "JPQL";
- NODE_PACKAGE = "org.apache.openjpa.kernel.jpql";
- MULTI = false;
- NODE_DEFAULT_VOID = true;
- JAVA_UNICODE_ESCAPE = true;
- STATIC = false;
- NODE_USES_PARSER = true;
-
- LOOKAHEAD = 1;
-
-
- // debugging variables
- // DEBUG_PARSER = true; // simple parser debug
- // DEBUG_TOKEN_MANAGER = true; // more verbose token manager debug
- // DEBUG_LOOKAHEAD = true; // more verbose lookahead debug
-
- SANITY_CHECK = true; // check for left-recursion, etc (must always be true)
-
-
- // FORCE_LA_CHECK = true;
-}
-
-PARSER_BEGIN(JPQL)
-package org.apache.openjpa.kernel.jpql;
-
-import java.io.*;
-
-
-
-/**
- * @nojavadoc
- */
-public class JPQL
-{
- String jpql;
- boolean inEnumPath;
-
-
- public JPQL (String jpql)
- {
- this (new StringReader (jpql));
-
- this.jpql = jpql;
- }
-
-
- public static void main (String[] args)
- throws Exception
- {
- if (args.length > 0)
- {
- for (int i = 0; i < args.length; i++)
- {
- JPQL parser = new JPQL (args[i]);
- SimpleNode ast = (SimpleNode) parser.parseQuery ();
- ast.dump (System.out, "");
- }
- }
- else
- {
- JPQL parser = new JPQL (System.in);
- while (true)
- {
- System.out.print ("Enter Expression: ");
- System.out.flush ();
- try
- {
- SimpleNode ast = (SimpleNode) parser.parseQuery ();
- if (ast == null)
- return;
- else
- ast.dump (System.out, "");
- }
- catch (Throwable x)
- {
- x.printStackTrace ();
- return;
- }
- }
- }
- }
-}
-
-PARSER_END(JPQL)
-
-
-SKIP :
-{
- " "
- | "\n"
- | "\r"
- | "\t"
-}
-
-
-TOKEN [ IGNORE_CASE ]: /* basics */
-{
- < COMMA: "," >
-
- | < DOT: "." >
-
- | < EQ: "=" >
- | < NE: "<>" >
- | < GT: ">" >
- | < GE: ">=" >
- | < LT: "<" >
- | < LE: "<=" >
-
- | < PLUS: "+" >
- | < MINUS: "-" >
-
- | < TIMES: "*" >
- | < DIV: "/" >
-
- | < NEW: "NEW" >
-
- | < ALL: "ALL" >
- | < ANY: "ANY" >
- | < EXISTS: "EXISTS" >
- | < SOME: "SOME" >
- | < EMPTY: "EMPTY" >
-
- | < ASC: "ASC" >
- | < DESC: "DESC" >
- | < ORDER: "ORDER" >
- | < BY: "BY" >
-
- | < IS: "IS" >
- | < MEMBER: "MEMBER" >
- | < OF: "OF" >
- | < LIKE: "LIKE" >
- | < ESCAPE: "ESCAPE" >
- | < BETWEEN: "BETWEEN" >
-
- | < NULL: "NULL" >
-}
-
-TOKEN [ IGNORE_CASE ]: /* aggregates */
-{
- < AVG: "AVG" >
- | < MIN: "MIN" >
- | < MAX: "MAX" >
- | < SUM: "SUM" >
- | < COUNT: "COUNT" >
-}
-
-TOKEN [ IGNORE_CASE ]: /* boolean arithmetic */
-{
- < OR: "OR" >
- | < AND: "AND" >
- | < NOT: "NOT" >
-}
-
-TOKEN [ IGNORE_CASE ]: /* functions returning strings */
-{
- < CONCAT: "CONCAT" >
- | < SUBSTRING: "SUBSTRING" >
- | < TRIM: "TRIM" >
- | < LOWER: "LOWER" >
- | < UPPER: "UPPER" >
-}
-
-TOKEN [ IGNORE_CASE ]: /* trim specification */
-{
- < LEADING: "LEADING" >
- | < TRAILING: "TRAILING" >
- | < BOTH: "BOTH" >
-}
-
-
-TOKEN [ IGNORE_CASE ]: /* functions returning numerics */
-{
- < LENGTH: "LENGTH" >
- | < LOCATE: "LOCATE" >
- | < ABS: "ABS" >
- | < SQRT: "SQRT" >
- | < MOD: "MOD" >
- | < SIZE: "SIZE" >
-}
-
-
-TOKEN [ IGNORE_CASE ]: /* functions returning datetime */
-{
- < CURRENT_DATE: "CURRENT_DATE" >
- | < CURRENT_TIME: "CURRENT_TIME" >
- | < CURRENT_TIMESTAMP: "CURRENT_TIMESTAMP" >
-}
-
-TOKEN [ IGNORE_CASE ]: /* type of query */
-{
- < SELECT: "SELECT" >
- | < DISTINCT: "DISTINCT" >
- | < FROM: "FROM" >
-
- | < UPDATE: "UPDATE" >
- | < DELETE: "DELETE" >
-
- | < WHERE: "WHERE" >
- | < GROUP: "GROUP" >
- | < HAVING: "HAVING" >
-
- | < AS: "AS" >
- | < LEFT: "LEFT" >
- | < OUTER: "OUTER" >
- | < INNER: "INNER" >
- | < JOIN: "JOIN" >
- | < FETCH: "FETCH" >
- | < IN: "IN" >
- | < SET: "SET" >
-
- | < OBJECT: "OBJECT" >
-}
-
-
-/* inspired by the Java 1.0.2 specification */
-/* ### should we limit this to the length that is valid in java? */
-TOKEN : /* literals */
-{
- < INTEGER_LITERAL: ((["0"-"9"])+) (["l","L"])? >
- | < DECIMAL_LITERAL:
- (((["0"-"9"])* "." (["0"-"9"])+) (<EXPONENT>)? (["f","F","d","D"])?
- | ((["0"-"9"])+ ".") (<EXPONENT>)? (["f","F","d","D"])?
- | ((["0"-"9"])+) (<EXPONENT>) (["f","F","d","D"])?
- | ((["0"-"9"])+) (<EXPONENT>)? (["f","F","d","D"])?) >
- | < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
- | < STRING_LITERAL: "'"
- (("''" | ~["'"])
- /*
- (("''" | ~["'","\\","\n","\r"])
- | ("\\"
- ( ["n","t","b","r","f","\\","'"]
- | ["0"-"7"] ( ["0"-"7"] )?
- | ["0"-"3"] ["0"-"7"] ["0"-"7"]
- )
- )
- */
- )*
- "'"
- >
- | < CHARACTER_LITERAL: "'"
- ( (~["'","\\","\n","\r"])
- | ("\\"
- ( ["n","t","b","r","f","\\","'"]
- | ["0"-"7"] ( ["0"-"7"] )?
- | ["0"-"3"] ["0"-"7"] ["0"-"7"]
- )
- )
- )
- "'"
- >
-}
-
-TOKEN [ IGNORE_CASE ]: /* boolean literals can be case-insensitive */
-{
- < BOOLEAN_LITERAL: "TRUE" | "FALSE" >
-}
-
-/* From the Java 1.0.2 specification */
-TOKEN : /* IDENTIFIERS */
-{
- < IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>)* >
- |
- < #LETTER:
- [
- "\u0024", // $
- "\u0041"-"\u005a", // A-Z
- "\u005f", // _
- "\u0061"-"\u007a", // a-z
- "\u00c0"-"\u00d6",
- "\u00d8"-"\u00f6",
- "\u00f8"-"\u00ff",
- "\u0100"-"\u1fff",
- "\u3040"-"\u318f",
- "\u3300"-"\u337f",
- "\u3400"-"\u3d2d",
- "\u4e00"-"\u9fff",
- "\uf900"-"\ufaff"
- ]
- >
- |
- < #DIGIT:
- [
- "\u0030"-"\u0039", // 0-9
- "\u0660"-"\u0669",
- "\u06f0"-"\u06f9",
- "\u0966"-"\u096f",
- "\u09e6"-"\u09ef",
- "\u0a66"-"\u0a6f",
- "\u0ae6"-"\u0aef",
- "\u0b66"-"\u0b6f",
- "\u0be7"-"\u0bef",
- "\u0c66"-"\u0c6f",
- "\u0ce6"-"\u0cef",
- "\u0d66"-"\u0d6f",
- "\u0e50"-"\u0e59",
- "\u0ed0"-"\u0ed9",
- "\u1040"-"\u1049"
- ]
- >
-}
-
-
-Node parseQuery() : { }
-{
- (select_statement() | update_statement() | delete_statement()) <EOF>
- {
- return jjtree.rootNode();
- }
-}
-
-
-void select_statement() #SELECT : { }
-{
- select_clause()
- from_clause()
- [where_clause()]
- [groupby_clause()]
- [having_clause()]
- [orderby_clause()]
-}
-
-
-void update_statement() #UPDATE : { }
-{
- update_clause() [ where_clause() ]
-}
-
-
-void delete_statement() #DELETE : { }
-{
- <DELETE> <FROM> (from_item() #FROM) [where_clause()]
-}
-
-
-void from_clause() #FROM : { }
-{
- <FROM> identification_variable_declaration()
- (LOOKAHEAD(1) <COMMA> (LOOKAHEAD(collection_member_declaration()) collection_member_declaration() | LOOKAHEAD(identification_variable_declaration())identification_variable_declaration()))*
-}
-
-
-void identification_variable_declaration(): { }
-{
- from_item() (LOOKAHEAD(fetch_join()) fetch_join() | LOOKAHEAD(inner_join()) inner_join() | LOOKAHEAD(outer_join()) outer_join())*
-}
-
-
-void from_item() #FROMITEM : { }
-{
- abstract_schema_name() [LOOKAHEAD(1)<AS>] [LOOKAHEAD(identification_variable())identification_variable()]
-}
-
-
-void subquery_from_clause() #FROM : { }
-{
- <FROM> subquery_from_item()
- ( LOOKAHEAD(1) <COMMA> subquery_from_item() )*
-}
-
-void subquery_from_item() : { }
-{
- LOOKAHEAD(collection_member_declaration()) collection_member_declaration()
- | LOOKAHEAD(identification_variable_declaration()) identification_variable_declaration()
-}
-
-void inner_join() #INNERJOIN : { }
-{
- [<INNER>] <JOIN> path() [<AS>] identification_variable()
-}
-
-
-void collection_member_declaration() #INNERJOIN : { }
-{
- // synonymous with "INNER JOIN path AS identifier" (InnerJoin)
- <IN> "(" path() ")" [ LOOKAHEAD(1)<AS>] identification_variable()
-}
-
-void outer_join() #OUTERJOIN : { }
-{
- <LEFT> [ <OUTER>] <JOIN> path() [ LOOKAHEAD(1)<AS>] identification_variable()
-}
-
-
-void fetch_join() : { }
-{
- outer_fetch_join() | inner_fetch_join()
-}
-
-
-void outer_fetch_join() #OUTERFETCHJOIN : { }
-{
- <LEFT> [<OUTER>] <JOIN> <FETCH> path()
-}
-
-
-void inner_fetch_join() #INNERFETCHJOIN : { }
-{
- [<INNER>] <JOIN> <FETCH> path()
-}
-
-
-void path() #PATH : { }
-{
- // a path is any dot-separated path expression starting with a
- // non-reserved word
- identification_variable() (<DOT> path_component())+
-}
-
-
-void update_clause() : { }
-{
- <UPDATE> from_item() #FROM set_clause()
-}
-
-
-void set_clause() : { }
-{
- <SET> update_item() (<COMMA> update_item())*
-}
-
-
-void update_item() #UPDATEITEM : { }
-{
- path() EQ() new_value()
-}
-
-
-void new_value() #UPDATEVALUE : { }
-{
- LOOKAHEAD(arithmetic_expression()) arithmetic_expression() |
- LOOKAHEAD(string_primary()) string_primary() |
- LOOKAHEAD(datetime_primary()) datetime_primary() |
- LOOKAHEAD(boolean_primary()) boolean_primary() |
- LOOKAHEAD(enum_primary()) enum_primary() |
- LOOKAHEAD(simple_entity_expression()) simple_entity_expression() |
- <NULL>
-}
-
-
-void simple_entity_expression() : { }
-{
- identification_variable() | input_parameter()
-}
-
-
-void select_clause() #SELECTCLAUSE : { }
-{
- <SELECT> [distinct()] select_expressions()
-}
-
-
-void simple_select_clause() #SELECTCLAUSE : { }
-{
- <SELECT> [distinct()] subselect_expressions()
-}
-
-
-void select_expressions() #SELECTEXPRESSIONS : { }
-{
- select_expression() (<COMMA> select_expression())*
-}
-
-
-void select_expression() #SELECTEXPRESSION : { }
-{
- aggregate_select_expression()
- | LOOKAHEAD(path()) path()
- | identification_variable()
- | (<OBJECT> "(" identification_variable() ")")
- | constructor_expression()
- | select_extension()
-}
-
-
-void select_extension() #SELECTEXTENSION : { }
-{
- scalar_function()
-}
-
-
-void subselect_expressions() #SELECTEXPRESSIONS : { }
-{
- subselect_expression() (<COMMA> subselect_expression())*
-}
-
-
-void subselect_expression() #SELECTEXPRESSION : { }
-{
- LOOKAHEAD(path()) path()
- | aggregate_select_expression()
- | LOOKAHEAD(1) identification_variable()
-}
-
-
-void constructor_expression() #CONSTRUCTOR : { }
-{
- <NEW> classname() constructor_parameters()
-}
-
-
-void classname() #CLASSNAME :
-{ Token t; }
-{
- identification_variable() (<DOT> identification_variable())*
-}
-
-
-void constructor_parameters() #CONSTRUCTORPARAMS : { }
-{
- "(" (constructor_parameter()) (<COMMA> (constructor_parameter()))* ")"
-}
-
-
-void constructor_parameter() #CONSTRUCTORPARAM : { }
-{
- (path() | aggregate_select_expression())
-}
-
-
-/* rewritten to reduce lookaheads */
-void aggregate_select_expression() #AGGREGATE : { }
-{
- (avg() | max() | min() | sum() | count())
-}
-
-
-void distinct() #DISTINCT : { }
-{
- <DISTINCT>
-}
-
-
-void aggregate_path() : { }
-{
- "(" (
- LOOKAHEAD(arithmetic_expression()) arithmetic_expression() |
- LOOKAHEAD(distinct_path()) distinct_path() |
- LOOKAHEAD(path()) path() |
- LOOKAHEAD(identification_variable()) identification_variable()
- ) ")"
-}
-
-
-void distinct_path() #DISTINCTPATH : { }
-{
- <DISTINCT> (LOOKAHEAD(path()) path() | identification_variable())
-}
-
-
-void count() #COUNT : { }
-{
- <COUNT> aggregate_path()
-}
-
-
-void avg() #AVERAGE : { }
-{
- <AVG> aggregate_path()
-}
-
-
-void max() #MAX : { }
-{
- <MAX> aggregate_path()
-}
-
-
-void min() #MIN : { }
-{
- <MIN> aggregate_path()
-}
-
-
-void sum() #SUM : { }
-{
- <SUM> aggregate_path()
-}
-
-
-void where_clause() #WHERE : { }
-{
- <WHERE> conditional_expression()
-}
-
-
-void groupby_clause() #GROUPBY : { }
-{
- <GROUP> <BY> groupby_item()
- (LOOKAHEAD(2) <COMMA> (groupby_item()))*
-}
-
-
-void groupby_item() : { }
-{
- LOOKAHEAD(path()) path() | identification_variable() | groupby_extension()
-}
-
-
-void groupby_extension() #GROUPBYEXTENSION : { }
-{
- scalar_function()
-}
-
-
-void having_clause() #HAVING : { }
-{
- <HAVING> conditional_expression()
-}
-
-
-void subquery() #SUBSELECT : { }
-{
- simple_select_clause()
- subquery_from_clause()
- [LOOKAHEAD(where_clause()) where_clause()]
- [LOOKAHEAD(groupby_clause()) groupby_clause()]
- [LOOKAHEAD(having_clause()) having_clause()]
-}
-
-
-/* changed to eliminate left recursion */
-void conditional_expression() : { }
-{
- conditional_term() (LOOKAHEAD(2) <OR> (conditional_expression() #OR(2)))*
-}
-
-
-/* changed to eliminate left recursion */
-void conditional_term() : { }
-{
- conditional_factor() (LOOKAHEAD(2) <AND> (conditional_term() #AND(2)))*
-}
-
-
-void conditional_factor() : { }
-{
- LOOKAHEAD(<NOT> conditional_primary())
- (<NOT> conditional_primary() #NOT) | conditional_primary()
-}
-
-
-void conditional_primary() : { }
-{
- LOOKAHEAD(simple_cond_expression())
- simple_cond_expression() | "(" conditional_expression() ")"
-}
-
-
-void simple_cond_expression() : { }
-{
- //LOOKAHEAD(all_or_any_expression()) all_or_any_expression() |
- LOOKAHEAD(exists_expression()) exists_expression() |
- LOOKAHEAD(comparison_expression()) comparison_expression() |
- LOOKAHEAD(between_expression()) between_expression() |
- LOOKAHEAD(like_expression()) like_expression() |
- LOOKAHEAD(in_expression()) in_expression() |
- LOOKAHEAD(null_comparison_expression()) null_comparison_expression() |
- LOOKAHEAD(empty_collection_comparison_expression()) empty_collection_comparison_expression() |
- LOOKAHEAD(collection_member_expression()) collection_member_expression()
-}
-
-
-void between_expression() #BETWEEN : { }
-{
- LOOKAHEAD(6) arithmetic_expression()
- [<NOT> { jjtThis.not = true; }] <BETWEEN> arithmetic_expression()
- <AND> arithmetic_expression()
- | LOOKAHEAD(6) string_expression()
- [<NOT> { jjtThis.not = true; }] <BETWEEN> string_expression() <AND> string_expression()
- | LOOKAHEAD(6) datetime_expression()
- [<NOT> { jjtThis.not = true; }] <BETWEEN> datetime_expression() <AND> datetime_expression()
-}
-
-
-void in_expression() #IN : { }
-{
- path() [ LOOKAHEAD(1) <NOT> { jjtThis.not = true; }] <IN>
- "(" (literal_or_param()
- (<COMMA> (literal_or_param()))* | subquery())
- ")"
-}
-
-
-void literal_or_param() : { }
-{
- (numeric_literal()
- | string_literal()
- | boolean_literal()
- | input_parameter())
-}
-
-
-void like_expression() #LIKE : { }
-{
- string_expression() [<NOT> { jjtThis.not = true; }] <LIKE> pattern_value()
-}
-
-
-void null_comparison_expression() #ISNULL : { }
-{
- (input_parameter() | path() | aggregate_select_expression())
- <IS> [<NOT> { jjtThis.not = true; }] <NULL>
-}
-
-
-void empty_collection_comparison_expression() #ISEMPTY : { }
-{
- path() <IS> [<NOT> { jjtThis.not = true; }] <EMPTY>
-}
-
-
-void collection_member_expression() #MEMBEROF : { }
-{
- (LOOKAHEAD(path()) path() | input_parameter() | path_component())
- [<NOT> { jjtThis.not = true; }] <MEMBER> [<OF>] path()
-}
-
-
-void exists_expression() #EXISTS : { }
-{
- [<NOT> { jjtThis.not = true; }] <EXISTS> "(" subquery() ")"
-}
-
-
-void all_or_any_expression() : { }
-{
- any_expression() | some_expression() | all_expression()
-}
-
-
-void any_expression() #ANY : { }
-{
- <ANY> "(" subquery() ")"
-}
-
-
-void some_expression() #ANY : { }
-{
- // SOME and ANY are synonymous
- <SOME> "(" subquery() ")"
-}
-
-
-void all_expression() #ALL : { }
-{
- <ALL> "(" subquery() ")"
-}
-
-
-void comparison_expression() : { }
-{
- // comparison_expression ::= string_value comparison_operator {string_expression | all_or_any_expression} | boolean_value { =|<>} {boolean_expression | all_or_any_expression} | datetime_primary comparison_operator {datetime_expression | all_or_any_expression} | entity_bean_value { = | <> } {entity_bean_expression | all_or_any_expression} | arithmetic_value comparison_operator {arithmetic_expression | all_or_any_expression
-
- LOOKAHEAD(arithmetic_comp()) arithmetic_comp() |
- LOOKAHEAD(string_comp()) string_comp() |
- LOOKAHEAD(boolean_comp()) boolean_comp() |
- LOOKAHEAD(enum_comp()) enum_comp() |
- LOOKAHEAD(datetime_comp()) datetime_comp() |
- LOOKAHEAD(entity_comp()) entity_comp()
-}
-
-
-void string_comp() : { }
-{
- string_expression() (
- (<EQ> (string_expression()|all_or_any_expression()) #EQUALS(2))
- | (<NE> (string_expression()|all_or_any_expression()) #NOTEQUALS(2))
- | (<GT> (string_expression() | all_or_any_expression()) #GREATERTHAN(2))
- | (<GE> (string_expression() | all_or_any_expression()) #GREATEROREQUAL(2))
- | (<LT> (string_expression() | all_or_any_expression()) #LESSTHAN(2))
- | (<LE> (string_expression() | all_or_any_expression()) #LESSOREQUAL(2))
- )
-}
-
-
-void boolean_comp() : { }
-{
- boolean_expression() (
- (<EQ> (boolean_expression() | all_or_any_expression()) #EQUALS(2))
- | (<NE> (boolean_expression() | all_or_any_expression()) #NOTEQUALS(2))
- )
-}
-
-void enum_comp() : { }
-{
- enum_expression() (
- (<EQ> (enum_expression() | all_or_any_expression()) #EQUALS(2))
- | (<NE> (enum_expression() | all_or_any_expression()) #NOTEQUALS(2))
- )
-}
-
-void entity_comp() : { }
-{
- entity_bean_expression() (
- (<EQ> ((LOOKAHEAD(all_or_any_expression()) all_or_any_expression() | entity_bean_expression()) #EQUALS(2)))
- | (<NE> ((LOOKAHEAD(all_or_any_expression()) all_or_any_expression() | entity_bean_expression()) #NOTEQUALS(2)))
- )
-}
-
-
-void arithmetic_comp() : { }
-{
- // arithmetic_value() (
- arithmetic_expression() (
- (<EQ> (arithmetic_expression() | all_or_any_expression()) #EQUALS(2))
- | (<GT> (arithmetic_expression() | all_or_any_expression()) #GREATERTHAN(2))
- | (<GE> (arithmetic_expression() | all_or_any_expression()) #GREATEROREQUAL(2))
- | (<LT> (arithmetic_expression() | all_or_any_expression()) #LESSTHAN(2))
- | (<LE> (arithmetic_expression() | all_or_any_expression()) #LESSOREQUAL(2))
- | (<NE> (arithmetic_expression() | all_or_any_expression()) #NOTEQUALS(2))
- )
-}
-
-
-void datetime_comp() : { }
-{
- datetime_expression() (
- (<EQ> (datetime_expression() | all_or_any_expression()) #EQUALS(2))
- | (<GT> (datetime_expression() | all_or_any_expression()) #GREATERTHAN(2))
- | (<GE> (datetime_expression() | all_or_any_expression()) #GREATEROREQUAL(2))
- | (<LT> (datetime_expression() | all_or_any_expression()) #LESSTHAN(2))
- | (<LE> (datetime_expression() | all_or_any_expression()) #LESSOREQUAL(2))
- | (<NE> (datetime_expression() | all_or_any_expression()) #NOTEQUALS(2))
- )
-}
-
-void scalar_function() : { }
-{
- functions_returning_numerics()
- | functions_returning_datetime()
- | functions_returning_strings()
-}
-
-void arithmetic_value() : { }
-{
- path() | functions_returning_numerics() | "(" subquery() ")"
-}
-
-
-/* changed to eliminate left recursion */
-void arithmetic_expression() : { }
-{
- arithmetic_term()
- ((<PLUS> arithmetic_expression() #ADD(2))
- | (<MINUS> arithmetic_expression() #SUBTRACT(2)))*
-}
-
-
-/* changed to eliminate left recursion */
-void arithmetic_term() : { }
-{
- arithmetic_factor()
- ((<TIMES> arithmetic_term() #MULTIPLY(2))
- | (<DIV> arithmetic_term() #DIVIDE(2)))*
-}
-
-
-void arithmetic_factor() : { }
-{
- numeric_literal() |
- input_parameter() |
- path() |
- LOOKAHEAD(2) "(" arithmetic_expression() ")" |
- functions_returning_numerics() |
- aggregate_select_expression() |
- subquery()
-}
-
-
-void negative() #NEGATIVE : { }
-{
- <MINUS>
-}
-
-
-void string_value() : { }
-{
- path() | functions_returning_strings() | "(" subquery() ")"
-}
-
-
-void string_expression() : { }
-{
- input_parameter() | string_primary()
-}
-
-
-void string_primary() : { }
-{
- string_literal() | path() | LOOKAHEAD(2) "(" string_expression() ")" |
- functions_returning_strings() | LOOKAHEAD(2) "(" subquery() ")"
-}
-
-
-void datetime_expression() : { }
-{
- datetime_primary() | "(" subquery() ")"
-}
-
-
-void datetime_primary() : { }
-{
- path() | functions_returning_datetime() | input_parameter() | aggregate_select_expression()
-}
-
-
-void boolean_value() : { }
-{
- path() | "(" subquery() ")"
-}
-
-
-void boolean_expression() : { }
-{
- boolean_primary() | "(" subquery() ")"
-}
-
-
-void boolean_primary() : { }
-{
- LOOKAHEAD(2) path() | boolean_literal() | input_parameter()
-}
-
-
-void enum_expression() : { }
-{
- enum_primary() | "(" subquery() ")"
-}
-
-
-void enum_primary() : { }
-{
- LOOKAHEAD(2) path()
- | LOOKAHEAD(enum_literal()) enum_literal()
- | LOOKAHEAD(input_parameter()) input_parameter()
-}
-
-
-void enum_literal() : { }
-{
- { inEnumPath = true; }
- path()
- { inEnumPath = false; }
-}
-
-
-void entity_bean_value() : { }
-{
- LOOKAHEAD(path()) path() | path_component()
-}
-
-
-void entity_bean_expression() : { }
-{
- input_parameter() | entity_bean_value()
-}
-
-
-void functions_returning_strings() : { }
-{
- concat() | substring() | trim() | lower() | upper()
-}
-
-
-void concat() #CONCAT : { }
-{
- <CONCAT> "(" string_expression() <COMMA> string_expression() ")"
-}
-
-
-void substring() #SUBSTRING : { }
-{
- <SUBSTRING> "(" string_expression() <COMMA> arithmetic_expression() <COMMA> arithmetic_expression() ")"
-}
-
-
-void trim() #TRIM : { }
-{
- <TRIM> "(" [LOOKAHEAD(2)[trim_specification()] [trim_character()] <FROM>]
- string_expression() ")"
-}
-
-
-void lower() #LOWER : { }
-{
- <LOWER> "(" string_expression() ")"
-}
-
-
-void upper() #UPPER : { }
-{
- <UPPER> "(" string_expression() ")"
-}
-
-
-
-void trim_specification() : { }
-{
- LOOKAHEAD(2) (<LEADING> #TRIMLEADING) | (<TRAILING> #TRIMTRAILING) | (<BOTH> #TRIMBOTH)
-}
-
-
-void functions_returning_numerics() : { }
-{
- length() | locate() | abs() | sqrt() | mod() | size()
-}
-
-
-void length() #LENGTH : { }
-{
- <LENGTH> "(" string_expression() ")"
-
-}
-
-
-void locate() #LOCATE : { }
-{
- <LOCATE> "(" string_expression() <COMMA> string_expression()
- [<COMMA> arithmetic_expression()] ")"
-
-}
-
-
-void abs() #ABS : { }
-{
- <ABS> "(" arithmetic_expression() ")"
-
-}
-
-
-void sqrt() #SQRT : { }
-{
- <SQRT> "(" arithmetic_expression() ")"
-
-}
-
-
-void mod() #MOD : { }
-{
- <MOD> "(" arithmetic_expression() <COMMA> arithmetic_expression() ")"
-
-}
-
-
-void size() #SIZE : { }
-{
- <SIZE> "(" path() ")"
-}
-
-
-void functions_returning_datetime() : { }
-{
- (<CURRENT_DATE> #CURRENTDATE)
- | (<CURRENT_TIME> #CURRENTTIME)
- | (<CURRENT_TIMESTAMP> #CURRENTTIMESTAMP)
-}
-
-
-void orderby_clause() #ORDERBY : { }
-{
- <ORDER> <BY> orderby_item() (<COMMA> orderby_item())*
-}
-
-
-void orderby_item() #ORDERBYITEM : { }
-{
- (LOOKAHEAD(path()) path() | orderby_extension())
- [ <ASC> #ASCENDING | <DESC> #DESCENDING ]
-}
-
-
-void orderby_extension() #ORDERBYEXTENSION : { }
-{
- aggregate_select_expression()
-}
-
-
-void abstract_schema_name() #ABSTRACTSCHEMANAME : { }
-{
- path_component() (<DOT> path_component())*
-}
-
-
-void tok() #TOK :
-{ Token t; }
-{
- t = <IDENTIFIER> { jjtThis.setToken (t); }
-}
-
-
-void identification_variable() #IDENTIFIER :
-{ Token t; }
-{
- t = <IDENTIFIER> { jjtThis.setToken (t); }
-}
-
-
-void path_component() #IDENTIFICATIONVARIABLE :
-{ Token t; }
-{
- // unlike the identifier(), the path_component() *can* be a
- // reserved word. E.g., Order.group.length is a perfectly
- // valid path expression
- (
- t = <NEW>
- | t = <ALL>
- | t = <ANY>
- | t = <EXISTS>
- | t = <SOME>
- | t = <EMPTY>
- | t = <ASC>
- | t = <DESC>
- | t = <ORDER>
- | t = <IS>
- | t = <MEMBER>
- | t = <OF>
- | t = <LIKE>
- | t = <ESCAPE>
- | t = <BETWEEN>
- | t = <NULL>
- | t = <AVG>
- | t = <MIN>
- | t = <MAX>
- | t = <SUM>
- | t = <COUNT>
- | t = <OR>
- | t = <AND>
- | t = <NOT>
- | t = <CONCAT>
- | t = <SUBSTRING>
- | t = <TRIM>
- | t = <LOWER>
- | t = <UPPER>
- | t = <LEADING>
- | t = <TRAILING>
- | t = <BOTH>
- | t = <LENGTH>
- | t = <LOCATE>
- | t = <ABS>
- | t = <SQRT>
- | t = <MOD>
- | t = <SIZE>
- | t = <CURRENT_DATE>
- | t = <CURRENT_TIME>
- | t = <CURRENT_TIMESTAMP>
- | t = <SELECT>
- | t = <DISTINCT>
- | t = <FROM>
- | t = <UPDATE>
- | t = <DELETE>
- | t = <WHERE>
- | t = <GROUP>
- | t = <BY>
- | t = <HAVING>
- | t = <AS>
- | t = <LEFT>
- | t = <OUTER>
- | t = <INNER>
- | t = <JOIN>
- | t = <FETCH>
- | t = <IN>
- | t = <SET>
- | t = <OBJECT>
- | t = <IDENTIFIER>
- ) { jjtThis.setToken (t); }
-}
-
-
-void numeric_literal() : { }
-{
- LOOKAHEAD(decimal_literal()) decimal_literal() | integer_literal()
-}
-
-
-void integer_literal() #INTEGERLITERAL :
-{ Token t; }
-{
- [<PLUS> | negative()] t = <INTEGER_LITERAL> { jjtThis.setToken (t); }
-}
-
-
-void decimal_literal() #DECIMALLITERAL :
-{ Token t; }
-{
- [<PLUS> | negative()] t = <DECIMAL_LITERAL> { jjtThis.setToken (t); }
-}
-
-
-void boolean_literal() #BOOLEANLITERAL :
-{ Token t; }
-{
- t = <BOOLEAN_LITERAL> { jjtThis.setToken (t); }
-}
-
-
-void string_literal() #STRINGLITERAL :
-{ Token t; }
-{
- t = <STRING_LITERAL> { jjtThis.setToken (t); }
-}
-
-
-void input_parameter() : { }
-{
- named_input_parameter() | positional_input_parameter()
-}
-
-
-void named_input_parameter() #NAMEDINPUTPARAMETER :
-{ Token t; }
-{
- ":" t = <IDENTIFIER> { jjtThis.setToken (t); }
-}
-
-
-void positional_input_parameter() #POSITIONALINPUTPARAMETER :
-{ Token t; }
-{
- "?" t = <INTEGER_LITERAL> { jjtThis.setToken (t); }
-}
-
-
-void pattern_value() #PATTERNVALUE : { }
-{
- (input_parameter() | string_literal())
- [(<ESCAPE> escape_character() #ESCAPECHARACTER)]
-}
-
-
-void escape_character() #ESCAPECHARACTER :
-{ Token t; }
-{
- t = <STRING_LITERAL> { jjtThis.setToken (t); }
-}
-
-
-void trim_character() #TRIMCHARACTER :
-{ Token t; }
-{
- t = <STRING_LITERAL> { jjtThis.setToken (t); }
-}
-
-
-void EQ() #EQUALS : { }
-{
- <EQ>
-}
-
-
-void NE() #NOTEQUALS : { }
-{
- <NE>
-}
-
-
-void GT() #GREATERTHAN : { }
-{
- <GT>
-}
-
-
-void GE() #GREATEROREQUAL : { }
-{
- <GE>
-}
-
-
-void LT() #LESSTHAN : { }
-{
- <LT>
-}
-
-
-void LE() #LESSOREQUAL : { }
-{
- <LE>
-}
+/*
+ * 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.
+ */
+
+/**
+ * An JP QL grammar parser.
+ *
+ * Samples:
+ * SELECT COUNT(p) FROM Person AS p
+ * SELECT OBJECT(identifier) FROM schema identifier
+ * SELECT identifier FROM schema AS identifier
+ *
+ * @author Patrick Linskey
+ * @author Marc Prud'hommeaux
+ */
+options {
+ NODE_PREFIX = "JPQL";
+ NODE_PACKAGE = "org.apache.openjpa.kernel.jpql";
+ MULTI = false;
+ NODE_DEFAULT_VOID = true;
+ JAVA_UNICODE_ESCAPE = true;
+ STATIC = false;
+ NODE_USES_PARSER = true;
+
+ LOOKAHEAD = 1;
+
+
+ // debugging variables
+ // DEBUG_PARSER = true; // simple parser debug
+ // DEBUG_TOKEN_MANAGER = true; // more verbose token manager debug
+ // DEBUG_LOOKAHEAD = true; // more verbose lookahead debug
+
+ SANITY_CHECK = true; // check for left-recursion, etc (must always be true)
+
+
+ // FORCE_LA_CHECK = true;
+}
+
+PARSER_BEGIN(JPQL)
+package org.apache.openjpa.kernel.jpql;
+
+import java.io.*;
+
+
+
+/**
+ * @nojavadoc
+ */
+public class JPQL
+{
+ String jpql;
+ boolean inEnumPath;
+
+
+ public JPQL (String jpql)
+ {
+ this (new StringReader (jpql));
+
+ this.jpql = jpql;
+ }
+
+
+ public static void main (String[] args)
+ throws Exception
+ {
+ if (args.length > 0)
+ {
+ for (int i = 0; i < args.length; i++)
+ {
+ JPQL parser = new JPQL (args[i]);
+ SimpleNode ast = (SimpleNode) parser.parseQuery ();
+ ast.dump (System.out, "");
+ }
+ }
+ else
+ {
+ JPQL parser = new JPQL (System.in);
+ while (true)
+ {
+ System.out.print ("Enter Expression: ");
+ System.out.flush ();
+ try
+ {
+ SimpleNode ast = (SimpleNode) parser.parseQuery ();
+ if (ast == null)
+ return;
+ else
+ ast.dump (System.out, "");
+ }
+ catch (Throwable x)
+ {
+ x.printStackTrace ();
+ return;
+ }
+ }
+ }
+ }
+}
+
+PARSER_END(JPQL)
+
+
+SKIP :
+{
+ " "
+ | "\n"
+ | "\r"
+ | "\t"
+}
+
+
+TOKEN [ IGNORE_CASE ]: /* basics */
+{
+ < COMMA: "," >
+
+ | < DOT: "." >
+
+ | < EQ: "=" >
+ | < NE: "<>" >
+ | < GT: ">" >
+ | < GE: ">=" >
+ | < LT: "<" >
+ | < LE: "<=" >
+
+ | < PLUS: "+" >
+ | < MINUS: "-" >
+
+ | < TIMES: "*" >
+ | < DIV: "/" >
+
+ | < NEW: "NEW" >
+
+ | < ALL: "ALL" >
+ | < ANY: "ANY" >
+ | < EXISTS: "EXISTS" >
+ | < SOME: "SOME" >
+ | < EMPTY: "EMPTY" >
+
+ | < ASC: "ASC" >
+ | < DESC: "DESC" >
+ | < ORDER: "ORDER" >
+ | < BY: "BY" >
+
+ | < IS: "IS" >
+ | < MEMBER: "MEMBER" >
+ | < OF: "OF" >
+ | < LIKE: "LIKE" >
+ | < ESCAPE: "ESCAPE" >
+ | < BETWEEN: "BETWEEN" >
+
+ | < NULL: "NULL" >
+}
+
+TOKEN [ IGNORE_CASE ]: /* aggregates */
+{
+ < AVG: "AVG" >
+ | < MIN: "MIN" >
+ | < MAX: "MAX" >
+ | < SUM: "SUM" >
+ | < COUNT: "COUNT" >
+}
+
+TOKEN [ IGNORE_CASE ]: /* boolean arithmetic */
+{
+ < OR: "OR" >
+ | < AND: "AND" >
+ | < NOT: "NOT" >
+}
+
+TOKEN [ IGNORE_CASE ]: /* functions returning strings */
+{
+ < CONCAT: "CONCAT" >
+ | < SUBSTRING: "SUBSTRING" >
+ | < TRIM: "TRIM" >
+ | < LOWER: "LOWER" >
+ | < UPPER: "UPPER" >
+}
+
+TOKEN [ IGNORE_CASE ]: /* trim specification */
+{
+ < LEADING: "LEADING" >
+ | < TRAILING: "TRAILING" >
+ | < BOTH: "BOTH" >
+}
+
+
+TOKEN [ IGNORE_CASE ]: /* functions returning numerics */
+{
+ < LENGTH: "LENGTH" >
+ | < LOCATE: "LOCATE" >
+ | < ABS: "ABS" >
+ | < SQRT: "SQRT" >
+ | < MOD: "MOD" >
+ | < SIZE: "SIZE" >
+}
+
+
+TOKEN [ IGNORE_CASE ]: /* functions returning datetime */
+{
+ < CURRENT_DATE: "CURRENT_DATE" >
+ | < CURRENT_TIME: "CURRENT_TIME" >
+ | < CURRENT_TIMESTAMP: "CURRENT_TIMESTAMP" >
+}
+
+TOKEN [ IGNORE_CASE ]: /* type of query */
+{
+ < SELECT: "SELECT" >
+ | < DISTINCT: "DISTINCT" >
+ | < FROM: "FROM" >
+
+ | < UPDATE: "UPDATE" >
+ | < DELETE: "DELETE" >
+
+ | < WHERE: "WHERE" >
+ | < GROUP: "GROUP" >
+ | < HAVING: "HAVING" >
+
+ | < AS: "AS" >
+ | < LEFT: "LEFT" >
+ | < OUTER: "OUTER" >
+ | < INNER: "INNER" >
+ | < JOIN: "JOIN" >
+ | < FETCH: "FETCH" >
+ | < IN: "IN" >
+ | < SET: "SET" >
+
+ | < OBJECT: "OBJECT" >
+}
+
+
+/* inspired by the Java 1.0.2 specification */
+/* ### should we limit this to the length that is valid in java? */
+TOKEN : /* literals */
+{
+ < INTEGER_LITERAL: ((["0"-"9"])+) (["l","L"])? >
+ | < DECIMAL_LITERAL:
+ (((["0"-"9"])* "." (["0"-"9"])+) (<EXPONENT>)? (["f","F","d","D"])?
+ | ((["0"-"9"])+ ".") (<EXPONENT>)? (["f","F","d","D"])?
+ | ((["0"-"9"])+) (<EXPONENT>) (["f","F","d","D"])?
+ | ((["0"-"9"])+) (<EXPONENT>)? (["f","F","d","D"])?) >
+ | < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
+ | < STRING_LITERAL: "'"
+ (("''" | ~["'"])
+ /*
+ (("''" | ~["'","\\","\n","\r"])
+ | ("\\"
+ ( ["n","t","b","r","f","\\","'"]
+ | ["0"-"7"] ( ["0"-"7"] )?
+ | ["0"-"3"] ["0"-"7"] ["0"-"7"]
+ )
+ )
+ */
+ )*
+ "'"
+ >
+ | < CHARACTER_LITERAL: "'"
+ ( (~["'","\\","\n","\r"])
+ | ("\\"
+ ( ["n","t","b","r","f","\\","'"]
+ | ["0"-"7"] ( ["0"-"7"] )?
+ | ["0"-"3"] ["0"-"7"] ["0"-"7"]
+ )
+ )
+ )
+ "'"
+ >
+}
+
+TOKEN [ IGNORE_CASE ]: /* boolean literals can be case-insensitive */
+{
+ < BOOLEAN_LITERAL: "TRUE" | "FALSE" >
+}
+
+/* From the Java 1.0.2 specification */
+TOKEN : /* IDENTIFIERS */
+{
+ < IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>)* >
+ |
+ < #LETTER:
+ [
+ "\u0024", // $
+ "\u0041"-"\u005a", // A-Z
+ "\u005f", // _
+ "\u0061"-"\u007a", // a-z
+ "\u00c0"-"\u00d6",
+ "\u00d8"-"\u00f6",
+ "\u00f8"-"\u00ff",
+ "\u0100"-"\u1fff",
+ "\u3040"-"\u318f",
+ "\u3300"-"\u337f",
+ "\u3400"-"\u3d2d",
+ "\u4e00"-"\u9fff",
+ "\uf900"-"\ufaff"
+ ]
+ >
+ |
+ < #DIGIT:
+ [
+ "\u0030"-"\u0039", // 0-9
+ "\u0660"-"\u0669",
+ "\u06f0"-"\u06f9",
+ "\u0966"-"\u096f",
+ "\u09e6"-"\u09ef",
+ "\u0a66"-"\u0a6f",
+ "\u0ae6"-"\u0aef",
+ "\u0b66"-"\u0b6f",
+ "\u0be7"-"\u0bef",
+ "\u0c66"-"\u0c6f",
+ "\u0ce6"-"\u0cef",
+ "\u0d66"-"\u0d6f",
+ "\u0e50"-"\u0e59",
+ "\u0ed0"-"\u0ed9",
+ "\u1040"-"\u1049"
+ ]
+ >
+}
+
+
+Node parseQuery() : { }
+{
+ (select_statement() | update_statement() | delete_statement()) <EOF>
+ {
+ return jjtree.rootNode();
+ }
+}
+
+
+void select_statement() #SELECT : { }
+{
+ select_clause()
+ from_clause()
+ [where_clause()]
+ [groupby_clause()]
+ [having_clause()]
+ [orderby_clause()]
+}
+
+
+void update_statement() #UPDATE : { }
+{
+ update_clause() [ where_clause() ]
+}
+
+
+void delete_statement() #DELETE : { }
+{
+ <DELETE> <FROM> (from_item() #FROM) [where_clause()]
+}
+
+
+void from_clause() #FROM : { }
+{
+ <FROM> identification_variable_declaration()
+ (LOOKAHEAD(1) <COMMA> (LOOKAHEAD(collection_member_declaration()) collection_member_declaration() | LOOKAHEAD(identification_variable_declaration())identification_variable_declaration()))*
+}
+
+
+void identification_variable_declaration(): { }
+{
+ from_item() (LOOKAHEAD(fetch_join()) fetch_join() | LOOKAHEAD(inner_join()) inner_join() | LOOKAHEAD(outer_join()) outer_join())*
+}
+
+
+void from_item() #FROMITEM : { }
+{
+ abstract_schema_name() [LOOKAHEAD(1)<AS>] [LOOKAHEAD(identification_variable())identification_variable()]
+}
+
+
+void subquery_from_clause() #FROM : { }
+{
+ <FROM> subquery_from_item()
+ ( LOOKAHEAD(1) <COMMA> subquery_from_item() )*
+}
+
+void subquery_from_item() : { }
+{
+ LOOKAHEAD(collection_member_declaration()) collection_member_declaration()
+ | LOOKAHEAD(identification_variable_declaration()) identification_variable_declaration()
+}
+
+void inner_join() #INNERJOIN : { }
+{
+ [<INNER>] <JOIN> path() [<AS>] identification_variable()
+}
+
+
+void collection_member_declaration() #INNERJOIN : { }
+{
+ // synonymous with "INNER JOIN path AS identifier" (InnerJoin)
+ <IN> "(" path() ")" [ LOOKAHEAD(1)<AS>] identification_variable()
+}
+
+void outer_join() #OUTERJOIN : { }
+{
+ <LEFT> [ <OUTER>] <JOIN> path() [ LOOKAHEAD(1)<AS>] identification_variable()
+}
+
+
+void fetch_join() : { }
+{
+ outer_fetch_join() | inner_fetch_join()
+}
+
+
+void outer_fetch_join() #OUTERFETCHJOIN : { }
+{
+ <LEFT> [<OUTER>] <JOIN> <FETCH> path()
+}
+
+
+void inner_fetch_join() #INNERFETCHJOIN : { }
+{
+ [<INNER>] <JOIN> <FETCH> path()
+}
+
+
+void path() #PATH : { }
+{
+ // a path is any dot-separated path expression starting with a
+ // non-reserved word
+ identification_variable() (<DOT> path_component())+
+}
+
+
+void update_clause() : { }
+{
+ <UPDATE> from_item() #FROM set_clause()
+}
+
+
+void set_clause() : { }
+{
+ <SET> update_item() (<COMMA> update_item())*
+}
+
+
+void update_item() #UPDATEITEM : { }
+{
+ path() EQ() new_value()
+}
+
+
+void new_value() #UPDATEVALUE : { }
+{
+ LOOKAHEAD(arithmetic_expression()) arithmetic_expression() |
+ LOOKAHEAD(string_primary()) string_primary() |
+ LOOKAHEAD(datetime_primary()) datetime_primary() |
+ LOOKAHEAD(boolean_primary()) boolean_primary() |
+ LOOKAHEAD(enum_primary()) enum_primary() |
+ LOOKAHEAD(simple_entity_expression()) simple_entity_expression() |
+ <NULL>
+}
+
+
+void simple_entity_expression() : { }
+{
+ identification_variable() | input_parameter()
+}
+
+
+void select_clause() #SELECTCLAUSE : { }
+{
+ <SELECT> [distinct()] select_expressions()
+}
+
+
+void simple_select_clause() #SELECTCLAUSE : { }
+{
+ <SELECT> [distinct()] subselect_expressions()
+}
+
+
+void select_expressions() #SELECTEXPRESSIONS : { }
+{
+ select_expression() (<COMMA> select_expression())*
+}
+
+
+void select_expression() #SELECTEXPRESSION : { }
+{
+ aggregate_select_expression()
+ | LOOKAHEAD(path()) path()
+ | identification_variable()
+ | (<OBJECT> "(" identification_variable() ")")
+ | constructor_expression()
+ | select_extension()
+}
+
+
+void select_extension() #SELECTEXTENSION : { }
+{
+ scalar_function()
+}
+
+
+void subselect_expressions() #SELECTEXPRESSIONS : { }
+{
+ subselect_expression() (<COMMA> subselect_expression())*
+}
+
+
+void subselect_expression() #SELECTEXPRESSION : { }
+{
+ LOOKAHEAD(path()) path()
+ | aggregate_select_expression()
+ | LOOKAHEAD(1) identification_variable()
+}
+
+
+void constructor_expression() #CONSTRUCTOR : { }
+{
+ <NEW> classname() constructor_parameters()
+}
+
+
+void classname() #CLASSNAME :
+{ Token t; }
+{
+ identification_variable() (<DOT> identification_variable())*
+}
+
+
+void constructor_parameters() #CONSTRUCTORPARAMS : { }
+{
+ "(" (constructor_parameter()) (<COMMA> (constructor_parameter()))* ")"
+}
+
+
+void constructor_parameter() #CONSTRUCTORPARAM : { }
+{
+ (path() | aggregate_select_expression())
+}
+
+
+/* rewritten to reduce lookaheads */
+void aggregate_select_expression() #AGGREGATE : { }
+{
+ (avg() | max() | min() | sum() | count())
+}
+
+
+void distinct() #DISTINCT : { }
+{
+ <DISTINCT>
+}
+
+
+void aggregate_path() : { }
+{
+ "(" (
+ LOOKAHEAD(arithmetic_expression()) arithmetic_expression() |
+ LOOKAHEAD(distinct_path()) distinct_path() |
+ LOOKAHEAD(path()) path() |
+ LOOKAHEAD(identification_variable()) identification_variable()
+ ) ")"
+}
+
+
+void distinct_path() #DISTINCTPATH : { }
+{
+ <DISTINCT> (LOOKAHEAD(path()) path() | identification_variable())
+}
+
+
+void count() #COUNT : { }
+{
+ <COUNT> aggregate_path()
+}
+
+
+void avg() #AVERAGE : { }
+{
+ <AVG> aggregate_path()
+}
+
+
+void max() #MAX : { }
+{
+ <MAX> aggregate_path()
+}
+
+
+void min() #MIN : { }
+{
+ <MIN> aggregate_path()
+}
+
+
+void sum() #SUM : { }
+{
+ <SUM> aggregate_path()
+}
+
+
+void where_clause() #WHERE : { }
+{
+ <WHERE> conditional_expression()
+}
+
+
+void groupby_clause() #GROUPBY : { }
+{
+ <GROUP> <BY> groupby_item()
+ (LOOKAHEAD(2) <COMMA> (groupby_item()))*
+}
+
+
+void groupby_item() : { }
+{
+ LOOKAHEAD(path()) path() | identification_variable() | groupby_extension()
+}
+
+
+void groupby_extension() #GROUPBYEXTENSION : { }
+{
+ scalar_function()
+}
+
+
+void having_clause() #HAVING : { }
+{
+ <HAVING> conditional_expression()
+}
+
+
+void subquery() #SUBSELECT : { }
+{
+ simple_select_clause()
+ subquery_from_clause()
+ [LOOKAHEAD(where_clause()) where_clause()]
+ [LOOKAHEAD(groupby_clause()) groupby_clause()]
+ [LOOKAHEAD(having_clause()) having_clause()]
+}
+
+
+/* changed to eliminate left recursion */
+void conditional_expression() : { }
+{
+ conditional_term() (LOOKAHEAD(2) <OR> (conditional_expression() #OR(2)))*
+}
+
+
+/* changed to eliminate left recursion */
+void conditional_term() : { }
+{
+ conditional_factor() (LOOKAHEAD(2) <AND> (conditional_term() #AND(2)))*
+}
+
+
+void conditional_factor() : { }
+{
+ LOOKAHEAD(<NOT> conditional_primary())
+ (<NOT> conditional_primary() #NOT) | conditional_primary()
+}
+
+
+void conditional_primary() : { }
+{
+ LOOKAHEAD(simple_cond_expression())
+ simple_cond_expression() | "(" conditional_expression() ")"
+}
+
+
+void simple_cond_expression() : { }
+{
+ //LOOKAHEAD(all_or_any_expression()) all_or_any_expression() |
+ LOOKAHEAD(exists_expression()) exists_expression() |
+ LOOKAHEAD(comparison_expression()) comparison_expression() |
+ LOOKAHEAD(between_expression()) between_expression() |
+ LOOKAHEAD(like_expression()) like_expression() |
+ LOOKAHEAD(in_expression()) in_expression() |
+ LOOKAHEAD(null_comparison_expression()) null_comparison_expression() |
+ LOOKAHEAD(empty_collection_comparison_expression()) empty_collection_comparison_expression() |
+ LOOKAHEAD(collection_member_expression()) collection_member_expression()
+}
+
+
+void between_expression() #BETWEEN : { }
+{
+ LOOKAHEAD(6) arithmetic_expression()
+ [<NOT> { jjtThis.not = true; }] <BETWEEN> arithmetic_expression()
+ <AND> arithmetic_expression()
+ | LOOKAHEAD(6) string_expression()
+ [<NOT> { jjtThis.not = true; }] <BETWEEN> string_expression() <AND> string_expression()
+ | LOOKAHEAD(6) datetime_expression()
+ [<NOT> { jjtThis.not = true; }] <BETWEEN> datetime_expression() <AND> datetime_expression()
+}
+
+
+void in_expression() #IN : { }
+{
+ path() [ LOOKAHEAD(1) <NOT> { jjtThis.not = true; }] <IN>
+ "(" (literal_or_param()
+ (<COMMA> (literal_or_param()))* | subquery())
+ ")"
+}
+
+
+void literal_or_param() : { }
+{
+ (numeric_literal()
+ | string_literal()
+ | boolean_literal()
+ | input_parameter())
+}
+
+
+void like_expression() #LIKE : { }
+{
+ string_expression() [<NOT> { jjtThis.not = true; }] <LIKE> pattern_value()
+}
+
+
+void null_comparison_expression() #ISNULL : { }
+{
+ (input_parameter() | path() | aggregate_select_expression())
+ <IS> [<NOT> { jjtThis.not = true; }] <NULL>
+}
+
+
+void empty_collection_comparison_expression() #ISEMPTY : { }
+{
+ path() <IS> [<NOT> { jjtThis.not = true; }] <EMPTY>
+}
+
+
+void collection_member_expression() #MEMBEROF : { }
+{
+ (LOOKAHEAD(path()) path() | input_parameter() | path_component())
+ [<NOT> { jjtThis.not = true; }] <MEMBER> [<OF>] path()
+}
+
+
+void exists_expression() #EXISTS : { }
+{
+ [<NOT> { jjtThis.not = true; }] <EXISTS> "(" subquery() ")"
+}
+
+
+void all_or_any_expression() : { }
+{
+ any_expression() | some_expression() | all_expression()
+}
+
+
+void any_expression() #ANY : { }
+{
+ <ANY> "(" subquery() ")"
+}
+
+
+void some_expression() #ANY : { }
+{
+ // SOME and ANY are synonymous
+ <SOME> "(" subquery() ")"
+}
+
+
+void all_expression() #ALL : { }
+{
+ <ALL> "(" subquery() ")"
+}
+
+
+void comparison_expression() : { }
+{
+ // comparison_expression ::= string_value comparison_operator {string_expression | all_or_any_expression} | boolean_value { =|<>} {boolean_expression | all_or_any_expression} | datetime_primary comparison_operator {datetime_expression | all_or_any_expression} | entity_bean_value { = | <> } {entity_bean_expression | all_or_any_expression} | arithmetic_value comparison_operator {arithmetic_expression | all_or_any_expression
+
+ LOOKAHEAD(arithmetic_comp()) arithmetic_comp() |
+ LOOKAHEAD(string_comp()) string_comp() |
+ LOOKAHEAD(boolean_comp()) boolean_comp() |
+ LOOKAHEAD(enum_comp()) enum_comp() |
+ LOOKAHEAD(datetime_comp()) datetime_comp() |
+ LOOKAHEAD(entity_comp()) entity_comp()
+}
+
+
+void string_comp() : { }
+{
+ string_expression() (
+ (<EQ> (string_expression()|all_or_any_expression()) #EQUALS(2))
+ | (<NE> (string_expression()|all_or_any_expression()) #NOTEQUALS(2))
+ | (<GT> (string_expression() | all_or_any_expression()) #GREATERTHAN(2))
+ | (<GE> (string_expression() | all_or_any_expression()) #GREATEROREQUAL(2))
+ | (<LT> (string_expression() | all_or_any_expression()) #LESSTHAN(2))
+ | (<LE> (string_expression() | all_or_any_expression()) #LESSOREQUAL(2))
+ )
+}
+
+
+void boolean_comp() : { }
+{
+ boolean_expression() (
+ (<EQ> (boolean_expression() | all_or_any_expression()) #EQUALS(2))
+ | (<NE> (boolean_expression() | all_or_any_expression()) #NOTEQUALS(2))
+ )
+}
+
+void enum_comp() : { }
+{
+ enum_expression() (
+ (<EQ> (enum_expression() | all_or_any_expression()) #EQUALS(2))
+ | (<NE> (enum_expression() | all_or_any_expression()) #NOTEQUALS(2))
+ )
+}
+
+void entity_comp() : { }
+{
+ entity_bean_expression() (
+ (<EQ> ((LOOKAHEAD(all_or_any_expression()) all_or_any_expression() | entity_bean_expression()) #EQUALS(2)))
+ | (<NE> ((LOOKAHEAD(all_or_any_expression()) all_or_any_expression() | entity_bean_expression()) #NOTEQUALS(2)))
+ )
+}
+
+
+void arithmetic_comp() : { }
+{
+ // arithmetic_value() (
+ arithmetic_expression() (
+ (<EQ> (arithmetic_expression() | all_or_any_expression()) #EQUALS(2))
+ | (<GT> (arithmetic_expression() | all_or_any_expression()) #GREATERTHAN(2))
+ | (<GE> (arithmetic_expression() | all_or_any_expression()) #GREATEROREQUAL(2))
+ | (<LT> (arithmetic_expression() | all_or_any_expression()) #LESSTHAN(2))
+ | (<LE> (arithmetic_expression() | all_or_any_expression()) #LESSOREQUAL(2))
+ | (<NE> (arithmetic_expression() | all_or_any_expression()) #NOTEQUALS(2))
+ )
+}
+
+
+void datetime_comp() : { }
+{
+ datetime_expression() (
+ (<EQ> (datetime_expression() | all_or_any_expression()) #EQUALS(2))
+ | (<GT> (datetime_expression() | all_or_any_expression()) #GREATERTHAN(2))
+ | (<GE> (datetime_expression() | all_or_any_expression()) #GREATEROREQUAL(2))
+ | (<LT> (datetime_expression() | all_or_any_expression()) #LESSTHAN(2))
+ | (<LE> (datetime_expression() | all_or_any_expression()) #LESSOREQUAL(2))
+ | (<NE> (datetime_expression() | all_or_any_expression()) #NOTEQUALS(2))
+ )
+}
+
+void scalar_function() : { }
+{
+ functions_returning_numerics()
+ | functions_returning_datetime()
+ | functions_returning_strings()
+}
+
+void arithmetic_value() : { }
+{
+ path() | functions_returning_numerics() | "(" subquery() ")"
+}
+
+
+/* changed to eliminate left recursion */
+void arithmetic_expression() : { }
+{
+ arithmetic_term()
+ ((<PLUS> arithmetic_expression() #ADD(2))
+ | (<MINUS> arithmetic_expression() #SUBTRACT(2)))*
+}
+
+
+/* changed to eliminate left recursion */
+void arithmetic_term() : { }
+{
+ arithmetic_factor()
+ ((<TIMES> arithmetic_term() #MULTIPLY(2))
+ | (<DIV> arithmetic_term() #DIVIDE(2)))*
+}
+
+
+void arithmetic_factor() : { }
+{
+ numeric_literal() |
+ input_parameter() |
+ path() |
+ LOOKAHEAD(2) "(" arithmetic_expression() ")" |
+ functions_returning_numerics() |
+ aggregate_select_expression() |
+ subquery()
+}
+
+
+void negative() #NEGATIVE : { }
+{
+ <MINUS>
+}
+
+
+void string_value() : { }
+{
+ path() | functions_returning_strings() | "(" subquery() ")"
+}
+
+
+void string_expression() : { }
+{
+ input_parameter() | string_primary()
+}
+
+
+void string_primary() : { }
+{
+ string_literal() | path() | LOOKAHEAD(2) "(" string_expression() ")" |
+ functions_returning_strings() | LOOKAHEAD(2) "(" subquery() ")"
+}
+
+
+void datetime_expression() : { }
+{
+ datetime_primary() | "(" subquery() ")"
+}
+
+
+void datetime_primary() : { }
+{
+ path() | functions_returning_datetime() | input_parameter() | aggregate_select_expression()
+}
+
+
+void boolean_value() : { }
+{
+ path() | "(" subquery() ")"
+}
+
+
+void boolean_expression() : { }
+{
+ boolean_primary() | "(" subquery() ")"
+}
+
+
+void boolean_primary() : { }
+{
+ LOOKAHEAD(2) path() | boolean_literal() | input_parameter()
+}
+
+
+void enum_expression() : { }
+{
+ enum_primary() | "(" subquery() ")"
+}
+
+
+void enum_primary() : { }
+{
+ LOOKAHEAD(2) path()
+ | LOOKAHEAD(enum_literal()) enum_literal()
+ | LOOKAHEAD(input_parameter()) input_parameter()
+}
+
+
+void enum_literal() : { }
+{
+ { inEnumPath = true; }
+ path()
+ { inEnumPath = false; }
+}
+
+
+void entity_bean_value() : { }
+{
+ LOOKAHEAD(path()) path() | path_component()
+}
+
+
+void entity_bean_expression() : { }
+{
+ input_parameter() | entity_bean_value()
+}
+
+
+void functions_returning_strings() : { }
+{
+ concat() | substring() | trim() | lower() | upper()
+}
+
+
+void concat() #CONCAT : { }
+{
+ <CONCAT> "(" string_expression() <COMMA> string_expression() ")"
+}
+
+
+void substring() #SUBSTRING : { }
+{
+ <SUBSTRING> "(" string_expression() <COMMA> arithmetic_expression() <COMMA> arithmetic_expression() ")"
+}
+
+
+void trim() #TRIM : { }
+{
+ <TRIM> "(" [LOOKAHEAD(2)[trim_specification()] [trim_character()] <FROM>]
+ string_expression() ")"
+}
+
+
+void lower() #LOWER : { }
+{
+ <LOWER> "(" string_expression() ")"
+}
+
+
+void upper() #UPPER : { }
+{
+ <UPPER> "(" string_expression() ")"
+}
+
+
+
+void trim_specification() : { }
+{
+ LOOKAHEAD(2) (<LEADING> #TRIMLEADING) | (<TRAILING> #TRIMTRAILING) | (<BOTH> #TRIMBOTH)
+}
+
+
+void functions_returning_numerics() : { }
+{
+ length() | locate() | abs() | sqrt() | mod() | size()
+}
+
+
+void length() #LENGTH : { }
+{
+ <LENGTH> "(" string_expression() ")"
+
+}
+
+
+void locate() #LOCATE : { }
+{
+ <LOCATE> "(" string_expression() <COMMA> string_expression()
+ [<COMMA> arithmetic_expression()] ")"
+
+}
+
+
+void abs() #ABS : { }
+{
+ <ABS> "(" arithmetic_expression() ")"
+
+}
+
+
+void sqrt() #SQRT : { }
+{
+ <SQRT> "(" arithmetic_expression() ")"
+
+}
+
+
+void mod() #MOD : { }
+{
+ <MOD> "(" arithmetic_expression() <COMMA> arithmetic_expression() ")"
+
+}
+
+
+void size() #SIZE : { }
+{
+ <SIZE> "(" path() ")"
+}
+
+
+void functions_returning_datetime() : { }
+{
+ (<CURRENT_DATE> #CURRENTDATE)
+ | (<CURRENT_TIME> #CURRENTTIME)
+ | (<CURRENT_TIMESTAMP> #CURRENTTIMESTAMP)
+}
+
+
+void orderby_clause() #ORDERBY : { }
+{
+ <ORDER> <BY> orderby_item() (<COMMA> orderby_item())*
+}
+
+
+void orderby_item() #ORDERBYITEM : { }
+{
+ (LOOKAHEAD(path()) path() | orderby_extension())
+ [ <ASC> #ASCENDING | <DESC> #DESCENDING ]
+}
+
+
+void orderby_extension() #ORDERBYEXTENSION : { }
+{
+ aggregate_select_expression()
+}
+
+
+void abstract_schema_name() #ABSTRACTSCHEMANAME : { }
+{
+ path_component() (<DOT> path_component())*
+}
+
+
+void tok() #TOK :
+{ Token t; }
+{
+ t = <IDENTIFIER> { jjtThis.setToken (t); }
+}
+
+
+void identification_variable() #IDENTIFIER :
+{ Token t; }
+{
+ t = <IDENTIFIER> { jjtThis.setToken (t); }
+}
+
+
+void path_component() #IDENTIFICATIONVARIABLE :
+{ Token t; }
+{
+ // unlike the identifier(), the path_component() *can* be a
+ // reserved word. E.g., Order.group.length is a perfectly
+ // valid path expression
+ (
+ t = <NEW>
+ | t = <ALL>
+ | t = <ANY>
+ | t = <EXISTS>
+ | t = <SOME>
+ | t = <EMPTY>
+ | t = <ASC>
+ | t = <DESC>
+ | t = <ORDER>
+ | t = <IS>
+ | t = <MEMBER>
+ | t = <OF>
+ | t = <LIKE>
+ | t = <ESCAPE>
+ | t = <BETWEEN>
+ | t = <NULL>
+ | t = <AVG>
+ | t = <MIN>
+ | t = <MAX>
+ | t = <SUM>
+ | t = <COUNT>
+ | t = <OR>
+ | t = <AND>
+ | t = <NOT>
+ | t = <CONCAT>
+ | t = <SUBSTRING>
+ | t = <TRIM>
+ | t = <LOWER>
+ | t = <UPPER>
+ | t = <LEADING>
+ | t = <TRAILING>
+ | t = <BOTH>
+ | t = <LENGTH>
+ | t = <LOCATE>
+ | t = <ABS>
+ | t = <SQRT>
+ | t = <MOD>
+ | t = <SIZE>
+ | t = <CURRENT_DATE>
+ | t = <CURRENT_TIME>
+ | t = <CURRENT_TIMESTAMP>
+ | t = <SELECT>
+ | t = <DISTINCT>
+ | t = <FROM>
+ | t = <UPDATE>
+ | t = <DELETE>
+ | t = <WHERE>
+ | t = <GROUP>
+ | t = <BY>
+ | t = <HAVING>
+ | t = <AS>
+ | t = <LEFT>
+ | t = <OUTER>
+ | t = <INNER>
+ | t = <JOIN>
+ | t = <FETCH>
+ | t = <IN>
+ | t = <SET>
+ | t = <OBJECT>
+ | t = <IDENTIFIER>
+ ) { jjtThis.setToken (t); }
+}
+
+
+void numeric_literal() : { }
+{
+ LOOKAHEAD(decimal_literal()) decimal_literal() | integer_literal()
+}
+
+
+void integer_literal() #INTEGERLITERAL :
+{ Token t; }
+{
+ [<PLUS> | negative()] t = <INTEGER_LITERAL> { jjtThis.setToken (t); }
+}
+
+
+void decimal_literal() #DECIMALLITERAL :
+{ Token t; }
+{
+ [<PLUS> | negative()] t = <DECIMAL_LITERAL> { jjtThis.setToken (t); }
+}
+
+
+void boolean_literal() #BOOLEANLITERAL :
+{ Token t; }
+{
+ t = <BOOLEAN_LITERAL> { jjtThis.setToken (t); }
+}
+
+
+void string_literal() #STRINGLITERAL :
+{ Token t; }
+{
+ t = <STRING_LITERAL> { jjtThis.setToken (t); }
+}
+
+
+void input_parameter() : { }
+{
+ named_input_parameter() | positional_input_parameter()
+}
+
+
+void named_input_parameter() #NAMEDINPUTPARAMETER :{ }
+{
+ ":" path_component()
+}
+
+
+void positional_input_parameter() #POSITIONALINPUTPARAMETER :
+{ Token t; }
+{
+ "?" t = <INTEGER_LITERAL> { jjtThis.setToken (t); }
+}
+
+
+void pattern_value() #PATTERNVALUE : { }
+{
+ (input_parameter() | string_literal())
+ [(<ESCAPE> escape_character() #ESCAPECHARACTER)]
+}
+
+
+void escape_character() #ESCAPECHARACTER :
+{ Token t; }
+{
+ t = <STRING_LITERAL> { jjtThis.setToken (t); }
+}
+
+
+void trim_character() #TRIMCHARACTER :
+{ Token t; }
+{
+ t = <STRING_LITERAL> { jjtThis.setToken (t); }
+}
+
+
+void EQ() #EQUALS : { }
+{
+ <EQ>
+}
+
+
+void NE() #NOTEQUALS : { }
+{
+ <NE>
+}
+
+
+void GT() #GREATERTHAN : { }
+{
+ <GT>
+}
+
+
+void GE() #GREATEROREQUAL : { }
+{
+ <GE>
+}
+
+
+void LT() #LESSTHAN : { }
+{
+ <LT>
+}
+
+
+void LE() #LESSOREQUAL : { }
+{
+ <LE>
+}

Added: openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java?rev=881892&view=auto
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java (added)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java Wed Nov 18 19:29:13 2009
@@ -0,0 +1,56 @@
+/*
+ * 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.EntityManager;
+import javax.persistence.Query;
+
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+/**
+ * Tests query parameters.
+ *
+ * @author Catalina Wei
+ *
+ */
+public class TestQueryParameters extends SingleEMFTestCase {
+ private static OpenJPAEntityManagerFactorySPI oemf;
+ private EntityManager em;
+
+ public void setUp() {
+ if (oemf == null) {
+ super.setUp(SimpleEntity.class);
+ oemf = (OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.cast(emf);
+ }
+ em = oemf.createEntityManager();
+ }
+
+ public void tearDown() {
+ // do not close the factory
+ }
+
+ public void testNamedParameterUsingReservedWord() {
+ String jpql = "select e from simple e WHERE e.name=:order order by e.id";
+ Query q = em.createQuery(jpql)
+ .setParameter("order", "XYZ");
+ q.getResultList();
+ }
+}

svn commit: r881772 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java

2009-11-18T05:33:04Z

Author: ppoddar
Date: Wed Nov 18 13:33:04 2009
New Revision: 881772

URL: http://svn.apache.org/viewvc?rev=881772&view=rev
Log:
Works for MySQL

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java?rev=881772&r1=881771&r2=881772&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java Wed Nov 18 13:33:04 2009
@@ -37,6 +37,7 @@
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.DerbyDictionary;
import org.apache.openjpa.jdbc.sql.HSQLDictionary;
+import org.apache.openjpa.jdbc.sql.MySQLDictionary;
import org.apache.openjpa.jdbc.sql.OracleDictionary;
import org.apache.openjpa.lib.jdbc.AbstractJDBCListener;
import org.apache.openjpa.lib.jdbc.JDBCEvent;
@@ -174,7 +175,7 @@
cSQL.size());
}

- if (!(dict instanceof DerbyDictionary))
+ if (!(dict instanceof DerbyDictionary || dict instanceof MySQLDictionary))
return;

for (int i = 0; i < jSQL.size(); i++) {

Pinaki

svn commit: r881638 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java

2009-11-17T16:53:03Z

Author: ppoddar
Date: Wed Nov 18 00:53:03 2009
New Revision: 881638

URL: http://svn.apache.org/viewvc?rev=881638&view=rev
Log:
OPENJPA-1392, OPENJPA-1393: countDistinct() and integer return type for size()

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java?rev=881638&r1=881637&r2=881638&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java Wed Nov 18 00:53:03 2009
@@ -1403,6 +1403,30 @@
cb.nullLiteral(String.class)));

Query q = em.createQuery(cquery);
-
+ }
+
+ public void testCountDistinct() {
+ // JPQL Parser does not do well with the following
+ String jpql = "select DISTINCT COUNT(a.name) from Account a";
+
+ CriteriaQuery<Long> c = cb.createQuery(Long.class);
+ Root<Account> a = c.from(Account.class);
+ c.select(cb.countDistinct(a.get(Account_.name)));
+
+ // hence we do not check equivalence against JPQL
+ // assertEquivalence(c, jpql);
+ // but check against SQL
+ String expectedSQL = "SELECT COUNT(DISTINCT t0.name) FROM CR_ACCT t0";
+ executeAndCompareSQL(c, expectedSQL);
+ }
+
+ public void testSizeReturnsInteger() {
+ String jpql = "select SIZE(c.accounts) from Customer c";
+ CriteriaQuery<Integer> c = cb.createQuery(Integer.class);
+ Root<Customer> customer = c.from(Customer.class);
+ c.select(cb.size(customer.get(Customer_.accounts)));
+
+ assertEquivalence(c, jpql);
+
}
}

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java?rev=881638&r1=881637&r2=881638&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java Wed Nov 18 00:53:03 2009
@@ -303,8 +303,8 @@

@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
- Value v = factory.count(Expressions.toValue(e, factory, q));
- return _distinct ? factory.distinct(v) : v;
+ Value v = Expressions.toValue(e, factory, q);
+ return _distinct ? factory.count(factory.distinct(v)) : factory.count(v);
}

@Override
@@ -387,11 +387,14 @@
@Override
public Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
Value val = Expressions.toValue(e, factory, q);
+ Value result;
if (val instanceof Literal && ((Literal)val).getParseType() == Literal.TYPE_COLLECTION)
- return factory.newLiteral(((Collection)((Literal)val).getValue()).size(),
+ result = factory.newLiteral(((Collection)((Literal)val).getValue()).size(),
Literal.TYPE_NUMBER);
-
- return factory.size(val);
+ else
+ result = factory.size(val);
+ result.setImplicitType(Integer.class);
+ return result;
}

public StringBuilder asValue(AliasContext q) {

Pinaki

svn commit: r881613 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

2009-11-17T15:09:57Z

Author: mikedd
Date: Tue Nov 17 23:09:57 2009
New Revision: 881613

URL: http://svn.apache.org/viewvc?rev=881613&view=rev
Log:
OPENJPA-1384:
Try current classloader when loading DBDictionary.
Submitted By: B.J. Reed

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?rev=881613&r1=881612&r2=881613&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java Tue Nov 17 23:09:57 2009
@@ -154,6 +154,18 @@
DBDictionary.class)));
dict = (DBDictionary) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
+ } catch (ClassNotFoundException cnfe) {
+ // if the dictionary was not found, make another attempt
+ // at loading the dictionary using the current thread.
+ try {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass(dclass);
+ dict = (DBDictionary) AccessController.doPrivileged(
+ J2DoPrivHelper.newInstanceAction(c));
+ } catch (Exception e) {
+ if (e instanceof PrivilegedActionException)
+ e = ((PrivilegedActionException) e).getException();
+ throw new UserException(e).setFatal(true);
+ }
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
e = ((PrivilegedActionException) e).getException();

svn commit: r881612 - /openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

2009-11-17T15:09:43Z

Author: mikedd
Date: Tue Nov 17 23:09:42 2009
New Revision: 881612

URL: http://svn.apache.org/viewvc?rev=881612&view=rev
Log:
OPENJPA-1384:
Try current classloader when loading DBDictionary.
Submitted By: B.J. Reed

Modified:
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?rev=881612&r1=881611&r2=881612&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java Tue Nov 17 23:09:42 2009
@@ -122,6 +122,18 @@
DBDictionary.class)));
dict = (DBDictionary) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
+ } catch (ClassNotFoundException cnfe) {
+ // if the dictionary was not found, make another attempt
+ // at loading the dictionary using the current thread.
+ try {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass(dclass);
+ dict = (DBDictionary) AccessController.doPrivileged(
+ J2DoPrivHelper.newInstanceAction(c));
+ } catch (Exception e) {
+ if (e instanceof PrivilegedActionException)
+ e = ((PrivilegedActionException) e).getException();
+ throw new UserException(e).setFatal(true);
+ }
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
e = ((PrivilegedActionException) e).getException();

svn commit: r881605 - /openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

2009-11-17T15:03:21Z

Author: mikedd
Date: Tue Nov 17 23:03:20 2009
New Revision: 881605

URL: http://svn.apache.org/viewvc?rev=881605&view=rev
Log:
OPENJPA-1384:
Try current classloader when loading DBDictionaries if the first attempt fails.
Submitted By: B.J. Reed

Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

Modified: openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?rev=881605&r1=881604&r2=881605&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java (original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java Tue Nov 17 23:03:20 2009
@@ -154,6 +154,18 @@
DBDictionary.class)));
dict = (DBDictionary) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
+ } catch (ClassNotFoundException cnfe) {
+ // if the dictionary was not found, make another attempt
+ // at loading the dictionary using the current thread.
+ try {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass(dclass);
+ dict = (DBDictionary) AccessController.doPrivileged(
+ J2DoPrivHelper.newInstanceAction(c));
+ } catch (Exception e) {
+ if (e instanceof PrivilegedActionException)
+ e = ((PrivilegedActionException) e).getException();
+ throw new UserException(e).setFatal(true);
+ }
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
e = ((PrivilegedActionException) e).getException();

svn commit: r881598 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/ openjpa-persistence-jdbc/src/te...

2009-11-17T14:59:01Z

Author: fancy
Date: Tue Nov 17 22:59:01 2009
New Revision: 881598

URL: http://svn.apache.org/viewvc?rev=881598&view=rev
Log:
OPENJPA-1388 JPQL named parameter using a reserved word (:vlaue) resulting in ArgumentException

Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java?rev=881598&r1=881597&r2=881598&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java Tue Nov 17 22:59:01 2009
@@ -1732,7 +1732,7 @@
for (Object expected : paramTypes.keySet()) {
if (!params.containsKey(expected))
throw new UserException(_loc.get("unbound-params",
- params.keySet()));
+ expected, params.keySet()));
}

Iterator itr = paramTypes.entrySet().iterator();

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=881598&r1=881597&r2=881598&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java Tue Nov 17 22:59:01 2009
@@ -1027,15 +1027,18 @@
return eval(firstChild(node));

case JJTNAMEDINPUTPARAMETER:
- return getParameter(node.text, false, false);
+ return getParameter(onlyChild(node).text, false, false);

case JJTPOSITIONALINPUTPARAMETER:
return getParameter(node.text, true, false);

case JJTCOLLECTIONPARAMETER:
JPQLNode child = onlyChild(node);
+ boolean positional = child.id == JJTPOSITIONALINPUTPARAMETER;
+ if (!positional)
+ child = onlyChild(child);
return getParameter(child.text,
- child.id == JJTPOSITIONALINPUTPARAMETER, true);
+ positional, true);

case JJTOR: // x OR y
return factory.or(getExpression(left(node)),

Modified: openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt?rev=881598&r1=881597&r2=881598&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt (original)
+++ openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt Tue Nov 17 22:59:01 2009
@@ -1488,10 +1488,9 @@
}

-void named_input_parameter() #NAMEDINPUTPARAMETER :
-{ Token t; }
+void named_input_parameter() #NAMEDINPUTPARAMETER : { }
{
- ":" t = <IDENTIFIER> { jjtThis.setToken (t); }
+ ":" path_component()
}

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java?rev=881598&r1=881597&r2=881598&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java Tue Nov 17 22:59:01 2009
@@ -107,10 +107,10 @@
user = rs.get(0);
assertEquals("Famzy", user.getName());

- query = "SELECT e FROM CompUser e where TYPE(e) in :params " +
+ query = "SELECT e FROM CompUser e where TYPE(e) in :value " +
"ORDER BY e.age";
rs = em.createQuery(query).
- setParameter("params", params).getResultList();
+ setParameter("value", params).getResultList();
user = rs.get(0);
assertEquals("Jacob", user.getName());

@@ -137,10 +137,10 @@
type = ((Object[]) rs2.get(0))[1];
assertEquals(type, FemaleUser.class);

- query = "SELECT e FROM CompUser e where TYPE(e) = :typeName " +
+ query = "SELECT e FROM CompUser e where TYPE(e) = :type " +
" ORDER BY e.name";
rs = em.createQuery(query).
- setParameter("typeName", FemaleUser.class).getResultList();
+ setParameter("type", FemaleUser.class).getResultList();
assertTrue(rs.size()==3);
user = rs.get(0);
assertEquals("Famzy", user.getName());

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java?rev=881598&r1=881597&r2=881598&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java Tue Nov 17 22:59:01 2009
@@ -59,6 +59,24 @@
// do not close the factory
}

+ public void testNamedParameterUsingReservedWord() {
+ String jpql = "select e from simple e WHERE e.id=:key and e.name=:value";
+ Query q = em.createQuery(jpql)
+ .setParameter("key", 100)
+ .setParameter("value", "XYZ");
+
+ assertEquals(2, q.getParameters().size());
+ Parameter<?> param1 = q.getParameter("key");
+ Parameter<?> param2 = q.getParameter("value");
+
+ assertEquals(100, q.getParameterValue("key"));
+ assertEquals(100, q.getParameterValue(param1));
+ assertEquals("XYZ", q.getParameterValue("value"));
+ assertEquals("XYZ", q.getParameterValue(param2));
+
+ q.getResultList();
+ }
+
public void testPositionalParameterInJPQLQuery() {
String jpql = "select e from simple e WHERE e.id=?1 and e.name=?2";
Query q = em.createQuery(jpql)

svn commit: r881566 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java

2009-11-17T14:10:18Z

Author: ppoddar
Date: Tue Nov 17 22:10:18 2009
New Revision: 881566

URL: http://svn.apache.org/viewvc?rev=881566&view=rev
Log:
Support default projection for untyped result class, if possible.

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java?rev=881566&r1=881565&r2=881566&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java Tue Nov 17 22:10:18 2009
@@ -39,6 +39,7 @@
import javax.persistence.criteria.Selection;
import javax.persistence.criteria.SetJoin;
import javax.persistence.criteria.Subquery;
+import javax.persistence.metamodel.EntityType;

import org.apache.openjpa.persistence.test.AllowFailure;

@@ -1389,4 +1390,19 @@
cb.isTrue(cb.disjunction())));
em.createQuery(c).getResultList();
}
+
+ public void testDefaultProjectionWithUntypedResult() {
+ CriteriaQuery cquery = cb.createQuery();
+ Root<Customer> customer = cquery.from(Customer.class);
+
+ //Get Metamodel from Root
+ EntityType<Customer> Customer_ = customer.getModel();
+
+ cquery.where(cb.equal(
+ customer.get(Customer_.getSingularAttribute("name", String.class)),
+ cb.nullLiteral(String.class)));
+
+ Query q = em.createQuery(cquery);
+
+ }
}

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java?rev=881566&r1=881565&r2=881566&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java Tue Nov 17 22:10:18 2009
@@ -594,7 +594,9 @@

protected boolean isDefaultProjection() {
if (_selections == null) {
- return getRoots().size() == 1 && getRoot().getModel().getJavaType() == _resultClass;
+ return getRoots().size() == 1
+ && (getRoot().getModel().getJavaType() == _resultClass ||
+ _resultClass == Object.class);
}
if (_selections.size() != 1) {
return false;

Pinaki

svn commit: r881529 - in /openjpa/trunk/openjpa-persistence/src/main: java/org/apache/openjpa/persistence/meta/ resources/org/apache/openjpa/persistence/meta/

2009-11-17T13:16:24Z

Author: ppoddar
Date: Tue Nov 17 21:16:23 2009
New Revision: 881529

URL: http://svn.apache.org/viewvc?rev=881529&view=rev
Log:
OPENJPA-1391: Handle untyped collection

Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java?rev=881529&r1=881528&r2=881529&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java Tue Nov 17 21:16:23 2009
@@ -58,7 +58,7 @@
public abstract class AbstractManagedType<X> extends Types.BaseType<X>
implements ManagedType<X> {

- private static final Localizer _loc = Localizer.forPackage(Types.class);
+ private static final Localizer _loc = Localizer.forPackage(AbstractManagedType.class);
public final MetamodelImpl model;
public final ClassMetaData meta;

@@ -248,7 +248,7 @@
new AttributeTypeFilter<X, Y>(type),
singularAttributeFilter);
if (result == null)
- notFoundException("attr-not-found-single",name, type);
+ notFoundException("attr-not-found-single", name, type);

return (SingularAttribute<? super X, Y>) result;
}
@@ -317,7 +317,7 @@
new ElementTypeFilter<X, E>(elementType),
new AttributeNameFilter<X>(name));
if (result == null)
- notFoundException("attr-not-found-coll",name, elementType);
+ notFoundException("attr-not-found-coll", name, elementType);

return (CollectionAttribute<? super X, E>) result;
}
@@ -729,12 +729,14 @@
// Exception handling
// -------------------------------------------------------------------------
private void notFoundException(String msg, String name, Class<?> t1) {
- throw new IllegalArgumentException(msg + " Attribute " + name + " of type " +
- (t1 == null ? "any" : t1.getName()) + " not found in " + meta);
+ throw new IllegalArgumentException(
+ _loc.get(msg, name, (t1 == null ? "any" : t1.getName()), meta).getMessage());
}

private void notFoundException(String msg, String name, Class<?> t1, Class<?> t2) {
- throw new IllegalArgumentException("Attribute " + name + " not found");
+ throw new IllegalArgumentException(
+ _loc.get(msg, new Object[]{name, (t1 == null ? "any" : t1.getName()),
+ (t2 == null ? "any" : t1.getName()), meta}).getMessage());
}
// --------------------------------------------------------------------------
// Attribute filtering

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java?rev=881529&r1=881528&r2=881529&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java Tue Nov 17 21:16:23 2009
@@ -244,12 +244,10 @@
Set<? extends Element> members = handler.getPersistentMembers(e);

for (Element m : members) {
- TypeMirror decl = handler.getDeclaredType(m);
- decl.getKind();
+ TypeMirror decl = handler.getDeclaredType(m);
String fieldName = handler.getPersistentMemberName(m);
String fieldType = handler.getDeclaredTypeName(decl);
- TypeCategory typeCategory = toMetaModelTypeCategory(decl,
- fieldType);
+ TypeCategory typeCategory = toMetaModelTypeCategory(decl, fieldType);
String metaModelType = typeCategory.getMetaModelType();
SourceCode.Field modelField = null;
switch (typeCategory) {
@@ -261,15 +259,15 @@
case COLLECTION:
case LIST:
case SET:
- TypeMirror param = handler.getTypeParameter(decl, 0);
+ TypeMirror param = handler.getTypeParameter(m, decl, 0, true);
String elementType = handler.getDeclaredTypeName(param);
modelField = modelClass.addField(fieldName, metaModelType);
modelField.addParameter(originalSimpleClass)
.addParameter(elementType);
break;
case MAP:
- TypeMirror key = handler.getTypeParameter(decl, 0);
- TypeMirror value = handler.getTypeParameter(decl, 1);
+ TypeMirror key = handler.getTypeParameter(m, decl, 0, false);
+ TypeMirror value = handler.getTypeParameter(m, decl, 1, true);
String keyType = handler.getDeclaredTypeName(key);
String valueType = handler.getDeclaredTypeName(value);
modelField = modelClass.addField(fieldName, metaModelType);

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java?rev=881529&r1=881528&r2=881529&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java Tue Nov 17 21:16:23 2009
@@ -47,7 +47,11 @@

import javax.persistence.Embeddable;
import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.Transient;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.meta.AccessCode;
@@ -65,6 +69,7 @@
implements MetadataProcessor<TypeElement, Element> {

private final ProcessingEnvironment processingEnv;
+ private final Types typeUtility;
private final CompileTimeLogger logger;
/**
* Set of Inclusion Filters based on member type, access type or transient
@@ -81,8 +86,14 @@
protected GetterFilter getterFilter = new GetterFilter();
protected SetterFilter setterFilter = new SetterFilter();

- private static Localizer _loc = Localizer.forPackage(
- SourceAnnotationHandler.class);
+ protected static List<Class<? extends Annotation>> mappingAnnos = new ArrayList<Class<? extends Annotation>>();
+ static {
+ mappingAnnos.add(OneToOne.class);
+ mappingAnnos.add(OneToMany.class);
+ mappingAnnos.add(ManyToOne.class);
+ mappingAnnos.add(ManyToMany.class);
+ }
+ private static Localizer _loc = Localizer.forPackage(SourceAnnotationHandler.class);

/**
* Construct with JDK6 annotation processing environment.
@@ -92,6 +103,7 @@
CompileTimeLogger logger) {
super();
this.processingEnv = processingEnv;
+ this.typeUtility = processingEnv.getTypeUtils();
this.logger = logger;
}

@@ -187,15 +199,12 @@

private int getImplicitAccessType(TypeElement type) {
List<? extends Element> allMembers = type.getEnclosedElements();
- Set<VariableElement> allFields = (Set<VariableElement>)
- filter(allMembers, fieldFilter, nonTransientFilter);
- Set<ExecutableElement> allMethods = (Set<ExecutableElement>)
- filter(allMembers, methodFilter, nonTransientFilter);
+ Set<VariableElement> allFields = (Set<VariableElement>) filter(allMembers, fieldFilter, nonTransientFilter);
+ Set<ExecutableElement> allMethods = (Set<ExecutableElement>) filter(allMembers, methodFilter,
+ nonTransientFilter);

- Set<VariableElement> annotatedFields = filter(allFields,
- annotatedFilter);
- Set<ExecutableElement> getters = filter(allMethods, getterFilter,
- annotatedFilter);
+ Set<VariableElement> annotatedFields = filter(allFields, annotatedFilter);
+ Set<ExecutableElement> getters = filter(allMethods, getterFilter, annotatedFilter);
Set<ExecutableElement> setters = filter(allMethods, setterFilter);
getters = matchGetterAndSetter(getters, setters);

@@ -242,9 +251,7 @@
*/
private Set<ExecutableElement> matchGetterAndSetter(
Set<ExecutableElement> getters, Set<ExecutableElement> setters) {
- Collection<ExecutableElement> unmatched =
- new ArrayList<ExecutableElement>();
- Types typeUtils = processingEnv.getTypeUtils();
+ Collection<ExecutableElement> unmatched = new ArrayList<ExecutableElement>();

for (ExecutableElement getter : getters) {
String getterName = getter.getSimpleName().toString();
@@ -257,13 +264,12 @@
.iterator().next().asType();
String actualSetterName = setter.getSimpleName().toString();
matched = actualSetterName.equals(expectedSetterName)
- && typeUtils.isSameType(setterArgType, getterReturnType);
+ && typeUtility.isSameType(setterArgType, getterReturnType);
if (matched)
break;
}
if (!matched) {
- logger.warn(_loc.get("getter-unmatched", getter,
- getter.getEnclosingElement()));
+ logger.warn(_loc.get("getter-unmatched", getter, getter.getEnclosingElement()));
unmatched.add(getter);
}

@@ -524,6 +530,17 @@
}
}

+ TypeMirror getTargetEntityType(Element e) {
+ for (Class<? extends Annotation> anno : mappingAnnos) {
+ Object target = getAnnotationValue(e, anno, "targetEntity");
+ if (target != null) {
+ return (TypeMirror)target;
+ }
+
+ };
+ return null;
+ }
+
String getDeclaredTypeName(TypeMirror mirror) {
return getDeclaredTypeName(mirror, true);
}
@@ -537,6 +554,8 @@
* return <code>java.util.Set</code>.
*/
String getDeclaredTypeName(TypeMirror mirror, boolean box) {
+ if (mirror == null || mirror.getKind() == TypeKind.NULL || mirror.getKind() == TypeKind.WILDCARD)
+ return "java.lang.Object";
if (mirror.getKind() == TypeKind.ARRAY) {
TypeMirror comp = ((ArrayType)mirror).getComponentType();
return getDeclaredTypeName(comp, false);
@@ -544,7 +563,7 @@
mirror = box ? box(mirror) : mirror;
if (isPrimitive(mirror))
return ((PrimitiveType)mirror).toString();
- Element elem = processingEnv.getTypeUtils().asElement(mirror);
+ Element elem = typeUtility.asElement(mirror);
if (elem == null)
throw new RuntimeException(_loc.get("mmg-no-type", mirror).getMessage());
return elem.toString();
@@ -600,15 +619,23 @@
* @return if the given type represents a parameterized type, then the
* indexed parameter type argument. Otherwise null.
*/
- TypeMirror getTypeParameter(TypeMirror mirror, int index) {
+ TypeMirror getTypeParameter(Element e, TypeMirror mirror, int index, boolean checkTarget) {
if (mirror.getKind() == TypeKind.ARRAY)
return ((ArrayType)mirror).getComponentType();
if (mirror.getKind() != TypeKind.DECLARED)
return null;
- List<? extends TypeMirror> params = ((DeclaredType)mirror)
- .getTypeArguments();
- return (params == null || params.size() < index+1)
- ? null : params.get(index);
+ if (checkTarget) {
+ TypeMirror target = getTargetEntityType(e);
+ if (target != null)
+ return target;
+ }
+ List<? extends TypeMirror> params = ((DeclaredType)mirror).getTypeArguments();
+ TypeMirror param = (params == null || params.size() < index+1)
+ ? typeUtility.getNullType() : params.get(index);
+ if (param.getKind() == TypeKind.NULL || param.getKind() == TypeKind.WILDCARD) {
+ logger.warn(_loc.get("generic-type-param", e, getDeclaredType(e), e.getEnclosingElement()));
+ }
+ return param;
}

public TypeElement getPersistentSupertype(TypeElement cls) {

Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties?rev=881529&r1=881528&r2=881529&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties Tue Nov 17 21:16:23 2009
@@ -79,4 +79,6 @@
attr-not-found-map: Map attribute "{0}" of {1} key type and {2} value type not found in {3}
attr-not-found-decl-map: Declared Map attribute "{0}" of {1} key type and {2} value type not found in {3}
decl-version-not-found: Declared version attribute of {1} type not found in {2}
-version-not-found: Version attribute of {1} type not found in {2}
\ No newline at end of file
+version-not-found: Version attribute of {1} type not found in {2}
+generic-type-param: Can not determine generic type parameter for field {0} of type {1} in {2}. \
+ Using java.lang.Object.
\ No newline at end of file

Pinaki

svn commit: r881495 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java

2009-11-17T12:35:20Z

Author: ppoddar
Date: Tue Nov 17 20:35:20 2009
New Revision: 881495

URL: http://svn.apache.org/viewvc?rev=881495&view=rev
Log:
OPENJPA-1390: From.join(String attr) checks any attribute not only singular attributes.

Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java?rev=881495&r1=881494&r2=881495&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java Tue Nov 17 20:35:20 2009
@@ -175,53 +175,68 @@
return join(attr, JoinType.INNER);
}

- public <W,Y> Join<W,Y> join(String attr, JoinType jt) {
- assertJoinable();
- return (Join<W,Y>)join(((ManagedType<X>)type).getSingularAttribute(attr), jt);
+ public <W,Y> Join<W,Y> join(String name, JoinType jt) {
+ assertJoinable(type);
+ ManagedType<X> mType = (ManagedType<X>)type;
+ Attribute<?, ?> attr = mType.getAttribute(name);
+ assertJoinable(attr.getDeclaringType());
+ if (attr instanceof SingularAttribute) {
+ return join((SingularAttribute)attr, jt);
+ } else if (attr instanceof ListAttribute) {
+ return join((ListAttribute)attr, jt);
+ } else if (attr instanceof SetAttribute) {
+ return join((SetAttribute)attr, jt);
+ } else if (attr instanceof CollectionAttribute) {
+ return join((CollectionAttribute)attr, jt);
+ } else if (attr instanceof MapAttribute) {
+ return join((MapAttribute)attr, jt);
+ } else {
+ throw new IllegalArgumentException(name);
+ }
}

public <W,Y> CollectionJoin<W, Y> joinCollection(String attr) {
- assertJoinable();
+ assertJoinable(type);
return (CollectionJoin<W,Y>)join(((ManagedType<X>)type).getCollection(attr), JoinType.INNER);
}

public <W,Y> CollectionJoin<W, Y> joinCollection(String attr, JoinType jt) {
- assertJoinable();
+ assertJoinable(type);
return (CollectionJoin<W,Y>)join(((ManagedType<X>)type).getCollection(attr), jt);
}

public <W,Y> ListJoin<W, Y> joinList(String attr) {
- assertJoinable();
+ assertJoinable(type);
return (ListJoin<W,Y>)join(((ManagedType<X>)type).getList(attr), JoinType.INNER);
}

public <W,Y> ListJoin<W,Y> joinList(String attr, JoinType jt) {
- assertJoinable();
+ assertJoinable(type);
return (ListJoin<W,Y>)join(((ManagedType<X>)type).getList(attr), jt);
}

public <W,K,V> MapJoin<W,K,V> joinMap(String attr) {
- assertJoinable();
+ assertJoinable(type);
return (MapJoin<W,K,V>)join(((ManagedType<X>)type).getMap(attr));
}

public <W,K,V> MapJoin<W,K,V> joinMap(String attr, JoinType jt) {
- assertJoinable();
+ assertJoinable(type);
return (MapJoin<W,K,V>)join(((ManagedType<X>)type).getMap(attr));
}

public <W,Y> SetJoin<W, Y> joinSet(String attr) {
- assertJoinable();
+ assertJoinable(type);
return (SetJoin<W, Y>)join(((ManagedType<X>)type).getSet(attr));
}

public <W,Y> SetJoin<W, Y> joinSet(String attr, JoinType jt) {
- assertJoinable();
+ assertJoinable(type);
return (SetJoin<W, Y>)join(((ManagedType<X>)type).getSet(attr), jt);
}

- void assertJoinable() {
+ void assertJoinable(Type<?> type) {
if (type.getPersistenceType() == PersistenceType.BASIC) {
throw new IllegalArgumentException(this + " is a basic path and can not be navigated to ");
}
@@ -258,7 +273,7 @@
}

public <X,Y> Fetch<X, Y> fetch(String name, JoinType jt) {
- assertJoinable();
+ assertJoinable(type);
Attribute<? super X,?> attr = ((ManagedType<X>)type).getAttribute(name);
if (attr.isCollection()) {
return fetch((PluralAttribute)attr, jt);

Pinaki

svn commit: r881381 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties

2009-11-17T09:13:49Z

Author: ppoddar
Date: Tue Nov 17 17:13:48 2009
New Revision: 881381

URL: http://svn.apache.org/viewvc?rev=881381&view=rev
Log:
Add error messages for attribute not found exceptions.

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java
openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java?rev=881381&r1=881380&r2=881381&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java Tue Nov 17 17:13:48 2009
@@ -20,6 +20,8 @@
package org.apache.openjpa.persistence.meta;

import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.lang.reflect.Modifier;

import javax.persistence.metamodel.Attribute;
@@ -311,6 +313,66 @@
assertEquals(PersistentAttributeType.BASIC, pInt.getPersistentAttributeType());
}

+ public void testNotFoundErrorMessage() {
+ IdentifiableType<ImplicitFieldAccessBase> e0 = model.entity(ImplicitFieldAccessBase.class);
+ String name = "unknown";
+ try {
+ Method[] getters = {
+ e0.getClass().getMethod("getAttribute", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getCollection", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getList", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getSet", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getSingularAttribute", new Class<?>[]{String.class}),
+
+ e0.getClass().getMethod("getDeclaredAttribute", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getDeclaredCollection", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getDeclaredList", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getDeclaredSet", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getDeclaredSingularAttribute", new Class<?>[]{String.class}),
+
+ e0.getClass().getMethod("getAttribute", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getCollection", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getList", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getSet", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getSingularAttribute", new Class<?>[]{String.class, Class.class}),
+
+ e0.getClass().getMethod("getDeclaredAttribute", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getDeclaredCollection", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getDeclaredList", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getDeclaredSet", new Class<?>[]{String.class, Class.class}),
+ e0.getClass().getMethod("getDeclaredSingularAttribute", new Class<?>[]{String.class, Class.class}),
+
+ e0.getClass().getMethod("getMap", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getMap", new Class<?>[]{String.class, Class.class, Class.class}),
+ e0.getClass().getMethod("getDeclaredMap", new Class<?>[]{String.class}),
+ e0.getClass().getMethod("getDeclaredMap", new Class<?>[]{String.class, Class.class, Class.class}),
+ };
+// e0.getClass().getMethod("getDeclaredVersion", new Class<?>[]{Class.class}),
+
+ for (int i = 0; i < getters.length; i++) {
+ Object[] args;
+ if (i < 10) {
+ args = new Object[]{name};
+ } else if (i < 20) {
+ args = new Object[]{name, Object.class};
+ } else if (i%2 == 0) {
+ args = new Object[]{name};
+ } else {
+ args = new Object[]{name, Object.class, String.class};
+ }
+ try {
+ getters[i].invoke(e0, args);
+ fail();
+ } catch (InvocationTargetException e) {
+ System.err.println("Expeceted:" + e.getTargetException());
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
void assertFails(ManagedType<?> type, String name, boolean dec) {
try {
Attribute<?,?> a = dec ? type.getDeclaredAttribute(name)

Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties?rev=881381&r1=881380&r2=881381&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties Tue Nov 17 17:13:48 2009
@@ -67,3 +67,16 @@
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.
+attr-not-found: Attribute "{0}" of {1} not found in {2}
+attr-not-found-single: Singular attribute "{0}" of {1} type not found in {2}
+attr-not-found-decl-single: Declared singular attribute "{0}" of {1} type not found in {2}
+attr-not-found-coll: Collection attribute "{0}" of {1} element type not found in {2}
+attr-not-found-decl-coll: Declared Collection attribute "{0}" of {1} element type not found in {2}
+attr-not-found-list: List attribute "{0}" of {1} element type not found in {2}
+attr-not-found-decl-list: Declared List attribute "{0}" of {1} element type not found in {2}
+attr-not-found-set: Set attribute "{0}" of {1} element type not found in {2}
+attr-not-found-decl-set: Declared Set attribute "{0}" of {1} element type not found in {2}
+attr-not-found-map: Map attribute "{0}" of {1} key type and {2} value type not found in {3}
+attr-not-found-decl-map: Declared Map attribute "{0}" of {1} key type and {2} value type not found in {3}
+decl-version-not-found: Declared version attribute of {1} type not found in {2}
+version-not-found: Version attribute of {1} type not found in {2}
\ No newline at end of file

Pinaki

svn commit: r881353 - /openjpa/KEYS

2009-11-17T08:19:25Z

Author: dwoods
Date: Tue Nov 17 16:19:24 2009
New Revision: 881353

URL: http://svn.apache.org/viewvc?rev=881353&view=rev
Log:
add new 4096 bit key for dwoods

Modified:
openjpa/KEYS

Modified: openjpa/KEYS
URL: http://svn.apache.org/viewvc/openjpa/KEYS?rev=881353&r1=881352&r2=881353&view=diff
==============================================================================
--- openjpa/KEYS (original)
+++ openjpa/KEYS Tue Nov 17 16:19:24 2009
@@ -154,21 +154,22 @@
5CQAn1YB0pFmtxGhR8aZ5Bi3Kkxa9m75
=Z9If
-----END PGP PUBLIC KEY BLOCK-----
-pub 1024D/9F523401 2007-06-12
- Key fingerprint = 677C FCD1 9C6F 64F9 4DD5 D33B CBDC B208 9F52 3401
-uid Donald Woods <[hidden email]>
-sig 3 9F523401 2007-06-12 Donald Woods <[hidden email]>
-sub 2048g/CCF1AD51 2007-06-12
-sig 9F523401 2007-06-12 Donald Woods <[hidden email]>

pub 1024D/9F523401 2007-06-12
uid Donald Woods <[hidden email]>
-sig 3 9F523401 2007-06-12 Donald Woods <[hidden email]>
+sig 3 9F523401 2009-11-17 Donald Woods <[hidden email]>
sub 2048g/CCF1AD51 2007-06-12
sig 9F523401 2007-06-12 Donald Woods <[hidden email]>
-
+
+pub 4096R/D018E6B1 2009-11-17
+uid Donald Ray Woods (Apache code signing key) <[hidden email]>
+sig 3 D018E6B1 2009-11-17 Donald Ray Woods (Apache code signing key) <[hidden email]>
+sig 9F523401 2009-11-17 Donald Woods <[hidden email]>
+sub 4096R/94ACD3F1 2009-11-17
+sig D018E6B1 2009-11-17 Donald Ray Woods (Apache code signing key) <[hidden email]>
+
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG/MacGPG2 v2.0.12 (Darwin)

mQGiBEZujvERBACXWZuHFBP3vVBD/obpZQcf4/D7JTaRUkH/YkT9pP+zuyATPcU/
HYbr8WFOI57HQHXIyC6qfjLWLmKJklGUjIaAGxLo7/V97kPLvPIkWMm/Hl1MFoNT
@@ -179,22 +180,89 @@
sXLoA/wM8v/b1SPL4QlitOe3FRTaZa4/DuFUtYVcP2LvIJeHGpNDgpLrNpVvxy0C
w/OXgJhuyDa4qbQ/8Hx0+D7RHYULCflvHCmwg4y0GHq6DO1LrOmpAA6G/kVUHISv
4C8v06yT+kxI7Z2aKgotylquM7571i+m8+0RvyjwRUBCqFs8FrQgRG9uYWxkIFdv
-b2RzIDxkd29vZHNAYXBhY2hlLm9yZz6IYAQTEQIAIAUCRm6O8QIbAwYLCQgHAwIE
-FQIIAwQWAgMBAh4BAheAAAoJEMvcsgifUjQBy18An3WdDIYa6NlX7Ywn8Pdko+EB
-SU/xAJ47OViBHzoS4enm4wUUqFNLgEWNGLkCDQRGbo9xEAgAuYxPTjdSA/+gUyIS
-Sua3CTo+aXsR6JFQYfrAJOmqW7W/yHKO/0RX6AODkDSDDsYhGuXliQ4k5IWlpbOt
-IVpJNGg0teoNv5zmfRXzgfDfSwVZCVHCU7Mllguh4oAh7+k4EYh9qsXe2cJRgtIr
-DUXdcaqZmlrIId+nuwb0A6285J7/x0JuY+IQokZQIZltV/p2Uu+EoaQgRjcdOj0G
-j/rBWZvgQvBFVOjvLFmxzUTVQPyESJo1KWQaOQDsltcM90LHzPWrB6/5cFPGLwA2
-ZgoUcZ7ZKbmi9vxeXMfVLNgmoRBzu2UbuuZvhMV66oY/5DZcn6jmFsP4M8s/Mvo+
-L+XmnwADBwgAgWfcH5QmmHuqX7wFTFRtajZWjlnV63uNRk66RY0fP0DQKQS2BAjM
-GeFM8QEnjn5+HPftOHKLMs3EJtQH0H+PYSBO4qapLlsIszLp/Kww4+qfcAZZPkjm
-hSQzPBt1j4EaePs7hLMDAdfWOETH2/TZOJQJGx+bZzBL0BMO7KbXBrEKznx68VdE
-nPG/UMNTDiG5j27Iv2eX9c5lg+uvrPm6l0qt8VUKDrF6wXzNe8AEyuV5pBk1A81t
-l6lrLf7ksrh0r5qRN6ezsHgpAhOcU1txeWkrI/TF/2bc5b2wQQBb1rF2cCvVUTCn
-Xu5/hdAOZAPezATJLacb2Ac5SBN9vEvohohJBBgRAgAJBQJGbo9xAhsMAAoJEMvc
-sgifUjQBBcwAn0R4nCTsPSqPFdCUklBIZT2x26g6AJ93cDVwOCKC36lWN9s0+D+x
-i9gx8Q==
-=QdBu
+b2RzIDxkd29vZHNAYXBhY2hlLm9yZz6IYQQTEQIAIQIbAwIeAQIXgAUCSwLBkQUL
+CQgHAwUVCgkICwUWAgMBAAAKCRDL3LIIn1I0AdaAAJwPzC6zLF+/lNyePH0hNSUD
+nCT89gCeK1enlKCtvKQ8Cle2VrGJNdVnzVKIRgQQEQIABgUCRyDlhQAKCRCW6TJX
+tCEAAbgjAJ0ZV9dS7kUOnxYskUPJA5B2X16hRgCfbpGeRq3L2eHzVFwFJp4ieYLY
+V2SIRgQQEQIABgUCRyEFDgAKCRCEpNfphoWTWGoeAJ0fggbP+xcntjsey47FW3Cm
+Iz8uswCguUyUkjs7Z+TnREH0enZQ6R6wdDaIRgQQEQIABgUCRyFA3QAKCRDLrr45
+pGxMoWNoAKCet843aJPcxh0RFC4PFKAFrr29awCghSdmFUbwAjEljaQjwtTFrMlJ
+tAqIRgQQEQIABgUCRyFA+QAKCRAywdbvDxQ7wYQhAKCCoeJX14vaiyeVnnKmGfsf
+QST/wgCgs/zXm65fyJTbDMYGfT9QO3AWMfCIRgQQEQIABgUCRyHLMgAKCRDTsUn/
+NnSW3rYzAJ922G2Czd+YGLM3/aQW63xKtyd5NQCgpSkEbmy2V7PAwh/4Hn+uNHyg
+jc6IRgQQEQIABgUCSAzcJwAKCRD/2XkJYKvXc4l6AKCG+SI7E4lDn51HUuLFw+16
+Ar+A7gCfd8XtXoVFhJZGHyImkLsvUnmMfPSIRgQQEQIABgUCSAzuJAAKCRD+LxNE
+3kEG6suTAJ901qlafPxGu3ljAYEE/uTrSojKcQCfSf955pOELm1rt7dYdeGPWWtR
+75SIYAQTEQIAIAUCRm6O8QIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMvc
+sgifUjQBy18An3WdDIYa6NlX7Ywn8Pdko+EBSU/xAJ47OViBHzoS4enm4wUUqFNL
+gEWNGIhGBBARAgAGBQJJr+8QAAoJEMksjx/SEEOSJzsAnRWbgd/xrg95AYKYLVuP
+GisKIsRoAJ0aTyQ/10ARA/uM1Wke0eIMmFqv4ohGBBARAgAGBQJJr/EeAAoJEIub
+PpnUZsv/Za8AnjzBzW9bI3lzceFAiD7oGzNN+U4XAJ9XTlyDpPEKK4QY2p7Cpsxv
+GQlhQYhGBBARAgAGBQJJr/RDAAoJEFSD5ViXq9m5bgIAnRnOaaDmTlytG5b8QgzW
+42wV1/fpAJ0TYxsjDutR3TZPCiIgQmqFRtbe/ohzBBMRAgAzAhsDBgsJCAcDAgQV
+AggDBBYCAwECHgECF4AFAkgM7X0SGGhrcDovL3BncC5taXQuZWR1AAoJEMvcsgif
+UjQBiZgAnjvEBrSrlnAT/BhifOeixOgZFNJiAKCBXOoDcqR8aEs8RzIiAmnT8HLW
+XbkCDQRGbo9xEAgAuYxPTjdSA/+gUyISSua3CTo+aXsR6JFQYfrAJOmqW7W/yHKO
+/0RX6AODkDSDDsYhGuXliQ4k5IWlpbOtIVpJNGg0teoNv5zmfRXzgfDfSwVZCVHC
+U7Mllguh4oAh7+k4EYh9qsXe2cJRgtIrDUXdcaqZmlrIId+nuwb0A6285J7/x0Ju
+Y+IQokZQIZltV/p2Uu+EoaQgRjcdOj0Gj/rBWZvgQvBFVOjvLFmxzUTVQPyESJo1
+KWQaOQDsltcM90LHzPWrB6/5cFPGLwA2ZgoUcZ7ZKbmi9vxeXMfVLNgmoRBzu2Ub
+uuZvhMV66oY/5DZcn6jmFsP4M8s/Mvo+L+XmnwADBwgAgWfcH5QmmHuqX7wFTFRt
+ajZWjlnV63uNRk66RY0fP0DQKQS2BAjMGeFM8QEnjn5+HPftOHKLMs3EJtQH0H+P
+YSBO4qapLlsIszLp/Kww4+qfcAZZPkjmhSQzPBt1j4EaePs7hLMDAdfWOETH2/TZ
+OJQJGx+bZzBL0BMO7KbXBrEKznx68VdEnPG/UMNTDiG5j27Iv2eX9c5lg+uvrPm6
+l0qt8VUKDrF6wXzNe8AEyuV5pBk1A81tl6lrLf7ksrh0r5qRN6ezsHgpAhOcU1tx
+eWkrI/TF/2bc5b2wQQBb1rF2cCvVUTCnXu5/hdAOZAPezATJLacb2Ac5SBN9vEvo
+hohJBBgRAgAJBQJGbo9xAhsMAAoJEMvcsgifUjQBBcwAn0R4nCTsPSqPFdCUklBI
+ZT2x26g6AJ93cDVwOCKC36lWN9s0+D+xi9gx8ZkCDQRLAsMJARAA1h1cxLnlmQ59
+ff9rRH1W8306awBJxoE3OLj7bOL7z6A1XsPcE/fbGmameUF+hmmqrKklBDnOg55o
+r6u1/c6bXoEJZ8CbaQk01JaJ/L1q0qYfke7Dqfbe9MyB9PXPSVwszuTN0ThtjdYN
+fTByiiryoHsFYuCh05bVbsoWXHrqyiqhZ4SLzt7A5ume0n3x6WoWvdJlyyPNcIrU
+H1EFUwmcnDuI0MrUB79g0tRW9pzgzmJiVKoxUpNQSM35ko7UMLlIRHTGcql0bsNt
+x2bcLVyJ1Hy9//fwmz2/11Fxrd4ZdzAcytSTyHrEaSIJFxypDFDdfYiQOHTxcZPJ
+hUlPXgRmK5dUyNK4SzvATZfe5qobEsJI276P4NetLFnaMqVPEoNT2CC3Jvs1KbBP
+EnteU2cQuUmtCKkPMwaujz0S/B7i7/NUgghz3O60HfQSlm/fLqVjC8QsHbHE28A9
+qYd0Iw/Ivme80PHbq7lTa17RtxFfdob06CYa5ZTKPhfEBDSkH3VIowPTW9hGLRzc
+FJ4FESPqoEtZ1Exfqi/CsbBHjuPFuN8POANpMn1RF/6E0CHrhkwFiylkxqyByqKo
+QCl/xYp/oLl0gO1d2hTRmSTyhmSxq1X2s5o8BjRr/p81OJqDip0ctWBdktQ3TwCz
+8RyAv/J72DUnYNpN+3CM0nwX/avXeKkAEQEAAbQ+RG9uYWxkIFJheSBXb29kcyAo
+QXBhY2hlIGNvZGUgc2lnbmluZyBrZXkpIDxkd29vZHNAYXBhY2hlLm9yZz6JAjcE
+EwEKACEFAksCwwkCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQ+Om4xdAY
+5rHjkg/+N/IaCjit7Hflb0BgeKG65kCrdaq8UsRZC8vPgxRwNbsdwINPZar9sbfb
+wMr4Ts4pGQ+0b8OSu11kTgV/xY9SOIwJB4VI60Y+aglwnVP9lNVuu6RpEXIoeY9w
+wh1Y1B7jAji0w2KmOggURMRzVDXOm6dHoguXSc3nQ+uWqgnSRaX0m3uigHdQv2k+
+RJy1uJ3h1wJMj8tZpK91WU88ulJ3WTExZXlxbj74bq2OhV+l+7DiTMCX78FwVzWm
+Bc1aw5FTIedbZ7mJ/Onw7pnXY+8Jgda/IxWDTVDUk+2Y58Vk7F1xkZwHIBnjsSvE
+c7b1JLGRXROWhsNGlYkZjuK2D+sL0C7vJ4obVmTDTXUiD/7IFdBiTZXmf0E0SFYu
+ctRB7aLKbInEwmsXWUfZsNgMjV1ya4HGow+XpF9c7Q1gdoy3T9GHVjubKsgeg4Pi
+pqstrlU+BdTYcU3YNkD8W+wswILGPPlmH33ndDZG88SGDQoQcjv02yLrg18Q2Pb/
+/QezMhRYl3r9fqW0ibi7zzBBxZvmY1zJQfnkKiV313i+6hjCOTQl7j3wY7PZt8gw
+OE6fghf+7/HARSdLwTPzWgW1D4MK8na5tSIr+Alol7WTVExtrZvzllS7o+bq8nNT
+i/opJj0iJHYrnBWEMttrUq+VoLwA1IeWPNGqV1XmTfos0dnD7riIRgQQEQoABgUC
+SwLEmQAKCRDL3LIIn1I0AeSAAJwOZgrjRfrtbA+b0FKmq37pez6ybQCeNdcpcs3w
+ax67NfdUS9CYth6Aa/i5Ag0ESwLDCQEQAMIBc1b0kN4lKDrO5OpIRPc5flSFrETu
+HEDUmNDANHVbqhWJTHHK1N9YgvNHWLehCyvho0dbB8SrhwO0AZ8vZl0iU+B4hGci
+IqbPfwstRpZ/MShX5UO+XvVAKO/rPqFAVARNl8DTbkIwLneSR5CaxInrPxhzme6J
+n6HQUitGA5Pe6ULiU3RN/enyHPjMPjid+qEiv9EpyFBBvZw/2JN+/VECyqV9ideb
+B4ki5/7CYFVkglsClrGN+OuPDuAdIhWIcBe0duxX0sJm221koBIMbiZhQWR5Jz/n
+31bu0ETEhpit63YXwEZbYTrBy/tW0jBzLAseakqkvayUdpEYL1pXtlNj3cB034W/
+27sQtNLosA531lt8RwV1sBm+zdBeVtFpaPHWv0lLcXqJtRNgqYeFX/o23XdoZRtO
+zDnvrV/QT0vLqIehB36pcraxjqztEBVVjZLO4JiU7Mc9AP0clFh7cjlEyUJlhmP4
+kQ4/btNSOHYSnP4rAnupD7DqoKmbLqi/VAKUuFjku2AO56U6pGsJWa9tG0836ivq
+x4Pogxc5qHrZ0WbA1F9Ge2dDeefggAaOIYK/Dmg/P3HHpzdt3pPI0t7eYBFbhIuQ
+WmyUBN2w2mpzI75TrxIZ6MHbiGZeyFP/46qpHEkTZQxf7eK0MMye/25e3j1dl0p1
++7YS6M0uNjy1ABEBAAGJAh8EGAEKAAkFAksCwwkCGwwACgkQ+Om4xdAY5rHMug/+
+K+eogScOUON6ol/R7p7iyjYdm756ZCp+AQHNp8A4Axhk2lXJ6MGEnxzC1Y8/6haz
+UamiDecHN+P08gHh3aJPwJtepet8ICoyZoJSTa9bNcVEnZttl6VbqbAcbVMaFruA
+R5PBF/ulZyrNbJmMSQw+TJ2kVXDEduKSJ3T6Gt3jzPq5GeYHIcjiTgn3KvGmhWcg
+JAIU0jsjuJB6QeS3sZQ3nhMMKzFOS/Rzf6GTRSjBdv+X9ZEE7A0q0XawXTsSn+ch
+eRvU4rVKznFUEMmAhPQTPUQeZbqMJ3+U9B8S38eIvR1Zjvg5+kKmbNB1O5g8zTQD
+yN7UQ8bbOSgvDQWJa4EC52Lkc6GrT+fPjZ1UM76DPEloYMhyi5V2N6ZC+8eR90sr
+PK5zGL9/Kp/VYUTmbG1mOcLyMMTSRQd2Qlq+XWuudgWWFhRjqWlMTxz+KfcVibD0
+Y++4oHX6rzfJ7s6UDcju++A/CTZgwbmVWdslezhZM3gEunwUS0vJ1waNTIiIwZ57
+a57LtjMD1bYxNynqXJhjDMKiKoydES+MNRUytg3gCrhRq9NYicNem0hPSve71gf1
+gF4Wxqmnz6+E1o5Jc4iJbkRiYL7vAE2cEe45wijzcxRzPfAsxMjdxK07yThpZPUR
+xdQRY9zWqyeRlvgRajdTc7Z4PlpXxpo589TJFXZdWJE=
+=EEHK
-----END PGP PUBLIC KEY BLOCK-----

svn commit: r881352 - /openjpa/KEYS

2009-11-17T08:17:15Z

Author: dwoods
Date: Tue Nov 17 16:17:15 2009
New Revision: 881352

URL: http://svn.apache.org/viewvc?rev=881352&view=rev
Log:
master KEYS file for OpenJPA should be kept in svn under the projects main directory. importing existing one from /www/www.apache.org/dist/openjpa/

Added:
openjpa/KEYS (with props)

Added: openjpa/KEYS
URL: http://svn.apache.org/viewvc/openjpa/KEYS?rev=881352&view=auto
==============================================================================
--- openjpa/KEYS (added)
+++ openjpa/KEYS Tue Nov 17 16:17:15 2009
@@ -0,0 +1,200 @@
+This file contains the PGP keys of various developers.
+
+Users: pgp < KEYS
+ gpg --import KEYS
+Developers:
+ pgp -kxa <your name> and append it to this file.
+ (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+ (gpg --list-sigs <your name>
+ && gpg --armor --export <your name>) >> this file.
+
+
+pub 1024D/11A1AE9C 2006-10-19
+uid Marc Prud'hommeaux (CODE SIGNING KEY) <[hidden email]>
+sig 3 11A1AE9C 2006-10-19 Marc Prud'hommeaux (CODE SIGNING KEY) <[hidden email]>
+sub 2048g/4AA825C2 2006-10-19
+sig 11A1AE9C 2006-10-19 Marc Prud'hommeaux (CODE SIGNING KEY) <[hidden email]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2.2 (Darwin)
+
+mQGiBEU3/c0RBACKG8V5yDWw/9D2EB5zfhy94lEYu2tsp+qjcC5h+DRPr8Clkfht
+jWpHRcWmw8gxyYYo6fc8fH9vLljUvEQXmIHU88Qw6XUhGTsKFLsRT1rsN25+6KZG
+kH2gnnZUXK1+NSGbiNwlbrgpNHP30JjLH9ewX867hhp24PJ0ke+nlzScBwCgrxsc
+kmPXMyFrbbPYMaFO5MfT/R0D/R3o5lhV7mbu2jxKUMfngJYv7uT+IZ8lyquKdIcX
+kvwKKqmdPgSJQ9RhJeUYgAlKcZbQst7g2g+XktuotxwNdUdyTGKJA1ieZK7l89U/
+zNvQuCnZ9vSzirKydpRVd+ReMupVYooC12GYOl9gLCJg1WQXYdjoKaKF7u1PUsRp
+We3XA/9YRNq7alUTRTiS0LY1RfaQohprsLsF+pY+ZkB3A72CZWyWoxQG0uHL3ivq
+mGlGYKriKTed4DBRp2ZREsGwbWAknh/wP4Is42qH1RzWRB7xnQsrxYuPFSr4c35D
+AP9oFk2O4povTJ9Ay0QEnNRgncIoSuhEXQ0GRLETosmozqBOkLQ7TWFyYyBQcnVk
+J2hvbW1lYXV4IChDT0RFIFNJR05JTkcgS0VZKSA8bXBydWRob21AYXBhY2hlLm9y
+Zz6IYAQTEQIAIAUCRTf9zQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEPeU
+CvQRoa6ckGAAn131QtlLKvPdUh9NWYwgAsvN8FuSAJ9+8PTwxc4G4NhyNhYV0TcI
+2kuANrkCDQRFN/3gEAgAmyDZTIcdHNN76dLsEA9tj+chVf2iDBFisrpmYMV4CM0R
+tUD6GYhUDekKWaAs9PnTnqe+9b30NIEmORY6XktWD08GFwwp5loxlLuQlK66I29u
+y1dS6J6HdxcFWJlg4v1AnKdHexUSHUbxNrZQtU+N3kAMhsopZhV3QwSK6djMb2Lo
+SsNaSmpS+3L9siP8XwkxsPixOfXDTbKtFvb6p0idvetKPrulJnX+zJGupYa4KpkE
+G7CpiWgcSFlGU/AVv4xfIqFUX3EwoQefIX/Nw+mlz2fZD0GCfosgLlA2x3gol2ks
+77SgzzgH9acNF7xUoJTXHRZdz3Ue2CU2YSvCVBwV9wAFEQf+IXKZVdyjp+vAXSD2
+lZHDzRlcI97dnAlsQYVmQOdDJf+haC8KBvZwSEdsCB4Ng6P1aX0xDh2gXxAUzEzJ
+sjw4u7QvjKsx44SpC3wXsbJJdzwkM9nyneWul3DyyJ03YB0ReIuP/N5PZHLAKSIG
+/n29AK16TJI+ePJtBfMhsjmaHvTjcEHALhG5eN1AtmCKMX60lSu9KYJK01gaiWgb
+0lo9MyH4S7TqQHOqSUxF20Q/0fsN3ckkkelVy72vfB3lSbzQyZLrVCwqg10rjxQg
+yjHi+tXM8R/gJaP5zRf5v1X0/kjAI2zo99l7eox4mgdfvpOojSBYJMn+097UVHW+
+n0/ldohJBBgRAgAJBQJFN/3gAhsMAAoJEPeUCvQRoa6cu8oAoKzP/7i+YnyHHIpW
+bZySWmV5ruNBAKCRPW44mWffxSsJ6oUeUSzvbsCwew==
+=XKWe
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub 1024D/7E3BEB2D 2007-04-10
+uid Michael Dick (code signing key) <[hidden email]>
+sig 3 7E3BEB2D 2007-04-10 Michael Dick (code signing key) <[hidden email]>
+sub 2048g/4723001B 2007-04-10
+sig 7E3BEB2D 2007-04-10 Michael Dick (code signing key) <[hidden email]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+mQGiBEYbzvMRBADOdBR6syAa0Onaa81+BmixZekvKQ+bf/jK0/sYP6ZwuECGVHOY
+omAKgSphzW9XCeTnWceKcrwC5sBrCponH47/UqGFwc9Mm64vK0lWuF9TCn96N2fJ
+kgv3NT7aDav9HcTguMW1aqkdvgc7nvdL7Z2HqhBPT2MlYWWz+pg7RWOrbwCghOLH
+9STCo3324KWWTqK86zbxTQsD/2APs+2jJD73oxsLWq3uCJ42jOHHD3/TBYfZvyzE
+no/VBcicg3O+LpaGBdd+qWIBQk4icttAyzS/tdy1r6eY8d9vGhksRU+sSXslUHAR
+WG3tkAbc5SYPZu3kRJv0eJVpBoACCkZLJ3Io8uAVSb8F89dNefbroANBkOYONK3v
+jef8A/wKagcMKWbG5awezkPfNSP6MmPSTTNbJ3EUXpsXnjq5GNd0MLQgnQ01cHwz
+Fg9UZGFAUNZ+oHKYO+jeeXxWmeJ36pXN84ND38mGbsda+4s48mG8JU+dP01bdeaO
+U510xkcOoxQRMPq9H/FB/iiQv36BuISttpoAL5d7F98tM2mlZrQzTWljaGFlbCBE
+aWNrIChjb2RlIHNpZ25pbmcga2V5KSA8bWlrZWRkQGFwYWNoZS5vcmc+iGAEExEC
+ACAFAkYbzvMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCZ1Q5efjvrLaAp
+AJ9nJrepgHFtBPVLpmKpV7FkJ209UACePBoWqFE1PH/QgvHpy0zPAz6B5du5Ag0E
+RhvPDhAIAPmeO+O/dTSaSFpBkdmRd0YmURe0OmQZOaoPrDkIlitLA4b6v3Zb1Fz9
+pNMkVTt0JkxsGoiKoseEc4b8Lo1ljGWIYTGWHooyViPyVfb4nmkwl5xeSzvG2aq2
+U1HOuft+h5r5GUqCXjfrYRIAxfNkMs4kkCYlCrbgKoL+ftDdftDV16XZxoD23/33
+eN+Nade1fN6Dp9OGiYHV+ZmJ1KDzgY27slL9p2XdDMaesL/JUPHOoyZpPd2ncBsv
+F1Rv+IbLc9r654LUoLK5IDZvXZyGl2SXXTrov+aWzQ2YL3/Js9heG6x19nHbwxw3
+7HW5gxwxKtKyaMG1rpHth0SQTx+W3OcABRMIAL1kchiSI9qiOJsp5QmR02OLtuD3
+aS5V/EdayIxya+RinlDeo1o+qd5tF3C6dI2MxmzSgf1FiFOtVY/gvg7Zai5RYvqc
+xW013uNKTjUmBRMjXCwsCtmLEJqBUNQCvA00abLA+C85EGbffV2b6IkOL+nLWtxQ
+3BaW4uOu6EVpVNQRoBWdYP7TZr6gyvIipXEwjiVG5IGooOeX6D0QJYtCVseRg70K
+MqS+b3YS2u7omkMZ/wDDbYgsIFTea+RhNmerZ10Tj46FdwVqAAGucP3VVHWjdkoK
+n+ZsBNqPLSWVrT9Bo4iKaApOtOMoX1570t7v6Vs3zUcGehADHugJSaYbuDaISQQY
+EQIACQUCRhvPDgIbDAAKCRCZ1Q5efjvrLS39AJ9Ot0NV0G/rCZfI5iy8DMsX1ts3
+dwCfZLOmgPCq4KhHIjLZ4n2aVfvGO9M=
+=ln1C
+-----END PGP PUBLIC KEY BLOCK-----
+pub 1024D/513CA0DC 2007-07-28
+uid Patrick Linskey (CODE SIGNING KEY) <[hidden email]>
+sig 3 513CA0DC 2007-07-28 Patrick Linskey (CODE SIGNING KEY) <[hidden email]>
+sub 2048g/F415B175 2007-07-28
+sig 513CA0DC 2007-07-28 Patrick Linskey (CODE SIGNING KEY) <[hidden email]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBEaroEIRBADEhY69nIpzngZxJRcBUSxWc92wZIWx0O8cE8VsOXXBP+I7gUCb
+GDUx2oIFHNb1mVO+1ISXNU2fH50GNgorFoQ6VAuvsKiw7xQTPIzs+ZXmkzZ9rjXa
+5KtC+MOBo1QJBxTVxqluSi2G3X0fs4CSJU12RiQHoe3PZgM8s8di93XS1wCg9mNP
+3+zrZvWL/N3o3ecB7H6foaMD/AnndPEsPOyh0csu+EPHP4Iw5tIf6peBpBWLcgel
+EZ+jP5EtO0Kov2PjHDzw1mOjAGSybh2mRXYx95PXAwg/4Jscj+UH3fYh9w0ZZyCh
+sW+ERGxXu0ZwQMAkZ6fM8J2qQaCc597l4WrKd/8xUiKlMEivPcZOt9QN7lAmTgP6
+OKwbA/9tM8KEB5QUIZT2vNEwSa8RVT1YK1iluz4D9SdvrjQDSWpkqRowr61DZoev
+LM7aEH0jrt5rJGFuHvfB+zgoukpIka9WUhatkR+8HACguKxQO6SP714UlblGiHc6
+21RaEmzIK4DgaX2IwBFTzF++SoMawXfODAyLuGfWaazJ4f5qnbQzUGF0cmljayBM
+aW5za2V5IChDT0RFIFNJR05JTkcgS0VZKSA8cGNsQGFwYWNoZS5vcmc+iGAEExEC
+ACAFAkaroEICGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDculJDUTyg3Mrz
+AJ4o9v0Xs66N1sEUYYBF+kkmPY0LAACbBNIVayGj9aqjBP8895faHLPW9d+5Ag0E
+RqugRhAIAJcFwugucCHivvhiB/f3lQqjmfv2Zif05U0CdXE8xs9ePFqL9sORHkR2
+KoRFmlA+c83VAEYKInm4IaZ6/+ENrdgE6V73+T2LOrcZDg0qLukZuFfVVYKxLlvS
+5bnmjf6ET0leiV5HiXUu6kZvAKP2qq6bQXHTiV8gdrA2zc0WGkiqWsKzqZ7SL8tw
+ZLFVXVpVDIV1a4xkcO+Ogs8H8Lk6XM4WdtPybNqcE+mAOk6CQgNejPJSW6hIRpbx
+QOzDFId942cS2l9cOo96TFAsogs7sl3EPSp3toTrUOhhtoG8hf0/yLP7BWXhcsz5
+KFPgT+qaAX+1NzOCENoGNcwWgXiPztcAAwUH+QHlMptL0hnvvGvfDxmz/Ursp5oP
+Uv8idmLI8+yRGPICZlECYgaTZ96XRhMCySWu9Gs+arNKXdZq6XPTkeAjCqhdYIiP
+Jmu51XRBoVG2/QehbJXqt2za0tx404JKwDojE1NMAlR/Bfa2ZIczuaYQQzj26L8l
+ugcUiEonOLZRNsH1bXgZkwSoINwNkdXbZNo4i/2mRmU7YEj6dg6h4dDM2JpOBYeZ
+SUfOqAHOlzOFYWL6QurNvPByLOEye8kJnrRJ8D2IeilG/QkrN8hBvEUUKulqKL8w
+XOuuz514n8RE5ym4PE4m9YtTELHCamKcYXZ4tdWNsAAd6NtSe/lhc0VNU5yISAQY
+EQIACQUCRqugRgIbDAAKCRDculJDUTyg3HQ5AJ9G86jVI5cR9wKlWuXeqgHv74gu
+zwCYzWvTu68DcikBbCKCeF1p9nEilQ==
+=ndnw
+-----END PGP PUBLIC KEY BLOCK-----
+pub 1024D/8007117F 2007-11-05
+uid Albert Lee (CODE SIGNING KEY) <[hidden email]>
+sig 3 8007117F 2007-11-05 Albert Lee (CODE SIGNING KEY) <[hidden email]>
+sub 2048g/8D910F8A 2007-11-05
+sig 8007117F 2007-11-05 Albert Lee (CODE SIGNING KEY) <[hidden email]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (MingW32)
+
+mQGiBEcvUloRBADjBd7xVUNVho5vDtchE7mx1dmVqao9MAE5tty4yifnuV1ORMvN
+GakfqFmmmvK1bllGNVUVh3oJje9tlUpI3UP7CNLDqV2nO0jFW84XWiaMmjVeV4wm
+Nv8Qk5qyEkBIiea9aAOSyRRK/hkB3nNNl5E1k2OuA2zSAdCqkAQn6wjMwwCghnso
+PJuLKZ9/eW9FD50GraluLTEEAJ80uTJpL1iPy6JGjmRVJ3iwVdSVpK1YZTu3tnTE
++UUfzom4LXeNSXTzGhv1bYmsLgLm1dVZoQow6qY6zJgeLv4CckRrez+V6QbJi1zW
+b/OV5M9Ot/KPyGSExbbpmy+a8+8KHcA9EGLUOrY88HeUzmj1ofYtp83g0TQn462A
+sEbzA/45Zn5rMy8sEDDMr7ga4WrDETGnJHz04U9lE07IE/5xdZ32gMjqbWEnDHFM
+W4dl90RoKrk349VtdA0Aq2HePASI5or2JeP6Yicg6/yRM7Q14J/x471u3+hFksuK
+E5bHsm6P4zyKrpCBumTA/w+om62msoeybLuzcwxJlsdmyqElnbQ0QWxiZXJ0IExl
+ZSAoQ09ERSBTSUdOSU5HIEtFWSkgPGFsbGVlODI4NUBhcGFjaGUub3JnPohgBBMR
+AgAgBQJHL1JaAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCoEHqYAHEX+H
+eACeLGSeb5ih11wEVXg40SV+hM30iusAni9YN3uP9+DldOwQ5ke5qr8Y4nsPuQIN
+BEcvUloQCAD4YSzc7rp1i3Phox3fV9rT5NTbGtcbVVPB36Jkpqz7LXcRbFnLcc1z
+PVqO4g2Mr9DaVSjTJLm3I9RFM3uGs4hutvbm5XRww6U89Vs3Dw6plzQ2vTSRLkFT
+1UQdo8r8jbWWWbg7gzgWLxvKeCEoJUVW7/MiDqGM94XyCB3G35vCts4i4Y7HaeGM
+0wB0lJTxidLiEfXo5E5RJInNHuB77FsxTzdy53sDWAoPzRIMLGIcvF2yqYpr0mu/
+/y0Miri6AGckEWvFuQuCbLWUdt45ARBVjUZr6A4L+TPbZnkA9envBZFIp0O8t6LC
+GkrzmdzvUNw8sKDO+CKaomdskXFHzL97AAMFCADA1UroWd2hp28o30a+YUuPZJN4
+2q+9C1hIwfmXutuHzI41UKErrTgd67J02fFLN63bxwkcou9/xO+XxMWpKJjZW+cH
+1pfC9r2mClleNE3O+5q3VGoLzTmlstVt/3ufrxv5wrZtbSgUVQ401BlfWQy3McmQ
+dCY//95ALG2exmFuMTs3Agsq8CgCNeCUzCawbYZWITrWtraHbuRdboLklbFWNNXC
+An25ce3fK7DXTydZhUO3mDK9oT0hbUS19qs6nFv0bwtH0elebXJbbWUnuUtNyNit
+SBB/5fRfAWISeDdRk32n9QkkATqnEBtS5dH0HgoEMCC7P5aSM3kPZoFj5X+siEkE
+GBECAAkFAkcvUloCGwwACgkQCoEHqYAHEX9y3wCdHN7Zfm6G2dTAwpivV1epOWaV
+5CQAn1YB0pFmtxGhR8aZ5Bi3Kkxa9m75
+=Z9If
+-----END PGP PUBLIC KEY BLOCK-----
+pub 1024D/9F523401 2007-06-12
+ Key fingerprint = 677C FCD1 9C6F 64F9 4DD5 D33B CBDC B208 9F52 3401
+uid Donald Woods <[hidden email]>
+sig 3 9F523401 2007-06-12 Donald Woods <[hidden email]>
+sub 2048g/CCF1AD51 2007-06-12
+sig 9F523401 2007-06-12 Donald Woods <[hidden email]>
+
+pub 1024D/9F523401 2007-06-12
+uid Donald Woods <[hidden email]>
+sig 3 9F523401 2007-06-12 Donald Woods <[hidden email]>
+sub 2048g/CCF1AD51 2007-06-12
+sig 9F523401 2007-06-12 Donald Woods <[hidden email]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+mQGiBEZujvERBACXWZuHFBP3vVBD/obpZQcf4/D7JTaRUkH/YkT9pP+zuyATPcU/
+HYbr8WFOI57HQHXIyC6qfjLWLmKJklGUjIaAGxLo7/V97kPLvPIkWMm/Hl1MFoNT
+lK2w+eyMUNdh67Bb94x0wonAFkjgfcSeiJu2Om4W3eGbbVCdsgLZGzAalwCghxzl
+In2wGCpWFnv1ZQH3WgQ7m78D/junhFjfasBRBbzd7CKa2fqrf3sje4VQV9Q+ds5W
+IDT8nn7PeN8NRDqqWKvw6Ob86hrPU03MEuRTg9A/+QDk9BWZTuyrps5lQWd6aQ9Z
+AEQGnp/1wsIeBqdxYLn9pMw6aMCAGswM37XcFqZXdFKaQaof/Te0NQ5yyzQZ62gy
+sXLoA/wM8v/b1SPL4QlitOe3FRTaZa4/DuFUtYVcP2LvIJeHGpNDgpLrNpVvxy0C
+w/OXgJhuyDa4qbQ/8Hx0+D7RHYULCflvHCmwg4y0GHq6DO1LrOmpAA6G/kVUHISv
+4C8v06yT+kxI7Z2aKgotylquM7571i+m8+0RvyjwRUBCqFs8FrQgRG9uYWxkIFdv
+b2RzIDxkd29vZHNAYXBhY2hlLm9yZz6IYAQTEQIAIAUCRm6O8QIbAwYLCQgHAwIE
+FQIIAwQWAgMBAh4BAheAAAoJEMvcsgifUjQBy18An3WdDIYa6NlX7Ywn8Pdko+EB
+SU/xAJ47OViBHzoS4enm4wUUqFNLgEWNGLkCDQRGbo9xEAgAuYxPTjdSA/+gUyIS
+Sua3CTo+aXsR6JFQYfrAJOmqW7W/yHKO/0RX6AODkDSDDsYhGuXliQ4k5IWlpbOt
+IVpJNGg0teoNv5zmfRXzgfDfSwVZCVHCU7Mllguh4oAh7+k4EYh9qsXe2cJRgtIr
+DUXdcaqZmlrIId+nuwb0A6285J7/x0JuY+IQokZQIZltV/p2Uu+EoaQgRjcdOj0G
+j/rBWZvgQvBFVOjvLFmxzUTVQPyESJo1KWQaOQDsltcM90LHzPWrB6/5cFPGLwA2
+ZgoUcZ7ZKbmi9vxeXMfVLNgmoRBzu2UbuuZvhMV66oY/5DZcn6jmFsP4M8s/Mvo+
+L+XmnwADBwgAgWfcH5QmmHuqX7wFTFRtajZWjlnV63uNRk66RY0fP0DQKQS2BAjM
+GeFM8QEnjn5+HPftOHKLMs3EJtQH0H+PYSBO4qapLlsIszLp/Kww4+qfcAZZPkjm
+hSQzPBt1j4EaePs7hLMDAdfWOETH2/TZOJQJGx+bZzBL0BMO7KbXBrEKznx68VdE
+nPG/UMNTDiG5j27Iv2eX9c5lg+uvrPm6l0qt8VUKDrF6wXzNe8AEyuV5pBk1A81t
+l6lrLf7ksrh0r5qRN6ezsHgpAhOcU1txeWkrI/TF/2bc5b2wQQBb1rF2cCvVUTCn
+Xu5/hdAOZAPezATJLacb2Ac5SBN9vEvohohJBBgRAgAJBQJGbo9xAhsMAAoJEMvc
+sgifUjQBBcwAn0R4nCTsPSqPFdCUklBIZT2x26g6AJ93cDVwOCKC36lWN9s0+D+x
+i9gx8Q==
+=QdBu
+-----END PGP PUBLIC KEY BLOCK-----
+

Propchange: openjpa/KEYS
------------------------------------------------------------------------------
svn:eol-style = native

svn commit: r881011 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

2009-11-16T14:23:09Z

Author: ppoddar
Date: Mon Nov 16 22:23:09 2009
New Revision: 881011

URL: http://svn.apache.org/viewvc?rev=881011&view=rev
Log:
OPENJPA-1381: Ignore preapared query if lock mode changes

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java?rev=881011&r1=881010&r2=881011&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java Mon Nov 16 22:23:09 2009
@@ -751,8 +751,11 @@
em.getTransaction().begin();
Query q2 = em.createQuery(jpql);
assertEquals(QueryLanguages.LANG_PREPARED_SQL, OpenJPAPersistence.cast(q2).getLanguage());
+ LockModeType lmode1 = q2.getLockMode();
q2.setLockMode(LockModeType.OPTIMISTIC);
+ LockModeType lmode2 = q2.getLockMode();
assertEquals(JPQLParser.LANG_JPQL, OpenJPAPersistence.cast(q2).getLanguage());
+ assertFalse(lmode1.equals(lmode2));
List<Author> authors2 = q2.getResultList();
em.getTransaction().rollback();
}

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=881011&r1=881010&r2=881011&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java Mon Nov 16 22:23:09 2009
@@ -77,7 +77,6 @@
@SuppressWarnings("serial")
public class QueryImpl<X> implements OpenJPAQuerySPI<X>, Serializable {

- private static final Object[] EMPTY_ARRAY = new Object[0];
private static final Localizer _loc = Localizer.forPackage(QueryImpl.class);

private DelegatingQuery _query;
@@ -86,7 +85,6 @@

private Map<Parameter<?>, Object> _boundParams;
private Map<Object, Parameter<?>> _declaredParams;
- private Class<?> _paramKeyType;
private String _id;
private transient ReentrantLock _lock = null;
private final HintHandler _hintHandler;
@@ -377,7 +375,11 @@
*/
void assertJPQLOrCriteriaQuery() {
String language = getLanguage();
- if (!(JPQLParser.LANG_JPQL.equals(language) || CriteriaBuilderImpl.LANG_CRITERIA.equals(language))) {
+ if (JPQLParser.LANG_JPQL.equals(language)
+ || QueryLanguages.LANG_PREPARED_SQL.equals(language)
+ || CriteriaBuilderImpl.LANG_CRITERIA.equals(language)) {
+ return;
+ } else {
throw new IllegalStateException(_loc.get("not-jpql-or-criteria-query").getMessage());
}
}

Pinaki

svn commit: r880980 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: meta/MappingDefaultsImpl.java schema/NameSet.java

2009-11-16T13:50:01Z

Author: ppoddar
Date: Mon Nov 16 21:49:59 2009
New Revision: 880980

URL: http://svn.apache.org/viewvc?rev=880980&view=rev
Log:
OPENJPA-1051

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java?rev=880980&r1=880979&r2=880980&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java Mon Nov 16 21:49:59 2009
@@ -539,9 +539,7 @@
else if (_dsIdName != null)
cols[i].setName(_dsIdName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
}

/**
@@ -553,7 +551,9 @@
String name = col.getName();
if (_removeHungarianNotation)
name = removeHungarianNotation(name);
- col.setName(dict.getValidColumnName(name, table));
+ String correctedName = dict.getValidColumnName(name, table);
+ col.setName(correctedName);
+ table.addCorrectedColumnName(correctedName, true);
}
}

@@ -584,9 +584,7 @@
} else if (_versName != null)
cols[i].setName(_versName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
}

public void populateColumns(Discriminator disc, Table table,
@@ -597,9 +595,7 @@
else if (_discName != null)
cols[i].setName(_discName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
}

public void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
@@ -624,11 +620,8 @@

public void populateColumns(ValueMapping vm, String name, Table table,
Column[] cols) {
- for (int i = 0; i < cols.length; i++) {
+ for (int i = 0; i < cols.length; i++)
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
- }
- table.resetSubColumns();
}

public boolean populateOrderColumns(FieldMapping fm, Table table,
@@ -639,9 +632,7 @@
else if (_orderName != null)
cols[i].setName(_orderName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
return _orderLists && (JavaTypes.ARRAY == fm.getTypeCode()
|| List.class.isAssignableFrom(fm.getType()));
}
@@ -654,9 +645,7 @@
else if (_nullIndName != null)
cols[i].setName(_nullIndName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
return _addNullInd;
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java?rev=880980&r1=880979&r2=880980&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java Mon Nov 16 21:49:59 2009
@@ -39,17 +39,13 @@

private Set _names = null;

- // an additional names Set for checking name duplication
- private Set _subNames = null;
-
/**
* Return true if the given name is in use already.
*/
public boolean isNameTaken(String name) {
if (name == null)
return true;
- return (_names != null && _names.contains(name.toUpperCase())) ||
- (_subNames != null && _subNames.contains(name.toUpperCase()));
+ return _names != null && _names.contains(name.toUpperCase());
}

/**
@@ -81,20 +77,4 @@
if (name != null && _names != null)
_names.remove(name.toUpperCase());
}
-
- /**
- * Attempt to add the given name to the set.
- *
- * @param name the name to add
- */
- protected void addSubName(String name) {
- if (_subNames == null) {
- _subNames = new HashSet();
- }
- _subNames.add(name.toUpperCase());
- }
-
- protected void resetSubNames() {
- _subNames = null;
- }
}

Pinaki

svn commit: r880972 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java

2009-11-16T13:41:55Z

Author: ppoddar
Date: Mon Nov 16 21:41:55 2009
New Revision: 880972

URL: http://svn.apache.org/viewvc?rev=880972&view=rev
Log:
OPENJPA-1051: Simplify check for uniqueness of column names. Patch contributed by Ravi Palacherla.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java?rev=880972&r1=880971&r2=880972&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java Mon Nov 16 21:41:55 2009
@@ -376,6 +376,13 @@
return col;
}

+ /**
+ * Add a name to this NameSet
+ */
+ public void addCorrectedColumnName(String name, boolean validate) {
+ addName(name, validate);
+ }
+

/**
* Remove the given column from the table.
@@ -816,15 +823,4 @@
public void setColNumber(int colNum) {
_colNum = colNum;
}
-
- /**
- * Add a column to the subNames set to avoid naming conflict.
- */
- public void addSubColumn(String name) {
- addSubName(name);
- }
-
- public void resetSubColumns() {
- resetSubNames();
- }
}

Pinaki

svn commit: r880929 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: meta/MappingDefaultsImpl.java schema/SchemaGroup.java

2009-11-16T11:45:41Z

Author: ppoddar
Date: Mon Nov 16 19:45:40 2009
New Revision: 880929

URL: http://svn.apache.org/viewvc?rev=880929&view=rev
Log:
TeamCity commits left two files behind

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java?rev=880929&r1=880928&r2=880929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java Mon Nov 16 19:45:40 2009
@@ -539,7 +539,9 @@
else if (_dsIdName != null)
cols[i].setName(_dsIdName + i);
correctName(table, cols[i]);
+ table.addSubColumn(cols[i].getName());
}
+ table.resetSubColumns();
}

/**
@@ -551,9 +553,7 @@
String name = col.getName();
if (_removeHungarianNotation)
name = removeHungarianNotation(name);
- String correctedName = dict.getValidColumnName(name, table);
- col.setName(correctedName);
- table.addCorrectedColumnName(correctedName, true);
+ col.setName(dict.getValidColumnName(name, table));
}
}

@@ -584,7 +584,9 @@
} else if (_versName != null)
cols[i].setName(_versName + i);
correctName(table, cols[i]);
+ table.addSubColumn(cols[i].getName());
}
+ table.resetSubColumns();
}

public void populateColumns(Discriminator disc, Table table,
@@ -595,7 +597,9 @@
else if (_discName != null)
cols[i].setName(_discName + i);
correctName(table, cols[i]);
+ table.addSubColumn(cols[i].getName());
}
+ table.resetSubColumns();
}

public void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
@@ -620,8 +624,11 @@

public void populateColumns(ValueMapping vm, String name, Table table,
Column[] cols) {
- for (int i = 0; i < cols.length; i++)
+ for (int i = 0; i < cols.length; i++) {
correctName(table, cols[i]);
+ table.addSubColumn(cols[i].getName());
+ }
+ table.resetSubColumns();
}

public boolean populateOrderColumns(FieldMapping fm, Table table,
@@ -632,7 +639,9 @@
else if (_orderName != null)
cols[i].setName(_orderName + i);
correctName(table, cols[i]);
+ table.addSubColumn(cols[i].getName());
}
+ table.resetSubColumns();
return _orderLists && (JavaTypes.ARRAY == fm.getTypeCode()
|| List.class.isAssignableFrom(fm.getType()));
}
@@ -645,7 +654,9 @@
else if (_nullIndName != null)
cols[i].setName(_nullIndName + i);
correctName(table, cols[i]);
+ table.addSubColumn(cols[i].getName());
}
+ table.resetSubColumns();
return _addNullInd;
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java?rev=880929&r1=880928&r2=880929&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java Mon Nov 16 19:45:40 2009
@@ -144,7 +144,7 @@
tab.importIndex(idxs[j]);
unqs = tables[i].getUniques();
for (int j = 0; j < unqs.length; j++)
- tab.importUnique(unqs[j], null);
+ tab.importUnique(unqs[j]);
}
return copy;
}

Pinaki

svn commit: r880922 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ openjpa-jdbc/src/main/java/org/apach...

2009-11-16T11:34:13Z

Author: ppoddar
Date: Mon Nov 16 19:34:11 2009
New Revision: 880922

URL: http://svn.apache.org/viewvc?rev=880922&view=rev
Log:
OPENJPA-1387: Revert unique colum related changes to before 880685 plus other changes after that related to OPENJPA-1051 and OPENJPA-1381.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java Mon Nov 16 19:34:11 2009
@@ -260,7 +260,7 @@
// importTable() does not import unique constraints
Unique[] uniques = _pkColumn.getTable().getUniques();
for (Unique u : uniques) {
- copy.importUnique(u, _conf.getDBDictionaryInstance());
+ copy.importUnique(u);
}
// we need to reset the table name in the column with the
// fully qualified name for matching the table name from the

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java Mon Nov 16 19:34:11 2009
@@ -46,7 +46,6 @@
import org.apache.openjpa.jdbc.schema.SchemaSerializer;
import org.apache.openjpa.jdbc.schema.SchemaTool;
import org.apache.openjpa.jdbc.schema.Table;
-import org.apache.openjpa.jdbc.schema.Unique;
import org.apache.openjpa.jdbc.schema.XMLSchemaSerializer;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.kernel.Seq;
@@ -754,7 +753,6 @@
Schema[] schemas = _schema.getSchemas();
Table[] tables;
Column[] cols;
- Unique[] unqs;
for (int i = 0; i < schemas.length; i++) {
tables = schemas[i].getTables();
for (int j = 0; j < tables.length; j++) {
@@ -763,17 +761,8 @@

tables[j].getPrimaryKey().setLogical(false);
cols = tables[j].getPrimaryKey().getColumns();
- for (int k = 0; k < cols.length; k++) {
+ for (int k = 0; k < cols.length; k++)
cols[k].setNotNull(true);
- }
- unqs = tables[j].getUniques();
- if (!_dict.supportsNullUniqueConlumn) {
- for (Unique u : unqs) {
- for (Column c : u.getColumns()) {
- c.setNotNull(true);
- }
- }
- }
}
}
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java Mon Nov 16 19:34:11 2009
@@ -24,7 +24,6 @@
*
* @author Abe White
*/
-@SuppressWarnings("serial")
public abstract class Constraint
extends ReferenceCounter {

@@ -181,6 +180,9 @@
public String toString() {
if (getName() != null)
return getName();
- return "<" + getClass().getSimpleName().toLowerCase() + ">";
+
+ String name = getClass().getName();
+ name = name.substring(name.lastIndexOf('.') + 1);
+ return "<" + name.toLowerCase() + ">";
}
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java Mon Nov 16 19:34:11 2009
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;

+import org.apache.commons.lang.ObjectUtils;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.util.InvalidStateException;

@@ -31,13 +32,13 @@
*
* @author Abe White
*/
-@SuppressWarnings("serial")
public abstract class LocalConstraint
extends Constraint {

- private static final Localizer _loc = Localizer.forPackage(LocalConstraint.class);
+ private static final Localizer _loc = Localizer.forPackage
+ (LocalConstraint.class);

- private List<Column> _colList = null;
+ private List _colList = null;
private Column[] _cols = null;

/**
@@ -98,7 +99,7 @@
col == null ? null : getTable()));

if (_colList == null)
- _colList = new ArrayList<Column>(3);
+ _colList = new ArrayList(3);
else if (_colList.contains(col))
return;

@@ -123,7 +124,7 @@
}

/**
- * Return true if this constraint includes the given column.
+ * Return true if the pk includes the given column.
*/
public boolean containsColumn(Column col) {
if (col == null || _colList == null)
@@ -132,7 +133,7 @@
}

/**
- * Reference all columns in this constraint.
+ * Ref all columns in this constraint.
*/
public void refColumns() {
Column[] cols = getColumns();
@@ -141,7 +142,7 @@
}

/**
- * Dereference all columns in this constraint.
+ * Deref all columns in this constraint.
*/
public void derefColumns() {
Column[] cols = getColumns();

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java Mon Nov 16 19:34:11 2009
@@ -39,13 +39,17 @@

private Set _names = null;

+ // an additional names Set for checking name duplication
+ private Set _subNames = null;
+
/**
* Return true if the given name is in use already.
*/
public boolean isNameTaken(String name) {
if (name == null)
return true;
- return _names != null && _names.contains(name.toUpperCase());
+ return (_names != null && _names.contains(name.toUpperCase())) ||
+ (_subNames != null && _subNames.contains(name.toUpperCase()));
}

/**
@@ -77,4 +81,20 @@
if (name != null && _names != null)
_names.remove(name.toUpperCase());
}
+
+ /**
+ * Attempt to add the given name to the set.
+ *
+ * @param name the name to add
+ */
+ protected void addSubName(String name) {
+ if (_subNames == null) {
+ _subNames = new HashSet();
+ }
+ _subNames.add(name.toUpperCase());
+ }
+
+ protected void resetSubNames() {
+ _subNames = null;
+ }
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java Mon Nov 16 19:34:11 2009
@@ -590,7 +590,7 @@
if (dbTable == null)
continue;
for (int k = 0; k < uniques.length; k++) {
- dbTable.importUnique(uniques[k], _dict);
+ dbTable.importUnique(uniques[k]);
}
}
}
@@ -957,11 +957,7 @@
*/
public boolean createTable(Table table)
throws SQLException {
- try {
- return executeSQL(_dict.getCreateTableSQL(table));
- } catch (SQLException e) {
- return false;
- }
+ return executeSQL(_dict.getCreateTableSQL(table));
}

/**

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java Mon Nov 16 19:34:11 2009
@@ -376,13 +376,6 @@
return col;
}

- /**
- * Add a name to this NameSet
- */
- public void addCorrectedColumnName(String name, boolean validate) {
- addName(name, validate);
- }
-

/**
* Remove the given column from the table.
@@ -737,7 +730,7 @@
/**
* Import a constraint; column names must match columns of this table.
*/
- public Unique importUnique(Unique unq, DBDictionary dict) {
+ public Unique importUnique(Unique unq) {
if (unq == null)
return null;

@@ -747,10 +740,6 @@
Column[] cols = unq.getColumns();
for (int i = 0; i < cols.length; i++)
copy.addColumn(getColumn(cols[i].getName()));
- if (dict != null && !dict.supportsNullUniqueConlumn) {
- for (Column col : copy.getColumns())
- col.setNotNull(true);
- }
return copy;
}

@@ -827,4 +816,15 @@
public void setColNumber(int colNum) {
_colNum = colNum;
}
+
+ /**
+ * Add a column to the subNames set to avoid naming conflict.
+ */
+ public void addSubColumn(String name) {
+ addSubName(name);
+ }
+
+ public void resetSubColumns() {
+ resetSubNames();
+ }
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java Mon Nov 16 19:34:11 2009
@@ -24,7 +24,6 @@
* @author Abe White
* @author Pinaki Poddar
*/
-@SuppressWarnings("serial")
public class Unique
extends LocalConstraint {

@@ -47,7 +46,26 @@
}

/**
- * Return true if the structure of this constraint matches that of
+ * Adds the given column.
+ * The added column is set to non-nullable because a unique constraint
+ * on the database requires that its constituent columns are NOT NULL.
+ * @see Column#setNotNull(boolean)
+ */
+ public void addColumn(Column col) {
+ super.addColumn(col);
+ col.setNotNull(true);
+ }
+
+ /**
+ * Set the name of the constraint. This method cannot be called if the
+ * constraint already belongs to a table.
+ */
+ public void setName(String name) {
+ super.setName(name);
+ }
+
+ /**
+ * Return true if the structure of this primary key matches that of
* the given one (same table, same columns).
*/
public boolean equalsUnique(Unique unq) {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java Mon Nov 16 19:34:11 2009
@@ -69,8 +69,6 @@
// the equivalent "X JOIN Y ON 1 = 1"
crossJoinClause = "JOIN";
requiresConditionForCrossJoin = true;
-
- supportsNullUniqueConlumn = false;
}

public void indexOf(SQLBuffer buf, FilterValue str, FilterValue find,

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Mon Nov 16 19:34:11 2009
@@ -187,7 +187,6 @@
public boolean supportsRestrictDeleteAction = true;
public boolean supportsCascadeDeleteAction = true;
public boolean supportsNullDeleteAction = true;
- public boolean supportsNullUniqueConlumn = true;
public boolean supportsDefaultDeleteAction = true;
public boolean supportsRestrictUpdateAction = true;
public boolean supportsCascadeUpdateAction = true;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java Mon Nov 16 19:34:11 2009
@@ -751,7 +751,6 @@
em.getTransaction().begin();
Query q2 = em.createQuery(jpql);
assertEquals(QueryLanguages.LANG_PREPARED_SQL, OpenJPAPersistence.cast(q2).getLanguage());
- q2.getLockMode();
q2.setLockMode(LockModeType.OPTIMISTIC);
assertEquals(JPQLParser.LANG_JPQL, OpenJPAPersistence.cast(q2).getLanguage());
List<Author> authors2 = q2.getResultList();

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=880922&r1=880921&r2=880922&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java Mon Nov 16 19:34:11 2009
@@ -377,12 +377,9 @@
*/
void assertJPQLOrCriteriaQuery() {
String language = getLanguage();
- if (JPQLParser.LANG_JPQL.equals(language)
- || QueryLanguages.LANG_PREPARED_SQL.equals(language)
- || CriteriaBuilderImpl.LANG_CRITERIA.equals(language)) {
- return;
+ if (!(JPQLParser.LANG_JPQL.equals(language) || CriteriaBuilderImpl.LANG_CRITERIA.equals(language))) {
+ throw new IllegalStateException(_loc.get("not-jpql-or-criteria-query").getMessage());
}
- throw new IllegalStateException(_loc.get("not-jpql-or-criteria-query").getMessage());
}

public OpenJPAQuery<X> closeAll() {

Pinaki

svn commit: r880891 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

2009-11-16T10:27:21Z

Author: ppoddar
Date: Mon Nov 16 18:27:20 2009
New Revision: 880891

URL: http://svn.apache.org/viewvc?rev=880891&view=rev
Log:
OPENJPA-1381: Ignore preapared query if lock mode changes

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java?rev=880891&r1=880890&r2=880891&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java Mon Nov 16 18:27:20 2009
@@ -751,6 +751,7 @@
em.getTransaction().begin();
Query q2 = em.createQuery(jpql);
assertEquals(QueryLanguages.LANG_PREPARED_SQL, OpenJPAPersistence.cast(q2).getLanguage());
+ q2.getLockMode();
q2.setLockMode(LockModeType.OPTIMISTIC);
assertEquals(JPQLParser.LANG_JPQL, OpenJPAPersistence.cast(q2).getLanguage());
List<Author> authors2 = q2.getResultList();

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=880891&r1=880890&r2=880891&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java Mon Nov 16 18:27:20 2009
@@ -377,9 +377,12 @@
*/
void assertJPQLOrCriteriaQuery() {
String language = getLanguage();
- if (!(JPQLParser.LANG_JPQL.equals(language) || CriteriaBuilderImpl.LANG_CRITERIA.equals(language))) {
- throw new IllegalStateException(_loc.get("not-jpql-or-criteria-query").getMessage());
+ if (JPQLParser.LANG_JPQL.equals(language)
+ || QueryLanguages.LANG_PREPARED_SQL.equals(language)
+ || CriteriaBuilderImpl.LANG_CRITERIA.equals(language)) {
+ return;
}
+ throw new IllegalStateException(_loc.get("not-jpql-or-criteria-query").getMessage());
}

public OpenJPAQuery<X> closeAll() {

Pinaki

svn commit: r880868 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema: SchemaGroup.java SchemaTool.java

2009-11-16T09:38:16Z

Author: ppoddar
Date: Mon Nov 16 17:38:16 2009
New Revision: 880868

URL: http://svn.apache.org/viewvc?rev=880868&view=rev
Log:
OPENJPA-1387: Remove non-nullable constraint from Unique column.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java?rev=880868&r1=880867&r2=880868&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java Mon Nov 16 17:38:16 2009
@@ -144,7 +144,7 @@
tab.importIndex(idxs[j]);
unqs = tables[i].getUniques();
for (int j = 0; j < unqs.length; j++)
- tab.importUnique(unqs[j]);
+ tab.importUnique(unqs[j], null);
}
return copy;
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java?rev=880868&r1=880867&r2=880868&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java Mon Nov 16 17:38:16 2009
@@ -590,7 +590,7 @@
if (dbTable == null)
continue;
for (int k = 0; k < uniques.length; k++) {
- dbTable.importUnique(uniques[k]);
+ dbTable.importUnique(uniques[k], _dict);
}
}
}
@@ -957,7 +957,11 @@
*/
public boolean createTable(Table table)
throws SQLException {
- return executeSQL(_dict.getCreateTableSQL(table));
+ try {
+ return executeSQL(_dict.getCreateTableSQL(table));
+ } catch (SQLException e) {
+ return false;
+ }
}

/**

Pinaki

svn commit: r880865 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: kernel/TableJDBCSeq.java schema/Table.java

2009-11-16T09:32:21Z

Author: ppoddar
Date: Mon Nov 16 17:32:21 2009
New Revision: 880865

URL: http://svn.apache.org/viewvc?rev=880865&view=rev
Log:
OPENJPA-1387: Remove non-nullable constraint from Unique column.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java?rev=880865&r1=880864&r2=880865&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java Mon Nov 16 17:32:21 2009
@@ -260,7 +260,7 @@
// importTable() does not import unique constraints
Unique[] uniques = _pkColumn.getTable().getUniques();
for (Unique u : uniques) {
- copy.importUnique(u);
+ copy.importUnique(u, _conf.getDBDictionaryInstance());
}
// we need to reset the table name in the column with the
// fully qualified name for matching the table name from the

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java?rev=880865&r1=880864&r2=880865&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java Mon Nov 16 17:32:21 2009
@@ -737,7 +737,7 @@
/**
* Import a constraint; column names must match columns of this table.
*/
- public Unique importUnique(Unique unq) {
+ public Unique importUnique(Unique unq, DBDictionary dict) {
if (unq == null)
return null;

@@ -747,6 +747,10 @@
Column[] cols = unq.getColumns();
for (int i = 0; i < cols.length; i++)
copy.addColumn(getColumn(cols[i].getName()));
+ if (dict != null && !dict.supportsNullUniqueConlumn) {
+ for (Column col : copy.getColumns())
+ col.setNotNull(true);
+ }
return copy;
}

Pinaki

svn commit: r880834 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: meta/MappingTool.java sql/AbstractDB2Dictionary.java sql/DBDictionary.java

2009-11-16T08:29:18Z

Author: ppoddar
Date: Mon Nov 16 16:29:18 2009
New Revision: 880834

URL: http://svn.apache.org/viewvc?rev=880834&view=rev
Log:
OPENJPA-1387: Remove non-nullable constraint from Unique column.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java?rev=880834&r1=880833&r2=880834&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java Mon Nov 16 16:29:18 2009
@@ -46,6 +46,7 @@
import org.apache.openjpa.jdbc.schema.SchemaSerializer;
import org.apache.openjpa.jdbc.schema.SchemaTool;
import org.apache.openjpa.jdbc.schema.Table;
+import org.apache.openjpa.jdbc.schema.Unique;
import org.apache.openjpa.jdbc.schema.XMLSchemaSerializer;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.kernel.Seq;
@@ -753,6 +754,7 @@
Schema[] schemas = _schema.getSchemas();
Table[] tables;
Column[] cols;
+ Unique[] unqs;
for (int i = 0; i < schemas.length; i++) {
tables = schemas[i].getTables();
for (int j = 0; j < tables.length; j++) {
@@ -761,8 +763,17 @@

tables[j].getPrimaryKey().setLogical(false);
cols = tables[j].getPrimaryKey().getColumns();
- for (int k = 0; k < cols.length; k++)
+ for (int k = 0; k < cols.length; k++) {
cols[k].setNotNull(true);
+ }
+ unqs = tables[j].getUniques();
+ if (!_dict.supportsNullUniqueConlumn) {
+ for (Unique u : unqs) {
+ for (Column c : u.getColumns()) {
+ c.setNotNull(true);
+ }
+ }
+ }
}
}
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java?rev=880834&r1=880833&r2=880834&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java Mon Nov 16 16:29:18 2009
@@ -69,6 +69,8 @@
// the equivalent "X JOIN Y ON 1 = 1"
crossJoinClause = "JOIN";
requiresConditionForCrossJoin = true;
+
+ supportsNullUniqueConlumn = false;
}

public void indexOf(SQLBuffer buf, FilterValue str, FilterValue find,

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=880834&r1=880833&r2=880834&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Mon Nov 16 16:29:18 2009
@@ -187,6 +187,7 @@
public boolean supportsRestrictDeleteAction = true;
public boolean supportsCascadeDeleteAction = true;
public boolean supportsNullDeleteAction = true;
+ public boolean supportsNullUniqueConlumn = true;
public boolean supportsDefaultDeleteAction = true;
public boolean supportsRestrictUpdateAction = true;
public boolean supportsCascadeUpdateAction = true;

Pinaki

svn commit: r880821 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: meta/MappingDefaultsImpl.java schema/NameSet.java

2009-11-16T07:58:24Z

Author: ppoddar
Date: Mon Nov 16 15:58:24 2009
New Revision: 880821

URL: http://svn.apache.org/viewvc?rev=880821&view=rev
Log:
OPENJPA-1051: Simplify check for uniqueness of column names. Patch contributed by Ravi Palacherla.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java?rev=880821&r1=880820&r2=880821&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java Mon Nov 16 15:58:24 2009
@@ -539,9 +539,7 @@
else if (_dsIdName != null)
cols[i].setName(_dsIdName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
}

/**
@@ -553,7 +551,9 @@
String name = col.getName();
if (_removeHungarianNotation)
name = removeHungarianNotation(name);
- col.setName(dict.getValidColumnName(name, table));
+ String correctedName = dict.getValidColumnName(name, table);
+ col.setName(correctedName);
+ table.addCorrectedColumnName(correctedName, true);
}
}

@@ -584,9 +584,7 @@
} else if (_versName != null)
cols[i].setName(_versName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
}

public void populateColumns(Discriminator disc, Table table,
@@ -597,9 +595,7 @@
else if (_discName != null)
cols[i].setName(_discName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
}

public void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
@@ -624,11 +620,8 @@

public void populateColumns(ValueMapping vm, String name, Table table,
Column[] cols) {
- for (int i = 0; i < cols.length; i++) {
+ for (int i = 0; i < cols.length; i++)
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
- }
- table.resetSubColumns();
}

public boolean populateOrderColumns(FieldMapping fm, Table table,
@@ -639,9 +632,7 @@
else if (_orderName != null)
cols[i].setName(_orderName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
return _orderLists && (JavaTypes.ARRAY == fm.getTypeCode()
|| List.class.isAssignableFrom(fm.getType()));
}
@@ -654,9 +645,7 @@
else if (_nullIndName != null)
cols[i].setName(_nullIndName + i);
correctName(table, cols[i]);
- table.addSubColumn(cols[i].getName());
}
- table.resetSubColumns();
return _addNullInd;
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java?rev=880821&r1=880820&r2=880821&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java Mon Nov 16 15:58:24 2009
@@ -39,17 +39,13 @@

private Set _names = null;

- // an additional names Set for checking name duplication
- private Set _subNames = null;
-
/**
* Return true if the given name is in use already.
*/
public boolean isNameTaken(String name) {
if (name == null)
return true;
- return (_names != null && _names.contains(name.toUpperCase())) ||
- (_subNames != null && _subNames.contains(name.toUpperCase()));
+ return _names != null && _names.contains(name.toUpperCase());
}

/**
@@ -81,20 +77,4 @@
if (name != null && _names != null)
_names.remove(name.toUpperCase());
}
-
- /**
- * Attempt to add the given name to the set.
- *
- * @param name the name to add
- */
- protected void addSubName(String name) {
- if (_subNames == null) {
- _subNames = new HashSet();
- }
- _subNames.add(name.toUpperCase());
- }
-
- protected void resetSubNames() {
- _subNames = null;
- }
}

Pinaki

svn commit: r880689 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java

2009-11-16T01:33:34Z

Author: ppoddar
Date: Mon Nov 16 09:33:29 2009
New Revision: 880689

URL: http://svn.apache.org/viewvc?rev=880689&view=rev
Log:
OPENJPA-1051: Simplify check for uniqueness of column names. Patch contributed by Ravi Palacherla.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java?rev=880689&r1=880688&r2=880689&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java Mon Nov 16 09:33:29 2009
@@ -376,6 +376,13 @@
return col;
}

+ /**
+ * Add a name to this NameSet
+ */
+ public void addCorrectedColumnName(String name, boolean validate) {
+ addName(name, validate);
+ }
+

/**
* Remove the given column from the table.
@@ -816,15 +823,4 @@
public void setColNumber(int colNum) {
_colNum = colNum;
}
-
- /**
- * Add a column to the subNames set to avoid naming conflict.
- */
- public void addSubColumn(String name) {
- addSubName(name);
- }
-
- public void resetSubColumns() {
- resetSubNames();
- }
}

Pinaki

svn commit: r880686 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema: Constraint.java LocalConstraint.java Unique.java

2009-11-16T01:19:31Z

Author: ppoddar
Date: Mon Nov 16 09:19:24 2009
New Revision: 880686

URL: http://svn.apache.org/viewvc?rev=880686&view=rev
Log:
OPENJPA-1387: Remove non-nullable constraint from Unique column.

Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java?rev=880686&r1=880685&r2=880686&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java Mon Nov 16 09:19:24 2009
@@ -24,6 +24,7 @@
*
* @author Abe White
*/
+@SuppressWarnings("serial")
public abstract class Constraint
extends ReferenceCounter {

@@ -180,9 +181,6 @@
public String toString() {
if (getName() != null)
return getName();
-
- String name = getClass().getName();
- name = name.substring(name.lastIndexOf('.') + 1);
- return "<" + name.toLowerCase() + ">";
+ return "<" + getClass().getSimpleName().toLowerCase() + ">";
}
}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java?rev=880686&r1=880685&r2=880686&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java Mon Nov 16 09:19:24 2009
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.List;

-import org.apache.commons.lang.ObjectUtils;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.util.InvalidStateException;

@@ -32,13 +31,13 @@
*
* @author Abe White
*/
+@SuppressWarnings("serial")
public abstract class LocalConstraint
extends Constraint {

- private static final Localizer _loc = Localizer.forPackage
- (LocalConstraint.class);
+ private static final Localizer _loc = Localizer.forPackage(LocalConstraint.class);

- private List _colList = null;
+ private List<Column> _colList = null;
private Column[] _cols = null;

/**
@@ -99,7 +98,7 @@
col == null ? null : getTable()));

if (_colList == null)
- _colList = new ArrayList(3);
+ _colList = new ArrayList<Column>(3);
else if (_colList.contains(col))
return;

@@ -124,7 +123,7 @@
}

/**
- * Return true if the pk includes the given column.
+ * Return true if this constraint includes the given column.
*/
public boolean containsColumn(Column col) {
if (col == null || _colList == null)
@@ -133,7 +132,7 @@
}

/**
- * Ref all columns in this constraint.
+ * Reference all columns in this constraint.
*/
public void refColumns() {
Column[] cols = getColumns();
@@ -142,7 +141,7 @@
}

/**
- * Deref all columns in this constraint.
+ * Dereference all columns in this constraint.
*/
public void derefColumns() {
Column[] cols = getColumns();

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java?rev=880686&r1=880685&r2=880686&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java Mon Nov 16 09:19:24 2009
@@ -24,6 +24,7 @@
* @author Abe White
* @author Pinaki Poddar
*/
+@SuppressWarnings("serial")
public class Unique
extends LocalConstraint {

@@ -46,26 +47,7 @@
}

/**
- * Adds the given column.
- * The added column is set to non-nullable because a unique constraint
- * on the database requires that its constituent columns are NOT NULL.
- * @see Column#setNotNull(boolean)
- */
- public void addColumn(Column col) {
- super.addColumn(col);
- col.setNotNull(true);
- }
-
- /**
- * Set the name of the constraint. This method cannot be called if the
- * constraint already belongs to a table.
- */
- public void setName(String name) {
- super.setName(name);
- }
-
- /**
- * Return true if the structure of this primary key matches that of
+ * Return true if the structure of this constraint matches that of
* the given one (same table, same columns).
*/
public boolean equalsUnique(Unique unq) {

Pinaki

svn commit: r836052 - /openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_criteria.xml

2009-11-13T15:04:53Z

Author: ppoddar
Date: Fri Nov 13 23:04:53 2009
New Revision: 836052

URL: http://svn.apache.org/viewvc?rev=836052&view=rev
Log:
Document MetaModel generator tool usage.

Modified:
openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_criteria.xml

Modified: openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_criteria.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_criteria.xml?rev=836052&r1=836051&r2=836052&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_criteria.xml (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/jpa_overview_criteria.xml Fri Nov 13 23:04:53 2009
@@ -169,13 +169,14 @@
This tool is invoked during compilation for JDK6 compiler if OpenJPA and JPA
libraries are specified in the compiler <code>-processorpath</code> option.
<programlisting>
- $ javac -processorpath path/to/openjpa-all.jar mypackage/MyEntity.java
+ $ javac -processor org.apache.openjpa.persistence.meta.AnnotationProcessor6 -processorpath path/to/openjpa-all.jar mypackage/MyEntity.java
</programlisting>
will generate source code for canonical meta-model class <code>mypackage.MyEntity_.java</code>.
</para>

<para>
-The Annotation Processor recognizes the following options (none of them are mandatory):
+The Annotation Processor recognizes the following options specified in the command-line with <code>-A</code>
+(none of them are mandatory):
<itemizedlist>
<listitem>
<para>

Pinaki

svn commit: r836023 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/ openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/

2009-11-13T14:18:33Z

Author: ppoddar
Date: Fri Nov 13 22:18:32 2009
New Revision: 836023

URL: http://svn.apache.org/viewvc?rev=836023&view=rev
Log:
Literal value for empty disjunction and conjunction

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java?rev=836023&r1=836022&r2=836023&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java Fri Nov 13 22:18:32 2009
@@ -103,51 +103,41 @@
/**
* Executes the given CriteriaQuery and JPQL string and compare their respective SQLs for equality.
*/
- void assertEquivalence(CriteriaQuery<?> c, String jpql, String expectedSQL) {
- assertEquivalence(c, jpql, null, null, expectedSQL);
- }
-
- /**
- * Executes the given CriteriaQuery and JPQL string and compare their respective SQLs for equality.
- */
void assertEquivalence(CriteriaQuery<?> c, String jpql) {
- System.err.println("JPQL :" + jpql);
- System.err.println("CJQL :" + ((CriteriaQueryImpl<?>)c).toCQL());
- assertEquivalence(c, jpql, null, null, null);
+ assertEquivalence(null, c, jpql, null);
}
-
+
/**
- * Executes the given CriteriaQuery and JPQL string and compare their respective SQLs for equality. Sets the
- * supplied parameters, if any.
+ * Executes the given CriteriaQuery and JPQL string and compare their respective SQLs for equality
+ * with the expected SQL.
*/
- void assertEquivalence(CriteriaQuery<?> c, String jpql, String[] paramNames, Object[] params) {
- assertEquivalence(c, jpql, paramNames, params, null);
+ void assertEquivalence(CriteriaQuery<?> c, String jpql, String expectedSQL) {
+ assertEquivalence(null, c, jpql, expectedSQL);
}

/**
- * Executes the given CriteriaQuery and JPQL string and compare their respective SQLs for equality. Sets the
- * supplied parameters, if any.
+ * Executes the given CriteriaQuery and JPQL string after decorating with the given decorator,
+ * and then compare their respective SQLs for equality.
*/
- void assertEquivalence(CriteriaQuery<?> c, String jpql, String[] paramNames, Object[] params,
- String expectedSQL) {
- Query cQ = getEntityManager().createQuery(c);
- Query jQ = getEntityManager().createQuery(jpql);
- setParameters(cQ, paramNames, params);
- setParameters(jQ, paramNames, params);
-
- executeAndCompareSQL(jpql, cQ, jQ, expectedSQL);
+ void assertEquivalence(QueryDecorator decorator, CriteriaQuery<?> c, String jpql) {
+ assertEquivalence(decorator, c, jpql, null);
}

/**
- * Executes the given CriteriaQuery and JPQL string and compare their respective SQLs for equality.
+ * Executes the given CriteriaQuery and JPQL string and compare their respective SQLs for equality.
+ * Decorates the query with the given decorator before execution.
+ * supplied parameters, if any.
*/
- void assertEquivalence(CriteriaQuery<?> c, String jpql, Object[] params) {
- Query jQ = getEntityManager().createQuery(jpql);
+ void assertEquivalence(QueryDecorator decorator, CriteriaQuery<?> c, String jpql, String expectedSQL) {
+ System.err.println("JPQL:[" + jpql + "]");
+ System.err.println("CQL :[" + ((OpenJPACriteriaQuery<?>)c).toCQL());
Query cQ = getEntityManager().createQuery(c);
- setParameters(cQ, params);
- setParameters(jQ, params);
-
- executeAndCompareSQL(jpql, cQ, jQ, null);
+ Query jQ = getEntityManager().createQuery(jpql);
+ if (decorator != null) {
+ decorator.decorate(cQ);
+ decorator.decorate(jQ);
+ }
+ executeAndCompareSQL(jpql, cQ, jQ, expectedSQL);
}

/**
@@ -308,15 +298,6 @@
}
}

- void setParameters(Query q, String[] paramNames, Object[] params) {
- for (int i = 0; paramNames != null && i < paramNames.length; i++)
- q.setParameter(paramNames[i], params[i]);
- }
-
- void setParameters(Query q, Object[] params) {
- for (int i = 0; params != null && i < params.length; i++)
- q.setParameter(i + 1, params[i]);
- }

/**
* Execute the given query and return the generated SQL. If the query execution fail because the generated SQL is
@@ -405,4 +386,12 @@
return new ArrayList<String>(sqls);
}
}
+
+ /**
+ * Interface to decorate a query such as set parameter or range before execution.
+ *
+ */
+ public interface QueryDecorator {
+ void decorate(Query q);
+ }
}

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java?rev=836023&r1=836022&r2=836023&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java Fri Nov 13 22:18:32 2009
@@ -198,12 +198,21 @@
Root<Person> p = c.from(Person.class);
c.where(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p1")));

- assertEquivalence(c, jpql, new String[]{"p1"}, new String[]{"XYZ"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("p1", "XYZ");
+ }
+ }, c, jpql);

Predicate where = c.getRestriction();
c.where(cb.and(where, cb.equal(p.get(Person_.name), cb.parameter(String.class, "p2"))));

- assertEquivalence(c, editedjpql, new String[]{"p1", "p2"}, new String[]{"MNO", "ABC"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("p1", "MNO");
+ q.setParameter("p2", "ABC");
+ }
+ }, c, editedjpql);
}

public void testEditParameterizedPredicateReplaced() {
@@ -215,11 +224,20 @@
c.where(cb.and(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p1")),
cb.equal(p.get(Person_.name), cb.parameter(String.class, "p2"))));
assertEquals(2,c.getParameters().size());
- assertEquivalence(c, jpql, new String[]{"p1", "p2"}, new String[]{"XYZ", "ABC"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("p1", "XYZ");
+ q.setParameter("p2", "ABC");
+ }
+ }, c, jpql);

c.where(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p3")));

- assertEquivalence(c, editedjpql, new String[]{"p3"}, new String[]{"MNO"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("p3", "MNO");
+ }
+ }, c, editedjpql);
}

public void testEditParameterizedPredicateRemoved() {
@@ -231,11 +249,20 @@
c.where(cb.and(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p1")),
cb.equal(p.get(Person_.name), cb.parameter(String.class, "p2"))));
assertEquals(2,c.getParameters().size());
- assertEquivalence(c, jpql, new String[]{"p1", "p2"}, new String[]{"XYZ", "ABC"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("p1", "XYZ");
+ q.setParameter("p2", "ABC");
+ }
+ }, c, jpql);

c.where(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p1")));

- assertEquivalence(c, editedjpql, new String[]{"p1"}, new String[]{"MNO"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("p1", "MNO");
+ }
+ }, c, editedjpql);
}

public void testSerachWithinResult() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java?rev=836023&r1=836022&r2=836023&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java Fri Nov 13 22:18:32 2009
@@ -1374,4 +1374,19 @@
}, c, jpql);
}

+ public void testEmptyAnd() {
+ CriteriaQuery<Order> c = cb.createQuery(Order.class);
+ Root<Order> order = c.from(Order.class);
+ c.where(cb.and(cb.not(cb.equal(order.get(Order_.customer).get(Customer_.name), "Robert E. Bissett")),
+ cb.isTrue(cb.conjunction())));
+ em.createQuery(c).getResultList();
+ }
+
+ public void testEmptyOr() {
+ CriteriaQuery<Order> c = cb.createQuery(Order.class);
+ Root<Order> order = c.from(Order.class);
+ c.where(cb.and(cb.not(cb.equal(order.get(Order_.customer).get(Customer_.name), "Robert E. Bissett")),
+ cb.isTrue(cb.disjunction())));
+ em.createQuery(c).getResultList();
+ }
}

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java?rev=836023&r1=836022&r2=836023&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java Fri Nov 13 22:18:32 2009
@@ -39,6 +39,7 @@
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Selection;
import javax.persistence.criteria.Subquery;
+import javax.persistence.criteria.Predicate.BooleanOperator;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.Metamodel;
@@ -328,7 +329,13 @@
}

public Predicate isTrue(Expression<Boolean> x) {
- return new Expressions.Equal(x, false);
+ if (x instanceof PredicateImpl) {
+ PredicateImpl predicate = (PredicateImpl)x;
+ if (predicate.isEmpty()) {
+ return predicate.getOperator() == BooleanOperator.AND ? PredicateImpl.TRUE : PredicateImpl.FALSE;
+ }
+ }
+ return new Expressions.Equal(x, true);
}

public <K, M extends Map<K, ?>> Expression<Set<K>> keys(M map) {

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java?rev=836023&r1=836022&r2=836023&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java Fri Nov 13 22:18:32 2009
@@ -26,6 +26,7 @@
import javax.persistence.criteria.Predicate;

import org.apache.openjpa.kernel.exps.ExpressionFactory;
+import org.apache.openjpa.kernel.exps.Literal;

/**
* Predicate is a expression that evaluates to true or false.
@@ -96,6 +97,10 @@
public final BooleanOperator getOperator() {
return _op;
}
+
+ public final boolean isEmpty() {
+ return _exps.isEmpty();
+ }

/**
* Is this predicate created by negating another predicate?
@@ -123,6 +128,9 @@

@Override
org.apache.openjpa.kernel.exps.Value toValue(ExpressionFactory factory, CriteriaQueryImpl<?> q) {
+ if (_exps.isEmpty()) {
+ return factory.newLiteral(_op == BooleanOperator.AND, Literal.TYPE_BOOLEAN);
+ }
throw new AbstractMethodError(this.getClass().getName());
}

Pinaki

svn commit: r835961 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/

2009-11-13T11:29:49Z

Author: ppoddar
Date: Fri Nov 13 19:29:48 2009
New Revision: 835961

URL: http://svn.apache.org/viewvc?rev=835961&view=rev
Log:
Use decorator pattern for Criteria Query tests

Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java?rev=835961&r1=835960&r2=835961&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java Fri Nov 13 19:29:48 2009
@@ -23,6 +23,7 @@
import java.sql.Timestamp;
import java.util.List;

+import javax.persistence.Query;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;

@@ -103,7 +104,7 @@

Date earlier = new Date(now - 1000);

- String dateString = createJDBCEscapeString(earlier);
+ final String dateString = createJDBCEscapeString(earlier);
String jpql = "select d from Dependent d where d.endDate >= :dateString ORDER BY d.endDate";
CriteriaQuery<Dependent> c = cb.createQuery(Dependent.class);
Root<Dependent> d = c.from(Dependent.class);
@@ -112,7 +113,12 @@
.as(Date.class)));
c.orderBy(cb.asc(d.get(Dependent_.endDate)));

- assertEquivalence(c, jpql, new String[]{"dateString"}, new Object[]{dateString});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("dateString", dateString);
+ }
+ }, c, jpql);
+
}

String createJDBCEscapeString(Object time) {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java?rev=835961&r1=835960&r2=835961&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java Fri Nov 13 19:29:48 2009
@@ -23,6 +23,7 @@
import java.util.Set;

import javax.persistence.Parameter;
+import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
@@ -1158,7 +1159,11 @@
q.multiselect(e, e.get(Embed_Embed_.intVal1), e.get(Embed_Embed_.embed).get(Embed_.intVal2));
ParameterExpression<Embed_Embed> param1 = cb.parameter(Embed_Embed.class, "embed2");
q.where(cb.isMember(param1, a.get(EntityA_Coll_Embed_Embed_.embeds)));
- assertEquivalence(q, jpql, new String[]{"embed2"}, new Object[]{new Embed_Embed()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("embed2", new Embed_Embed());
+ }
+ }, q, jpql);
}

@AllowFailure(message="JPQL parse error")
@@ -1172,7 +1177,12 @@
q.multiselect(e, e.get(Embed_Embed_.intVal1), e.get(Embed_Embed_.embed).get(Embed_.intVal2));
ParameterExpression<Embed_Embed> param1 = cb.parameter(Embed_Embed.class, "embed2");
q.where(cb.isMember(param1, a.get(EntityA_Coll_Embed_Embed_.embeds)));
- assertEquivalence(q, jpql, new String[]{"embed2"}, new Object[]{new Embed_Embed()});
+
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("embed2", new Embed_Embed());
+ }
+ }, q, jpql);
}

@AllowFailure(message="JPQL parse error")
@@ -1186,7 +1196,11 @@
q.multiselect(e, e.get(Embed_Embed_.intVal1), e.get(Embed_Embed_.embed).get(Embed_.intVal2));
Parameter<Embed_Embed> param1 = cb.parameter(Embed_Embed.class);
//q.where(cb.equal(param1, e));
- assertEquivalence(q, jpql, new String[]{"embed2"}, new Object[]{new Embed_Embed()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("embed2", new Embed_Embed());
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery87() {
@@ -1489,7 +1503,11 @@
ParameterExpression<String> param1 = cb.parameter(String.class, "image");
q.where(cb.equal(param1, cb.any(sq)));
q.orderBy(cb.asc(i));
- assertEquivalence(q, jpql, new String[]{"image"}, new String[]{"my photo"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("image", "my photo");
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery112() {
@@ -1505,7 +1523,11 @@
ParameterExpression<String> param1 = cb.parameter(String.class, "image");
q.where(cb.equal(param1, cb.any(sq)));
q.orderBy(cb.asc(i));
- assertEquivalence(q, jpql, new String[]{"image"}, new String[]{"my photo"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("image", "my photo");
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery113() {
@@ -1522,7 +1544,11 @@
sq.where(cb.equal(param1, e.key()));
q.where(cb.exists(sq));
q.orderBy(cb.asc(i));
- assertEquivalence(q, jpql, new String[]{"image"}, new String[]{"my photo"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("image", "my photo");
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery114() {
@@ -1538,7 +1564,11 @@
ParameterExpression<String> param1 = cb.parameter(String.class, "image");
q.where(cb.equal(param1, cb.any(sq)));
q.orderBy(cb.asc(i));
- assertEquivalence(q, jpql, new String[]{"image"}, new String[]{"my photo"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("image", "my photo");
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery115() {
@@ -1555,7 +1585,11 @@
sq.where(cb.equal(param1, e.key()));
q.where(cb.exists(sq));
q.orderBy(cb.asc(i));
- assertEquivalence(q, jpql, new String[]{"image"}, new String[]{"my photo"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("image", "my photo");
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery116() {
@@ -1571,7 +1605,11 @@
ParameterExpression<String> param1 = cb.parameter(String.class, "image");
q.where(cb.equal(param1, cb.any(sq)));
q.orderBy(cb.asc(i));
- assertEquivalence(q, jpql, new String[]{"image"}, new String[]{"my photo"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("image", "my photo");
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery117() {
@@ -1588,7 +1626,11 @@
sq.where(cb.equal(param1, e.key()));
q.where(cb.exists(sq));
q.orderBy(cb.asc(i));
- assertEquivalence(q, jpql, new String[]{"image"}, new String[]{"my photo"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("image", "my photo");
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery118() {
@@ -1621,7 +1663,11 @@
sq.where(cb.equal(d.value().get(VicePresident_.id), 1));
q.where(cb.equal(param1, sq));
q.orderBy(cb.asc(c));
- assertEquivalence(q, jpql, new String[]{"division"}, new Object[]{new Division()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("division", new Division());
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery122() {
@@ -1638,7 +1684,11 @@
sq.select(d.key());
q.where(cb.exists(sq));
q.orderBy(cb.asc(c));
- assertEquivalence(q, jpql, new String[]{"division"}, new Object[]{new Division()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("division", new Division());
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery123() {
@@ -1655,7 +1705,11 @@
sq.where(cb.equal(d.key(), param1));
q.where(cb.exists(sq));
q.orderBy(cb.asc(c));
- assertEquivalence(q, jpql, new String[]{"division"}, new Object[]{new Division()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("division", new Division());
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery124() {
@@ -1672,7 +1726,11 @@
sq.where(cb.equal(d.value().get(VicePresident_.id), 3));
q.where(cb.equal(param1, sq));
q.orderBy(cb.asc(c));
- assertEquivalence(q, jpql, new String[]{"division"}, new Object[]{new Division()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("division", new Division());
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery125() {
@@ -1689,7 +1747,11 @@
sq.select(d.key());
q.where(cb.exists(sq));
q.orderBy(cb.asc(c));
- assertEquivalence(q, jpql, new String[]{"k"}, new Object[]{new Division()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("k", new Division());
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery126() {
@@ -1706,7 +1768,11 @@
sq.select(d.value());
q.where(cb.exists(sq));
q.orderBy(cb.asc(c));
- assertEquivalence(q, jpql, new String[]{"k"}, new Object[]{new Division()});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("k", new Division());
+ }
+ }, q, jpql);
}

public void testEmbeddableQuery127() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java?rev=835961&r1=835960&r2=835961&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Fri Nov 13 19:29:48 2009
@@ -34,6 +34,9 @@
import javax.persistence.criteria.SetJoin;
import javax.persistence.criteria.Subquery;

+import org.apache.openjpa.persistence.criteria.AbstractCriteriaTestCase.QueryDecorator;
+import org.apache.openjpa.persistence.embed.Division;
+
/**
* Tests type-strict version of Criteria API.
*
@@ -1499,10 +1502,13 @@
Predicate p4 = cb.lessThan(d.get(Dependent_.id).get(DependentId_.effDate), maxDate);

q.where(cb.and(cb.and(cb.and(p1, p2), p3), p4));
-
- assertEquivalence(q, jpql,
- new String[]{"empid", "minDate", "maxDate"},
- new Object[]{101L, new Date(100), new Date(100000)});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("empid", 101L);
+ q.setParameter("minDate", new Date(100));
+ q.setParameter("maxDate", new Date(100000));
+ }
+ }, q, jpql);
}

public void testCorrelatedNestedSubquery1() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java?rev=835961&r1=835960&r2=835961&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java Fri Nov 13 19:29:48 2009
@@ -22,6 +22,7 @@
import java.util.List;

import javax.persistence.Parameter;
+import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
@@ -334,7 +335,11 @@
q.multiselect(c).where(cb.equal(
c.get(customer_.getSingularAttribute("status", Integer.class)), param));

- assertEquivalence(q, jpql, new String[] { "stat" }, new Object[] { 1 });
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("stat", 1);
+ }
+ }, q, jpql);
}

public void testKeyExpressionInSelectList() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java?rev=835961&r1=835960&r2=835961&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java Fri Nov 13 19:29:48 2009
@@ -21,6 +21,7 @@
import java.math.BigDecimal;
import java.util.Collection;

+import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
@@ -34,6 +35,7 @@
import javax.persistence.criteria.SetJoin;
import javax.persistence.criteria.Subquery;

+import org.apache.openjpa.persistence.criteria.AbstractCriteriaTestCase.QueryDecorator;
import org.apache.openjpa.persistence.test.AllowFailure;

public class TestStringCriteria extends CriteriaTest {
@@ -215,7 +217,11 @@
param.alias("stat");
q.select(c).where(cb.equal(c.get("status"), param));

- assertEquivalence(q, jpql, new String[] { "stat" }, new Object[] { 1 });
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("stat", 1);
+ }
+ }, q, jpql);
}

public void testSelectList() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java?rev=835961&r1=835960&r2=835961&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java Fri Nov 13 19:29:48 2009
@@ -37,6 +37,7 @@
package org.apache.openjpa.persistence.criteria;

import javax.persistence.Parameter;
+import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
@@ -44,6 +45,7 @@
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;

+import org.apache.openjpa.persistence.criteria.AbstractCriteriaTestCase.QueryDecorator;
import org.apache.openjpa.persistence.test.DatabasePlatform;

/**
@@ -163,7 +165,11 @@
cq.where(cb.like(c.get(CompUser_.name), param, '|'));
cq.select(c.get(CompUser_.name));

- assertEquivalence(cq, query, new String[]{"name"}, new Object[] {"%|_%"});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("name", "%|_%");
+ }
+ }, cq, query);
}

public void testNullExpression() {
@@ -501,8 +507,12 @@
cq.where(e.type().in(param1, param2));
cq.orderBy(cb.asc(e.get(CompUser_.name)));

- assertEquivalence(cq, jpql, new String[]{"a","b"},
- new Class[]{MaleUser.class,FemaleUser.class});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("a", MaleUser.class);
+ q.setParameter("b", FemaleUser.class);
+ }
+ }, cq, jpql);
}

public void testTypeExpression2() {
@@ -516,7 +526,11 @@
q.multiselect(e.type());
q.where(cb.equal(e.type(), param1).not());

- assertEquivalence(q, query, new String[]{"t"}, new Class[]{MaleUser.class});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("t", MaleUser.class);
+ }
+ }, q, query);
}

public void testTypeExpression3() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java?rev=835961&r1=835960&r2=835961&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java Fri Nov 13 19:29:48 2009
@@ -25,6 +25,7 @@
import java.util.Map;

import javax.persistence.Parameter;
+import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
@@ -33,6 +34,7 @@
import javax.persistence.criteria.ListJoin;
import javax.persistence.criteria.MapJoin;
import javax.persistence.criteria.ParameterExpression;
+import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Selection;
import javax.persistence.criteria.SetJoin;
@@ -539,7 +541,11 @@
Parameter<Integer> param = cb.parameter(Integer.class, "stat");
q.select(c).where(cb.equal(c.get(Customer_.status), param));

- assertEquivalence(q, jpql, new String[] { "stat" }, new Object[] { 1 });
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("stat", 1);
+ }
+ }, q, jpql);
}

public void testParameters2() {
@@ -552,8 +558,12 @@
q.select(c).where(cb.and(cb.equal(c.get(Customer_.status), param1),
cb.equal(c.get(Customer_.name), param2)));

- assertEquivalence(q, jpql, new String[] { "stat", "name" },
- new Object[] { 1, "test" });
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("stat", 1);
+ q.setParameter("name", "test");
+ }
+ }, q, jpql);
}

public void testParameters3() {
@@ -564,7 +574,11 @@
Parameter<Integer> param = cb.parameter(Integer.class, "stat");
q.select(c).where(cb.equal(c.get(Customer_.status), param));

- assertEquivalence(q, jpql, new String[]{"stat"}, new Object[] { 1 });
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("stat", 1);
+ }
+ }, q, jpql);
}

public void testParameters4() {
@@ -576,8 +590,12 @@
Parameter<String> param2 = cb.parameter(String.class, "name");
q.select(c).where(cb.and(cb.equal(c.get(Customer_.status), param1),
cb.equal(c.get(Customer_.name), param2)));
- assertEquivalence(q, jpql, new String[]{"stat", "name"},
- new Object[] { 1, "test" });
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("stat", 1);
+ q.setParameter("name", "test");
+ }
+ }, q, jpql);
}

public void testParameters5() {
@@ -588,10 +606,14 @@
ParameterExpression<List> param1 = cb.parameter(List.class, "coll");
q.where(c.get(Customer_.status).in(param1));
q.select(c);
- List vals = new ArrayList();
+ final List vals = new ArrayList();
vals.add(1);
vals.add(2);
- assertEquivalence(q, jpql, new String[] {"coll"}, new Object[] {vals});
+ assertEquivalence(new QueryDecorator() {
+ public void decorate(Query q) {
+ q.setParameter("coll", vals);
+ }
+ }, q, jpql);
}

public void testSelectList1() {
@@ -1333,5 +1355,23 @@
} catch (IllegalArgumentException e) {
}
}
+
+ public void testGroupByOnMaxResult() {
+ String jpql = "SELECT c.address.country, count(c) from Customer c GROUP BY c.address.country " +
+ "HAVING COUNT(c.address.country)>3";
+
+ CriteriaQuery<Object[]> c = cb.createQuery(Object[].class);
+ Root<Customer> customer = c.from(Customer.class);
+ Path<String> country = customer.get(Customer_.address).get(Address_.country);
+ c.multiselect(country, cb.count(customer))
+ .groupBy(country)
+ .having(cb.gt(cb.count(country), 3));
+
+ assertEquivalence(new QueryDecorator(){
+ public void decorate(Query q) {
+ q.setMaxResults(20);
+ }
+ }, c, jpql);
+ }

}

Pinaki