Nabble - OpenJPA Commits

svn commit: r791052 - in /openjpa/branches/subquery: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java

2009-07-03T20:00:21Z

Author: faywang
Date: Sat Jul 4 03:00:21 2009
New Revision: 791052

URL: http://svn.apache.org/viewvc?rev=791052&view=rev
Log:
revert change in AndExpression as no extra pair of parentheses are needed when calling AND from OR

Modified:
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java?rev=791052&r1=791051&r2=791052&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java Sat Jul 4 03:00:21 2009
@@ -54,7 +54,6 @@
BinaryOpExpState bstate = (BinaryOpExpState) state;
boolean paren1 = _exp1 instanceof OrExpression;
boolean paren2 = _exp2 instanceof OrExpression;
- buf.append("(");
if (paren1)
buf.append("(");
_exp1.appendTo(sel, ctx, bstate.state1, buf);
@@ -66,7 +65,6 @@
_exp2.appendTo(sel, ctx, bstate.state2, buf);
if (paren2)
buf.append(")");
- buf.append(")");
sel.append(buf, state.joins);
}

Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java?rev=791052&r1=791051&r2=791052&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Sat Jul 4 03:00:21 2009
@@ -297,11 +297,10 @@
+ "LEFT OUTER JOIN CR_CUST t5 ON t2.CUSTOMER_ID = t5.id "
+ "INNER JOIN CR_ADDR t4 ON t3.ADDRESS_ID = t4.id "
+ "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id "
- + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID "
- + "WHERE ((? < ALL ("
- + "SELECT t1.age FROM CR_ADDR t0 INNER JOIN CompUser t1 ON t0.id = t1.ADD_ID WHERE ((t4.city = t0.city AND "
- + "t3.ADDRESS_ID = t0.id)) ) AND 1 = 1))";
-
+ + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID WHERE (? < ALL ("
+ + "SELECT t1.age FROM CR_ADDR t0 INNER JOIN CompUser t1 ON t0.id = t1.ADD_ID WHERE (t4.city = t0.city AND "
+ + "t3.ADDRESS_ID = t0.id) ) AND 1 = 1)";
+
execute(jpql, expectedSQL);
}

@@ -318,8 +317,8 @@
+ "INNER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id "
+ "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id "
+ "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID "
- + "WHERE ((? < ALL (SELECT t4.age FROM CompUser t3, CompUser t4 "
- + "WHERE (t3.userid = t4.userid) AND (t2.id = t3.ADD_ID) ) AND 1 = 1))";
+ + "WHERE (? < ALL (SELECT t4.age FROM CompUser t3, CompUser t4 "
+ + "WHERE (t3.userid = t4.userid) AND (t2.id = t3.ADD_ID) ) AND 1 = 1)";

execute(jpql, expectedSQL);
}
@@ -399,10 +398,9 @@
+ "LEFT OUTER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ODR t2 ON t0.id = t2.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ADDR t5 ON t0.ADDRESS_ID = t5.id "
- + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID "
- + "WHERE (EXISTS (" +
- "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE ((t2.id = t4.id AND t3.id = t4.id)) "
- + "AND (t0.id = t3.CUSTOMER_ID) ))";
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (EXISTS ("
+ + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE (t2.id = t4.id AND t3.id = t4.id) "
+ + "AND (t0.id = t3.CUSTOMER_ID) ))";

execute(jpql, expectedSQL);
}
@@ -429,10 +427,9 @@
+ "LEFT OUTER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ODR t2 ON t0.id = t2.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ADDR t5 ON t0.ADDRESS_ID = t5.id "
- + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID "
- + "WHERE (NOT (EXISTS ("
- + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE ((t2.id = t4.id AND t3.id = t4.id)) "
- + "AND (t0.id = t3.CUSTOMER_ID) )))";
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (NOT (EXISTS ("
+ + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE (t2.id = t4.id AND t3.id = t4.id) "
+ + "AND (t0.id = t3.CUSTOMER_ID) )))";

execute(jpql, expectedSQL);
}
@@ -459,11 +456,10 @@
+ " (select distinct o.id from LineItem i, Order o"
+ " where i.quantity > 10 and o.count > 1000 and i.id = o.id)";

- String expectedSQL = "SELECT t0.id FROM CR_ODR t0 "
- + "WHERE (t0.id IN ("
+ 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 ("
- + "(t3.quantity > ? AND (t2.count > ? AND t3.id = t2.id))) ))";
+ + "FROM CR_ODR t1 JOIN CR_ODR t2 ON (1 = 1), CR_LI t3 WHERE ("
+ + "t3.quantity > ? AND t2.count > ? AND t3.id = t2.id) ))";

execute(jpql, expectedSQL);
}
@@ -546,10 +542,10 @@
+ "or exists (select o from c.orders o where o.id = 2)";

String expectedSQL = "SELECT t0.name FROM CR_CUST t0 WHERE (EXISTS ("
- + "SELECT t2.id FROM CR_ODR t1, CR_ODR t2 "
- + "WHERE ((t2.id = ? AND t1.id = t2.id)) AND (t0.id = t1.CUSTOMER_ID) ) OR EXISTS ("
+ + "SELECT t2.id FROM CR_ODR t1, CR_ODR t2 "
+ + "WHERE (t2.id = ? AND t1.id = t2.id) AND (t0.id = t1.CUSTOMER_ID) ) OR EXISTS ("
+ "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 "
- + "WHERE ((t4.id = ? AND t3.id = t4.id)) AND (t0.id = t3.CUSTOMER_ID) ))";
+ + "WHERE (t4.id = ? AND t3.id = t4.id) AND (t0.id = t3.CUSTOMER_ID) ))";
execute(jpql, expectedSQL);
}

@@ -561,8 +557,8 @@

String expectedSQL = "SELECT t0.name "
+ "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE ("
- + "(t1.quantity >= (SELECT MAX(t2.quantity) FROM CR_ODR t2 ) AND "
- + "t1.quantity <= (SELECT AVG(t3.quantity) FROM CR_ODR t3 )))";
+ + "t1.quantity >= (SELECT MAX(t2.quantity) FROM CR_ODR t2 ) AND "
+ + "t1.quantity <= (SELECT AVG(t3.quantity) FROM CR_ODR t3 ))";
execute(jpql, expectedSQL);
}

@@ -582,14 +578,12 @@
+ " and (select min(o2.quantity) from Customer c, in(c.orders)"
+ " o2)";

- String expectedSQL = "SELECT t4.id FROM CR_ODR t4 WHERE "
- + "((t4.quantity >= ("
- + "SELECT AVG(t1.quantity) "
+ String expectedSQL = "SELECT t4.id FROM CR_ODR t4 WHERE (t4.quantity >= ("
+ + "SELECT AVG(t1.quantity) "
+ "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID ) AND "
+ "t4.quantity <= ("
+ "SELECT MIN(t3.quantity) "
- + "FROM CR_CUST t2 INNER JOIN CR_ODR t3 ON t2.id = t3.CUSTOMER_ID )))";
-
+ + "FROM CR_CUST t2 INNER JOIN CR_ODR t3 ON t2.id = t3.CUSTOMER_ID ))";
execute(jpql, expectedSQL);
}

@@ -626,11 +620,10 @@
+ "WHERE m3.idPublisher.id = p.id)) ";

String expectedSQL = "SELECT t0.id, t1.id, t1.date_published, t1.id_publisher, t1.name "
- + "FROM Publisher t0 LEFT OUTER JOIN Magazine t1 ON t0.id = t1.id_publisher WHERE "
- + "(t1.id = ("
- + "SELECT MAX(t2.id) FROM Magazine t2 WHERE (("
+ + "FROM Publisher t0 LEFT OUTER JOIN Magazine t1 ON t0.id = t1.id_publisher WHERE (t1.id = ("
+ + "SELECT MAX(t2.id) FROM Magazine t2 WHERE ("
+ "t2.id_publisher = t0.id AND "
- + "t2.id = (SELECT MAX(t3.id) FROM Magazine t3 WHERE (t3.id_publisher = t0.id) ))) ))";
+ + "t2.id = (SELECT MAX(t3.id) FROM Magazine t3 WHERE (t3.id_publisher = t0.id) )) ))";
execute(jpql, expectedSQL);
}

@@ -654,7 +647,7 @@
+ "o.id)";
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 ("
- + "(t3.quantity > ? AND (t2.quantity > ? AND t3.id = t2.id))) ))";
+ + "t3.quantity > ? AND t2.quantity > ? AND t3.id = t2.id) ))";
execute(jpql, expectedSQL);
}

svn commit: r791040 - in /openjpa/branches/subquery: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/

2009-07-03T16:58:09Z

Author: faywang
Date: Fri Jul 3 23:58:09 2009
New Revision: 791040

URL: http://svn.apache.org/viewvc?rev=791040&view=rev
Log:
fix nested subquery correlation problem and AND precedence problem when calling from OR

Added:
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java
Modified:
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java?rev=791040&r1=791039&r2=791040&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java Fri Jul 3 23:58:09 2009
@@ -54,6 +54,7 @@
BinaryOpExpState bstate = (BinaryOpExpState) state;
boolean paren1 = _exp1 instanceof OrExpression;
boolean paren2 = _exp2 instanceof OrExpression;
+ buf.append("(");
if (paren1)
buf.append("(");
_exp1.appendTo(sel, ctx, bstate.state1, buf);
@@ -65,6 +66,7 @@
_exp2.appendTo(sel, ctx, bstate.state2, buf);
if (paren2)
buf.append(")");
+ buf.append(")");
sel.append(buf, state.joins);
}

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java?rev=791040&r1=791039&r2=791040&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java Fri Jul 3 23:58:09 2009
@@ -615,8 +615,27 @@
pstate.joins.moveJoinsToParent();
}
pstate.joins.setJoinContext(null);
+
+ if (_actions == null) {
+ String subqAlias = findSubqAlias(sel);
+ pstate.joins = pstate.joins.setSubselect(subqAlias);
+ pstate.joins.setCorrelatedVariable(_schemaAlias);
+ }
+
return pstate;
}
+
+ public String findSubqAlias(Select sel) {
+ Select pSel = sel.getParent();
+ if (pSel == null)
+ return null;
+ Context pCtx = pSel.ctx();
+ if (pCtx.subquery == null)
+ return null;
+ if (pCtx.getSchema(_schemaAlias) != null)
+ return ((SubQ)pCtx.subquery).getCandidateAlias();
+ return findSubqAlias(pSel);
+ }

/**
* When a PCPath is in subselect, and it is simply a navigation

Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java?rev=791040&r1=791039&r2=791040&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Account.java Fri Jul 3 23:58:09 2009
@@ -19,8 +19,10 @@
package org.apache.openjpa.persistence.criteria;

import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Table;

@@ -40,6 +42,12 @@
@OneToOne
private Person owner;

+ @ManyToOne
+ private Customer customer;
+
+ @ManyToOne(optional = false, fetch = FetchType.LAZY)
+ private Product product;
+
private String name;

public long getId() {
@@ -77,4 +85,20 @@
public void setLoan(Integer loan) {
this.loan = loan;
}
+
+ public Product getProduct() {
+ return product;
+ }
+
+ public void setProduct(Product product) {
+ this.product = product;
+ }
+
+ public Customer getCustomer() {
+ return customer;
+ }
+
+ public void setCustomer(Customer customer) {
+ this.customer = customer;
+ }
}

Added: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java?rev=791040&view=auto
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java (added)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java Fri Jul 3 23:58:09 2009
@@ -0,0 +1,52 @@
+package org.apache.openjpa.persistence.criteria;
+
+import java.sql.Date;
+
+import javax.persistence.*;
+
+@Entity
+public class Request {
+ @Id
+ int id;
+
+ private short status;
+
+ @ManyToOne(optional = false, fetch = FetchType.LAZY)
+ private Account account;
+
+ Date requestTime;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public short getStatus() {
+ return status;
+ }
+
+ public void setStatus(short status) {
+ this.status = status;
+ }
+
+
+ public Account getAccount() {
+ return account;
+ }
+
+ public void setAccount(Account account) {
+ this.account = account;
+ }
+
+ public Date getRequestTime() {
+ return requestTime;
+ }
+
+ public void setRequestTime(Date requestTime) {
+ this.requestTime = requestTime;
+ }
+
+}

Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java?rev=791040&r1=791039&r2=791040&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Fri Jul 3 23:58:09 2009
@@ -170,6 +170,20 @@
execute(jpql, expectedSQL);
}

+ public void testSubqueries4e() {
+ String jpql = "SELECT c FROM Customer c WHERE EXISTS "
+ + "(SELECT o.id FROM Order o WHERE o.customer = c)";
+ String expectedSQL = "SELECT t1.id, t1.accountNum, t2.id, t2.city, t2.country, t2.county, t2.state, " +
+ "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, t1.balanceOwed, " +
+ "t1.creditRating, t1.filledOrderCount, t1.firstName, t1.lastName, t1.name, t1.status " +
+ "FROM CR_CUST t1 " +
+ "LEFT OUTER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id " +
+ "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID WHERE " +
+ "(EXISTS (SELECT t0.id FROM CR_ODR t0 WHERE (t0.CUSTOMER_ID = t1.id) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
public void testSubqueries5() {
String jpql = "SELECT o FROM Order o WHERE 10000 < ALL ("
+ "SELECT a.balance FROM o.customer c JOIN c.accounts a)";
@@ -283,10 +297,11 @@
+ "LEFT OUTER JOIN CR_CUST t5 ON t2.CUSTOMER_ID = t5.id "
+ "INNER JOIN CR_ADDR t4 ON t3.ADDRESS_ID = t4.id "
+ "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id "
- + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID WHERE (? < ALL ("
- + "SELECT t1.age FROM CR_ADDR t0 INNER JOIN CompUser t1 ON t0.id = t1.ADD_ID WHERE (t4.city = t0.city AND "
- + "t3.ADDRESS_ID = t0.id) ) AND 1 = 1)";
-
+ + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID "
+ + "WHERE ((? < ALL ("
+ + "SELECT t1.age FROM CR_ADDR t0 INNER JOIN CompUser t1 ON t0.id = t1.ADD_ID WHERE ((t4.city = t0.city AND "
+ + "t3.ADDRESS_ID = t0.id)) ) AND 1 = 1))";
+
execute(jpql, expectedSQL);
}

@@ -303,8 +318,8 @@
+ "INNER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id "
+ "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id "
+ "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID "
- + "WHERE (? < ALL (SELECT t4.age FROM CompUser t3, CompUser t4 "
- + "WHERE (t3.userid = t4.userid) AND (t2.id = t3.ADD_ID) ) AND 1 = 1)";
+ + "WHERE ((? < ALL (SELECT t4.age FROM CompUser t3, CompUser t4 "
+ + "WHERE (t3.userid = t4.userid) AND (t2.id = t3.ADD_ID) ) AND 1 = 1))";

execute(jpql, expectedSQL);
}
@@ -384,9 +399,10 @@
+ "LEFT OUTER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ODR t2 ON t0.id = t2.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ADDR t5 ON t0.ADDRESS_ID = t5.id "
- + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (EXISTS ("
- + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE (t2.id = t4.id AND t3.id = t4.id) "
- + "AND (t0.id = t3.CUSTOMER_ID) ))";
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID "
+ + "WHERE (EXISTS (" +
+ "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE ((t2.id = t4.id AND t3.id = t4.id)) "
+ + "AND (t0.id = t3.CUSTOMER_ID) ))";

execute(jpql, expectedSQL);
}
@@ -413,9 +429,10 @@
+ "LEFT OUTER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ODR t2 ON t0.id = t2.CUSTOMER_ID "
+ "LEFT OUTER JOIN CR_ADDR t5 ON t0.ADDRESS_ID = t5.id "
- + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (NOT (EXISTS ("
- + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE (t2.id = t4.id AND t3.id = t4.id) "
- + "AND (t0.id = t3.CUSTOMER_ID) )))";
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID "
+ + "WHERE (NOT (EXISTS ("
+ + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE ((t2.id = t4.id AND t3.id = t4.id)) "
+ + "AND (t0.id = t3.CUSTOMER_ID) )))";

execute(jpql, expectedSQL);
}
@@ -442,10 +459,11 @@
+ " (select distinct o.id from LineItem i, Order o"
+ " where i.quantity > 10 and o.count > 1000 and i.id = o.id)";

- String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.id IN ("
+ 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 ("
- + "t3.quantity > ? AND t2.count > ? AND t3.id = t2.id) ))";
+ + "FROM CR_ODR t1 JOIN CR_ODR t2 ON (1 = 1), CR_LI t3 WHERE ("
+ + "(t3.quantity > ? AND (t2.count > ? AND t3.id = t2.id))) ))";

execute(jpql, expectedSQL);
}
@@ -528,10 +546,10 @@
+ "or exists (select o from c.orders o where o.id = 2)";

String expectedSQL = "SELECT t0.name FROM CR_CUST t0 WHERE (EXISTS ("
- + "SELECT t2.id FROM CR_ODR t1, CR_ODR t2 "
- + "WHERE (t2.id = ? AND t1.id = t2.id) AND (t0.id = t1.CUSTOMER_ID) ) OR EXISTS ("
+ + "SELECT t2.id FROM CR_ODR t1, CR_ODR t2 "
+ + "WHERE ((t2.id = ? AND t1.id = t2.id)) AND (t0.id = t1.CUSTOMER_ID) ) OR EXISTS ("
+ "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 "
- + "WHERE (t4.id = ? AND t3.id = t4.id) AND (t0.id = t3.CUSTOMER_ID) ))";
+ + "WHERE ((t4.id = ? AND t3.id = t4.id)) AND (t0.id = t3.CUSTOMER_ID) ))";
execute(jpql, expectedSQL);
}

@@ -543,8 +561,8 @@

String expectedSQL = "SELECT t0.name "
+ "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE ("
- + "t1.quantity >= (SELECT MAX(t2.quantity) FROM CR_ODR t2 ) AND "
- + "t1.quantity <= (SELECT AVG(t3.quantity) FROM CR_ODR t3 ))";
+ + "(t1.quantity >= (SELECT MAX(t2.quantity) FROM CR_ODR t2 ) AND "
+ + "t1.quantity <= (SELECT AVG(t3.quantity) FROM CR_ODR t3 )))";
execute(jpql, expectedSQL);
}

@@ -564,12 +582,14 @@
+ " and (select min(o2.quantity) from Customer c, in(c.orders)"
+ " o2)";

- String expectedSQL = "SELECT t4.id FROM CR_ODR t4 WHERE (t4.quantity >= ("
- + "SELECT AVG(t1.quantity) "
+ String expectedSQL = "SELECT t4.id FROM CR_ODR t4 WHERE "
+ + "((t4.quantity >= ("
+ + "SELECT AVG(t1.quantity) "
+ "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID ) AND "
+ "t4.quantity <= ("
+ "SELECT MIN(t3.quantity) "
- + "FROM CR_CUST t2 INNER JOIN CR_ODR t3 ON t2.id = t3.CUSTOMER_ID ))";
+ + "FROM CR_CUST t2 INNER JOIN CR_ODR t3 ON t2.id = t3.CUSTOMER_ID )))";
+
execute(jpql, expectedSQL);
}

@@ -606,10 +626,11 @@
+ "WHERE m3.idPublisher.id = p.id)) ";

String expectedSQL = "SELECT t0.id, t1.id, t1.date_published, t1.id_publisher, t1.name "
- + "FROM Publisher t0 LEFT OUTER JOIN Magazine t1 ON t0.id = t1.id_publisher WHERE (t1.id = ("
- + "SELECT MAX(t2.id) FROM Magazine t2 WHERE ("
+ + "FROM Publisher t0 LEFT OUTER JOIN Magazine t1 ON t0.id = t1.id_publisher WHERE "
+ + "(t1.id = ("
+ + "SELECT MAX(t2.id) FROM Magazine t2 WHERE (("
+ "t2.id_publisher = t0.id AND "
- + "t2.id = (SELECT MAX(t3.id) FROM Magazine t3 WHERE (t3.id_publisher = t0.id) )) ))";
+ + "t2.id = (SELECT MAX(t3.id) FROM Magazine t3 WHERE (t3.id_publisher = t0.id) ))) ))";
execute(jpql, expectedSQL);
}

@@ -633,7 +654,7 @@
+ "o.id)";
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 ("
- + "t3.quantity > ? AND t2.quantity > ? AND t3.id = t2.id) ))";
+ + "(t3.quantity > ? AND (t2.quantity > ? AND t3.id = t2.id))) ))";
execute(jpql, expectedSQL);
}

@@ -821,6 +842,39 @@
}
}
}
+
+ public void testCorrelatedNestedSubquery1() {
+ String jpql = "Select Object (c) From Customer c Where Not Exists ("
+ + " Select a.id From Account As a Where "
+ + " a.customer = c And "
+ + " exists (select o.id from Order o where o.customer = c and o.count = 1))";
+
+ String expectedSQL = "SELECT t1.id, t1.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, "
+ + "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, "
+ + "t1.balanceOwed, t1.creditRating, t1.filledOrderCount, t1.firstName, t1.lastName, t1.name, "
+ + "t1.status "
+ + "FROM CR_CUST t1 LEFT OUTER JOIN CR_ADDR t3 ON t1.ADDRESS_ID = t3.id "
+ + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (NOT (EXISTS ("
+ + "SELECT t0.id FROM CR_ACCT t0 WHERE ((t0.CUSTOMER_ID = t1.id AND EXISTS ("
+ + "SELECT t2.id FROM CR_ODR t2 WHERE ((t2.CUSTOMER_ID = t1.id AND t2.count = ?)) ))) )))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testCorrelatedNestedSubquery1a() {
+ String jpql = "Select Object (o) From Product o Where Not Exists ("
+ + " Select a.id From Account As a Where "
+ + " a.product = o And "
+ + " exists (select r.id from Request r where r.account = a and r.status = 1))";
+
+ String expectedSQL = "SELECT t1.pid, t1.version, t1.productType FROM CR_PRDT t1 WHERE (NOT (EXISTS ("
+ + "SELECT t0.id FROM CR_ACCT t0 WHERE ((t0.PRODUCT_PID = t1.pid AND EXISTS ("
+ + "SELECT t2.id FROM Request t2 WHERE ((t2.ACCOUNT_ID = t0.id AND t2.status = ?)) ))) )))";
+
+ execute(jpql, expectedSQL);
+ }
+
+

void execute(String jpql, String expectedSQL) {
sql.clear();

svn commit: r790951 - in /openjpa/branches/subquery: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ openjpa-persistenc...

2009-07-03T08:53:57Z

Author: faywang
Date: Fri Jul 3 15:53:56 2009
New Revision: 790951

URL: http://svn.apache.org/viewvc?rev=790951&view=rev
Log:
fix cross join and subquery

Modified:
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java?rev=790951&r1=790950&r2=790951&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java Fri Jul 3 15:53:56 2009
@@ -106,6 +106,7 @@
_type = UNBOUND_VAR;
action.op = Action.UNBOUND_VAR;
action.data = var;
+ _schemaAlias = var.getName();
} else {
// bound variable; copy path
_type = UNACCESSED_VAR;
@@ -511,7 +512,16 @@
if (rel == null)
throw new IllegalArgumentException(_loc.get(
"invalid-unbound-var", var.getName()).toString());
- pstate.joins = pstate.joins.setVariable(var.getName());
+
+ if (sel.getParent() != null && action.var != null &&
+ sel.ctx().getVariable(action.var) == null) {
+ System.out.println("action var="+action.var);
+ isCorrelatedPath = true;
+ pstate.joins = pstate.joins.setCorrelatedVariable(var.getName());
+ } else
+
+ pstate.joins = pstate.joins.setVariable(var.getName());
+
pstate.joins = pstate.joins.crossJoin(_candidate.getTable(),
rel.getTable());
} else {

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java?rev=790951&r1=790950&r2=790951&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java Fri Jul 3 15:53:56 2009
@@ -2781,9 +2781,14 @@
// until we get past the local table
String var = this.var;
this.var = null;
+ Context ctx = context;
+ context = null;

int alias1 = _sel.getTableIndex(localTable, this, true);
this.append(var);
+ this.append(correlatedVar);
+ context = ctx;
+
int alias2 = _sel.getTableIndex(foreignTable, this, true);
Join j = new Join(localTable, alias1, foreignTable, alias2,
null, false);
@@ -2792,7 +2797,10 @@
if (_joins == null)
_joins = new JoinSet();
_joins.add(j);
+ setCorrelated(j);
_outer = false;
+ lastContext = context;
+ context = null;
return this;
}

Modified: openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java?rev=790951&r1=790950&r2=790951&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java (original)
+++ openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java Fri Jul 3 15:53:56 2009
@@ -143,7 +143,9 @@
}

public ClassMetaData getSchema(String id) {
- return schemas.get(id.toLowerCase());
+ if (id != null)
+ return schemas.get(id.toLowerCase());
+ return null;
}

/**

Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java?rev=790951&r1=790950&r2=790951&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Fri Jul 3 15:53:56 2009
@@ -585,17 +585,15 @@
execute(jpql, expectedSQL);
}

- // a correated JPQL generates non correlated SQL
public void testSubquery13() {
String jpql = "select o1.id, c.name from Order o1, Customer c"
+ " where o1.quantity = "
+ " any(select o2.quantity from in(c.orders) o2)";

- String expectedSQL = "SELECT t0.id, t1.name "
- + "FROM CR_ODR t0 JOIN CR_CUST t1 ON (1 = 1) WHERE (t0.quantity = ANY ("
- + "SELECT t4.quantity "
- + "FROM CR_ODR t0 JOIN CR_CUST t2 ON (1 = 1) "
- + "INNER JOIN CR_ODR t3 ON t2.id = t3.CUSTOMER_ID, CR_ODR t4 WHERE (t3.id = t4.id) ))";
+ String expectedSQL = "SELECT t0.id, t1.name " +
+ "FROM CR_ODR t0 JOIN CR_CUST t1 ON (1 = 1) 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) ))";
+
execute(jpql, expectedSQL);
}

svn commit: r790761 - /openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java

2009-07-02T16:24:32Z

Author: faywang
Date: Thu Jul 2 23:24:32 2009
New Revision: 790761

URL: http://svn.apache.org/viewvc?rev=790761&view=rev
Log:
update subquery test case

Modified:
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java

Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java?rev=790761&r1=790760&r2=790761&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java Thu Jul 2 23:24:32 2009
@@ -18,13 +18,12 @@
*/
package org.apache.openjpa.persistence.criteria;

+import java.util.Date;
import java.util.List;

import javax.persistence.PersistenceException;
import javax.persistence.Query;

-import org.apache.openjpa.persistence.test.AllowFailure;
-
/**
* Tests type-strict version of Criteria API.
*
@@ -41,12 +40,12 @@
String jpql = "SELECT goodCustomer FROM Customer goodCustomer WHERE "
+ "goodCustomer.balanceOwed < (SELECT AVG(c.balanceOwed) "
+ " FROM Customer c)";
- String expectedSQL = "SELECT t0.id, t0.accountNum, t2.id, t2.city, t2.country, t2.county, t2.state, " +
- "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, " +
- "t0.balanceOwed, t0.creditRating, t0.filledOrderCount, t0.firstName, t0.lastName, t0.name, t0.status " +
- "FROM CR_CUST t0 LEFT OUTER JOIN CR_ADDR t2 ON t0.ADDRESS_ID = t2.id " +
- "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID " +
- "WHERE (t0.balanceOwed < (SELECT AVG(t1.balanceOwed) FROM CR_CUST t1 ))";
+ String expectedSQL = "SELECT t0.id, t0.accountNum, t2.id, t2.city, t2.country, t2.county, t2.state, "
+ + "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, "
+ + "t0.balanceOwed, t0.creditRating, t0.filledOrderCount, t0.firstName, t0.lastName, t0.name, t0.status "
+ + "FROM CR_CUST t0 LEFT OUTER JOIN CR_ADDR t2 ON t0.ADDRESS_ID = t2.id "
+ + "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID "
+ + "WHERE (t0.balanceOwed < (SELECT AVG(t1.balanceOwed) FROM CR_CUST t1 ))";

execute(jpql, expectedSQL);
}
@@ -55,19 +54,20 @@
String jpql = "SELECT DISTINCT emp FROM Employee emp WHERE EXISTS ("
+ "SELECT spouseEmp FROM Employee spouseEmp WHERE spouseEmp ="
+ " emp.spouse)";
- String expectedSQL = "SELECT t1.empId, t1.EMP_TYPE, t2.id, t2.city, t2.country, t2.county, t2.state, " +
- "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, t4.deptNo, " +
- "t4.name, t5.id, t5.annualMiles, t5.name, t6.id, t7.deptNo, t7.name, t6.name, t6.salary, t1.name, " +
- "t1.rating, t1.salary, t8.empId, t8.EMP_TYPE, t8.ADDRESS_ID, t8.DEPARTMENT_DEPTNO, t8.FREQUENTFLIERPLAN_ID, " +
- "t8.MANAGER_ID, t8.name, t8.rating, t8.salary, t8.hireDate, t1.hireDate " +
- "FROM CR_EMP t1 LEFT OUTER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id " +
- "LEFT OUTER JOIN CR_DEPT t4 ON t1.DEPARTMENT_DEPTNO = t4.deptNo " +
- "LEFT OUTER JOIN FrequentFlierPlan t5 ON t1.FREQUENTFLIERPLAN_ID = t5.id " +
- "LEFT OUTER JOIN CR_MGR t6 ON t1.MANAGER_ID = t6.id " +
- "LEFT OUTER JOIN CR_EMP t8 ON t1.SPOUSE_EMPID = t8.empId " +
- "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID " +
- "LEFT OUTER JOIN CR_DEPT t7 ON t6.DEPARTMENT_DEPTNO = t7.deptNo " +
- "WHERE (EXISTS (SELECT t0.empId FROM CR_EMP t0 WHERE (t0.empId = t1.SPOUSE_EMPID) ))";
+ String expectedSQL = "SELECT t1.empId, t1.EMP_TYPE, t2.id, t2.city, t2.country, t2.county, t2.state, "
+ + "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, t4.deptNo, "
+ + "t4.name, t5.id, t5.annualMiles, t5.name, t6.id, t7.deptNo, t7.name, t6.name, t6.salary, t1.name, "
+ + "t1.rating, t1.salary, t8.empId, t8.EMP_TYPE, t8.ADDRESS_ID, t8.DEPARTMENT_DEPTNO, "
+ + "t8.FREQUENTFLIERPLAN_ID, "
+ + "t8.MANAGER_ID, t8.name, t8.rating, t8.salary, t8.hireDate, t1.hireDate "
+ + "FROM CR_EMP t1 LEFT OUTER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id "
+ + "LEFT OUTER JOIN CR_DEPT t4 ON t1.DEPARTMENT_DEPTNO = t4.deptNo "
+ + "LEFT OUTER JOIN FrequentFlierPlan t5 ON t1.FREQUENTFLIERPLAN_ID = t5.id "
+ + "LEFT OUTER JOIN CR_MGR t6 ON t1.MANAGER_ID = t6.id "
+ + "LEFT OUTER JOIN CR_EMP t8 ON t1.SPOUSE_EMPID = t8.empId "
+ + "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID "
+ + "LEFT OUTER JOIN CR_DEPT t7 ON t6.DEPARTMENT_DEPTNO = t7.deptNo "
+ + "WHERE (EXISTS (SELECT t0.empId FROM CR_EMP t0 WHERE (t0.empId = t1.SPOUSE_EMPID) ))";

execute(jpql, expectedSQL);
}
@@ -76,33 +76,34 @@
String jpql = "SELECT emp FROM Employee emp WHERE emp.salary > ALL ("
+ "SELECT m.salary FROM Manager m WHERE m.department = "
+ "emp.department)";
- String expectedSQL = "SELECT t0.empId, t0.EMP_TYPE, t2.id, t2.city, t2.country, t2.county, t2.state, " +
- "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, t4.deptNo, " +
- "t4.name, t5.id, t5.annualMiles, t5.name, t6.id, t7.deptNo, t7.name, t6.name, t6.salary, t0.name, " +
- "t0.rating, t0.salary, t8.empId, t8.EMP_TYPE, t8.ADDRESS_ID, t8.DEPARTMENT_DEPTNO, " +
- "t8.FREQUENTFLIERPLAN_ID, t8.MANAGER_ID, t8.name, t8.rating, t8.salary, t8.hireDate, t0.hireDate " +
- "FROM CR_EMP t0 LEFT OUTER JOIN CR_ADDR t2 ON t0.ADDRESS_ID = t2.id " +
- "LEFT OUTER JOIN CR_DEPT t4 ON t0.DEPARTMENT_DEPTNO = t4.deptNo " +
- "LEFT OUTER JOIN FrequentFlierPlan t5 ON t0.FREQUENTFLIERPLAN_ID = t5.id " +
- "LEFT OUTER JOIN CR_MGR t6 ON t0.MANAGER_ID = t6.id " +
- "LEFT OUTER JOIN CR_EMP t8 ON t0.SPOUSE_EMPID = t8.empId " +
- "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID " +
- "LEFT OUTER JOIN CR_DEPT t7 ON t6.DEPARTMENT_DEPTNO = t7.deptNo " +
- "WHERE (t0.salary > ALL (SELECT t1.salary " +
- "FROM CR_MGR t1 WHERE (t1.DEPARTMENT_DEPTNO = t0.DEPARTMENT_DEPTNO) ))";
+ String expectedSQL = "SELECT t0.empId, t0.EMP_TYPE, t2.id, t2.city, t2.country, t2.county, t2.state, "
+ + "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, t4.deptNo, "
+ + "t4.name, t5.id, t5.annualMiles, t5.name, t6.id, t7.deptNo, t7.name, t6.name, t6.salary, t0.name, "
+ + "t0.rating, t0.salary, t8.empId, t8.EMP_TYPE, t8.ADDRESS_ID, t8.DEPARTMENT_DEPTNO, "
+ + "t8.FREQUENTFLIERPLAN_ID, t8.MANAGER_ID, t8.name, t8.rating, t8.salary, t8.hireDate, t0.hireDate "
+ + "FROM CR_EMP t0 LEFT OUTER JOIN CR_ADDR t2 ON t0.ADDRESS_ID = t2.id "
+ + "LEFT OUTER JOIN CR_DEPT t4 ON t0.DEPARTMENT_DEPTNO = t4.deptNo "
+ + "LEFT OUTER JOIN FrequentFlierPlan t5 ON t0.FREQUENTFLIERPLAN_ID = t5.id "
+ + "LEFT OUTER JOIN CR_MGR t6 ON t0.MANAGER_ID = t6.id "
+ + "LEFT OUTER JOIN CR_EMP t8 ON t0.SPOUSE_EMPID = t8.empId "
+ + "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID "
+ + "LEFT OUTER JOIN CR_DEPT t7 ON t6.DEPARTMENT_DEPTNO = t7.deptNo "
+ + "WHERE (t0.salary > ALL (SELECT t1.salary "
+ + "FROM CR_MGR t1 WHERE (t1.DEPARTMENT_DEPTNO = t0.DEPARTMENT_DEPTNO) ))";
execute(jpql, expectedSQL);
}

public void testSubqueries4() {
String jpql = "SELECT c FROM Customer c WHERE "
+ "(SELECT COUNT(o) FROM c.orders o) > 10";
- String expectedSQL = "SELECT t0.id, t0.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, " +
- "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, t0.balanceOwed, " +
- "t0.creditRating, " + "t0.filledOrderCount, t0.firstName, t0.lastName, t0.name, t0.status " +
- "FROM CR_CUST t0 LEFT OUTER JOIN CR_ADDR t3 ON t0.ADDRESS_ID = t3.id " +
- "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID " +
- "WHERE ((SELECT COUNT(t2.id) FROM CR_ODR t1, CR_ODR t2 WHERE (t1.id = t2.id) AND " +
- "(t0.id = t1.CUSTOMER_ID) ) > ?)";
+ String expectedSQL = "SELECT t0.id, t0.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, "
+ + "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, "
+ + "t0.balanceOwed, t0.creditRating, "
+ + "t0.filledOrderCount, t0.firstName, t0.lastName, t0.name, t0.status "
+ + "FROM CR_CUST t0 LEFT OUTER JOIN CR_ADDR t3 ON t0.ADDRESS_ID = t3.id "
+ + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID "
+ + "WHERE ((SELECT COUNT(t2.id) FROM CR_ODR t1, CR_ODR t2 WHERE (t1.id = t2.id) AND "
+ + "(t0.id = t1.CUSTOMER_ID) ) > ?)";

execute(jpql, expectedSQL);
}
@@ -110,41 +111,40 @@
public void testSubqueries4a() {
String jpql = "SELECT c FROM Customer c WHERE "
+ "(SELECT COUNT(o) FROM Customer c1 JOIN c1.orders o WHERE c = c1) > 10";
- String expectedSQL = "SELECT t2.id, t2.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, " +
- "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, t2.balanceOwed, " +
- "t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, t2.name, t2.status " +
- "FROM CR_CUST t2 LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " +
- "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID " +
- "WHERE ((SELECT COUNT(t1.id) " +
- "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE (t2.id = t0.id) ) > ?)";
+ String expectedSQL = "SELECT t2.id, t2.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, "
+ + "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, "
+ + "t2.balanceOwed, t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, t2.name, t2.status "
+ + "FROM CR_CUST t2 LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id "
+ + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID "
+ + "WHERE ((SELECT COUNT(t1.id) "
+ + "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE (t2.id = t0.id) ) > ?)";

-
execute(jpql, expectedSQL);
}
-
+
public void testSubqueries4b() {
String jpql = "SELECT c FROM Customer c WHERE "
+ "(SELECT COUNT(o) FROM Customer c1 JOIN c1.orders o WHERE c.id = c1.id) > 10";
-
- String expectedSQL = "SELECT t2.id, t2.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, " +
- "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, t2.balanceOwed, " +
- "t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, t2.name, t2.status " +
- "FROM CR_CUST t2 LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " +
- "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID " +
- "WHERE ((SELECT COUNT(t1.id) " +
- "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE (t2.id = t0.id) ) > ?)";
+
+ String expectedSQL = "SELECT t2.id, t2.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, "
+ + "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, "
+ + "t2.balanceOwed, t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, t2.name, t2.status "
+ + "FROM CR_CUST t2 LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id "
+ + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID "
+ + "WHERE ((SELECT COUNT(t1.id) "
+ + "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE (t2.id = t0.id) ) > ?)";
execute(jpql, expectedSQL);
- }
-
+ }
+
public void testSubqueries4c() {
String jpql = "SELECT c FROM Customer c WHERE "
+ "(SELECT COUNT(o) FROM Customer c1 JOIN c1.orders o) > 10";
- String expectedSQL = "SELECT t2.id, t2.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, " +
- "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, t2.balanceOwed, " +
- "t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, t2.name, t2.status " +
- "FROM CR_CUST t2 LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " +
- "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID " +
- "WHERE ((SELECT COUNT(t1.id) FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID ) > ?)";
+ String expectedSQL = "SELECT t2.id, t2.accountNum, t3.id, t3.city, t3.country, t3.county, t3.state, "
+ + "t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, t4.name, t3.zipCode, "
+ + "t2.balanceOwed, t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, t2.name, t2.status "
+ + "FROM CR_CUST t2 LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id "
+ + "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID "
+ + "WHERE ((SELECT COUNT(t1.id) FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID ) > ?)";

execute(jpql, expectedSQL);
}
@@ -153,19 +153,19 @@
String jpql = "SELECT c FROM Customer c WHERE (SELECT COUNT(o) "
+ "FROM Customer c1 JOIN c1.orders o WHERE c.address.county = c1.address.county) > 10";

- String expectedSQL = "SELECT t2.id, t2.accountNum, t5.id, t5.city, t5.country, t5.county, " +
- "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, " +
- "t5.zipCode, t2.balanceOwed, t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, " +
- "t2.name, t2.status " +
- "FROM CR_CUST t2 " +
- "INNER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " +
- "LEFT OUTER JOIN CR_ADDR t5 ON t2.ADDRESS_ID = t5.id " +
- "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID " +
- "WHERE ((SELECT COUNT(t1.id) " +
- "FROM CR_CUST t0 " +
- "INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID " +
- "INNER JOIN CR_ADDR t4 ON t0.ADDRESS_ID = t4.id " +
- "WHERE (t3.county = t4.county) ) > ?)";
+ String expectedSQL = "SELECT t2.id, t2.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, "
+ + "t5.zipCode, t2.balanceOwed, t2.creditRating, t2.filledOrderCount, t2.firstName, t2.lastName, "
+ + "t2.name, t2.status "
+ + "FROM CR_CUST t2 "
+ + "INNER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t2.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID "
+ + "WHERE ((SELECT COUNT(t1.id) "
+ + "FROM CR_CUST t0 "
+ + "INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID "
+ + "INNER JOIN CR_ADDR t4 ON t0.ADDRESS_ID = t4.id "
+ + "WHERE (t3.county = t4.county) ) > ?)";

execute(jpql, expectedSQL);
}
@@ -173,13 +173,16 @@
public void testSubqueries5() {
String jpql = "SELECT o FROM Order o WHERE 10000 < ALL ("
+ "SELECT a.balance FROM o.customer c JOIN c.accounts a)";
- String expectedSQL = "SELECT t3.id, t3.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, " +
- "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, " +
- "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, " +
- "t3.delivered, t3.name, t3.orderTs, t3.quantity, t3.totalCost FROM CR_ODR t3 LEFT OUTER JOIN CR_CUST t4 ON " +
- "t3.CUSTOMER_ID = t4.id LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id LEFT OUTER JOIN CompUser t6 ON " +
- "t5.id = t6.ADD_ID WHERE (? < ALL (SELECT t2.balance FROM CR_CUST t0 INNER JOIN CR_CUST_CR_ACCT t1 ON " +
- "t0.id = t1.CUSTOMER_ID INNER JOIN CR_ACCT t2 ON t1.ACCOUNTS_ID = t2.id WHERE (t3.CUSTOMER_ID = t0.id) ))";
+ String expectedSQL = "SELECT t3.id, t3.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, "
+ + "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, "
+ + "t3.delivered, t3.name, t3.orderTs, t3.quantity, t3.totalCost "
+ + "FROM CR_ODR t3 LEFT OUTER JOIN CR_CUST t4 ON t3.CUSTOMER_ID = t4.id "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID "
+ + "WHERE (? < ALL (SELECT t2.balance FROM CR_CUST t0 INNER JOIN CR_CUST_CR_ACCT t1 ON "
+ + "t0.id = t1.CUSTOMER_ID INNER JOIN CR_ACCT t2 ON t1.ACCOUNTS_ID = t2.id "
+ + "WHERE (t3.CUSTOMER_ID = t0.id) ))";

execute(jpql, expectedSQL);
}
@@ -187,33 +190,33 @@
public void testSubqueries5a() {
String jpql = "SELECT o FROM Order o WHERE o.name = SOME ("
+ "SELECT a.name FROM o.customer c JOIN c.accounts a)";
- String expectedSQL = "SELECT t3.id, t3.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, " +
- "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, " +
- "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, " +
- "t3.delivered, t3.name, t3.orderTs, t3.quantity, t3.totalCost " +
- "FROM CR_ODR t3 LEFT OUTER JOIN CR_CUST t4 ON t3.CUSTOMER_ID = t4.id " +
- "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id " +
- "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID " +
- "WHERE (t3.name = ANY (SELECT t2.name " +
- "FROM CR_CUST t0 INNER JOIN CR_CUST_CR_ACCT t1 ON t0.id = t1.CUSTOMER_ID " +
- "INNER JOIN CR_ACCT t2 ON t1.ACCOUNTS_ID = t2.id WHERE (t3.CUSTOMER_ID = t0.id) ))";
+ String expectedSQL = "SELECT t3.id, t3.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, "
+ + "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, "
+ + "t3.delivered, t3.name, t3.orderTs, t3.quantity, t3.totalCost "
+ + "FROM CR_ODR t3 LEFT OUTER JOIN CR_CUST t4 ON t3.CUSTOMER_ID = t4.id "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID "
+ + "WHERE (t3.name = ANY (SELECT t2.name "
+ + "FROM CR_CUST t0 INNER JOIN CR_CUST_CR_ACCT t1 ON t0.id = t1.CUSTOMER_ID "
+ + "INNER JOIN CR_ACCT t2 ON t1.ACCOUNTS_ID = t2.id WHERE (t3.CUSTOMER_ID = t0.id) ))";

execute(jpql, expectedSQL);
}
-
+
public void testSubqueries6() {
String jpql = "SELECT o FROM Order o JOIN o.customer c WHERE 10000 < "
+ "ALL (SELECT a.balance FROM c.accounts a)";
- String expectedSQL = "SELECT t0.id, t0.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, " +
- "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, " +
- "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, " +
- "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost " +
- "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id " +
- "LEFT OUTER JOIN CR_CUST t4 ON t0.CUSTOMER_ID = t4.id " +
- "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id " +
- "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (? < ALL (" +
- "SELECT t3.balance FROM CR_CUST_CR_ACCT t2, CR_ACCT t3 WHERE (t2.ACCOUNTS_ID = t3.id) AND " +
- "(t1.id = t2.CUSTOMER_ID) ))";
+ String expectedSQL = "SELECT t0.id, t0.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, "
+ + "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, "
+ + "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "LEFT OUTER JOIN CR_CUST t4 ON t0.CUSTOMER_ID = t4.id "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (? < ALL ("
+ + "SELECT t3.balance FROM CR_CUST_CR_ACCT t2, CR_ACCT t3 WHERE (t2.ACCOUNTS_ID = t3.id) AND "
+ + "(t1.id = t2.CUSTOMER_ID) ))";

execute(jpql, expectedSQL);
}
@@ -221,67 +224,68 @@
public void testSubqueries6a() {
String jpql = "SELECT o FROM Order o JOIN o.customer c WHERE o.name = "
+ "SOME (SELECT a.name FROM c.accounts a)";
- String expectedSQL = "SELECT t0.id, t0.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, " +
- "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, " +
- "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, " +
- "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost " +
- "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id " +
- "LEFT OUTER JOIN CR_CUST t4 ON t0.CUSTOMER_ID = t4.id " +
- "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id " +
- "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (t0.name = ANY (" +
- "SELECT t3.name FROM CR_CUST_CR_ACCT t2, CR_ACCT t3 WHERE (t2.ACCOUNTS_ID = t3.id) " +
- "AND (t1.id = t2.CUSTOMER_ID) ))";
+ String expectedSQL = "SELECT t0.id, t0.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, "
+ + "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, "
+ + "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "LEFT OUTER JOIN CR_CUST t4 ON t0.CUSTOMER_ID = t4.id "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (t0.name = ANY ("
+ + "SELECT t3.name FROM CR_CUST_CR_ACCT t2, CR_ACCT t3 WHERE (t2.ACCOUNTS_ID = t3.id) "
+ + "AND (t1.id = t2.CUSTOMER_ID) ))";

execute(jpql, expectedSQL);
}
-
+
public void testSubqueries6b() {
String jpql = "SELECT o FROM Order o JOIN o.customer c WHERE o.name = "
+ "SOME (SELECT a.county FROM c.address a)";
- String expectedSQL = "SELECT t0.id, t0.count, t3.id, t3.accountNum, t4.id, t4.city, t4.country, t4.county, " +
- "t4.state, t4.street, t5.userid, t5.DTYPE, t5.age, t5.compName, t5.creditRating, t5.name, t4.zipCode, " +
- "t3.balanceOwed, t3.creditRating, t3.filledOrderCount, t3.firstName, t3.lastName, t3.name, t3.status, " +
- "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost " +
- "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id " +
- "LEFT OUTER JOIN CR_CUST t3 ON t0.CUSTOMER_ID = t3.id " +
- "LEFT OUTER JOIN CR_ADDR t4 ON t3.ADDRESS_ID = t4.id " +
- "LEFT OUTER JOIN CompUser t5 ON t4.id = t5.ADD_ID WHERE (t0.name = ANY " +
- "(SELECT t2.county FROM CR_ADDR t2 WHERE (t1.ADDRESS_ID = t2.id) ))";
-;
+ String expectedSQL = "SELECT t0.id, t0.count, t3.id, t3.accountNum, t4.id, t4.city, t4.country, t4.county, "
+ + "t4.state, t4.street, t5.userid, t5.DTYPE, t5.age, t5.compName, t5.creditRating, t5.name, t4.zipCode, "
+ + "t3.balanceOwed, t3.creditRating, t3.filledOrderCount, t3.firstName, t3.lastName, t3.name, t3.status, "
+ + "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "LEFT OUTER JOIN CR_CUST t3 ON t0.CUSTOMER_ID = t3.id "
+ + "LEFT OUTER JOIN CR_ADDR t4 ON t3.ADDRESS_ID = t4.id "
+ + "LEFT OUTER JOIN CompUser t5 ON t4.id = t5.ADD_ID WHERE (t0.name = ANY "
+ + "(SELECT t2.county FROM CR_ADDR t2 WHERE (t1.ADDRESS_ID = t2.id) ))";
+ ;
execute(jpql, expectedSQL);
}

public void testSubqueries6c() {
String jpql = "SELECT o FROM Order o JOIN o.customer c WHERE 10000 < "
+ "ALL (SELECT u.age FROM c.address a JOIN a.user u)";
-
- String expectedSQL1 = "SELECT t0.id, t0.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, " +
- "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, " +
- "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, " +
- "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost " +
- "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id " +
- "LEFT OUTER JOIN CR_CUST t4 ON t0.CUSTOMER_ID = t4.id " +
- "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id " +
- "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (? < ALL (" +
- "SELECT t3.age FROM CR_ADDR t2 INNER JOIN CompUser t3 ON t2.id = t3.ADD_ID WHERE (t1.ADDRESS_ID = t2.id) ))";
-
+
+ String expectedSQL1 = "SELECT t0.id, t0.count, t4.id, t4.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, t5.zipCode, "
+ + "t4.balanceOwed, t4.creditRating, t4.filledOrderCount, t4.firstName, t4.lastName, t4.name, t4.status, "
+ + "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "LEFT OUTER JOIN CR_CUST t4 ON t0.CUSTOMER_ID = t4.id "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t4.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (? < ALL ("
+ + "SELECT t3.age FROM CR_ADDR t2 INNER JOIN CompUser t3 ON t2.id = t3.ADD_ID "
+ + "WHERE (t1.ADDRESS_ID = t2.id) ))";
+
execute(jpql, expectedSQL1);
}
-
+
public void testSubqueries6d() {
String jpql = "SELECT o FROM Order o JOIN o.customer c JOIN c.address a WHERE 10000 < "
+ "ALL (SELECT u.age FROM c.address a1 JOIN a1.user u WHERE a.city = a1.city)";
- String expectedSQL = "SELECT t2.id, t2.count, t5.id, t5.accountNum, t6.id, t6.city, t6.country, t6.county, " +
- "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, " +
- "t5.balanceOwed, t5.creditRating, t5.filledOrderCount, t5.firstName, t5.lastName, t5.name, t5.status, " +
- "t2.delivered, t2.name, t2.orderTs, t2.quantity, t2.totalCost " +
- "FROM CR_ODR t2 INNER JOIN CR_CUST t3 ON t2.CUSTOMER_ID = t3.id " +
- "LEFT OUTER JOIN CR_CUST t5 ON t2.CUSTOMER_ID = t5.id " +
- "INNER JOIN CR_ADDR t4 ON t3.ADDRESS_ID = t4.id " +
- "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id " +
- "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID WHERE (? < ALL (" +
- "SELECT t1.age FROM CR_ADDR t0 INNER JOIN CompUser t1 ON t0.id = t1.ADD_ID WHERE (t4.city = t0.city AND " +
- "t3.ADDRESS_ID = t0.id) ) AND 1 = 1)";
+ String expectedSQL = "SELECT t2.id, t2.count, t5.id, t5.accountNum, t6.id, t6.city, t6.country, t6.county, "
+ + "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, "
+ + "t5.balanceOwed, t5.creditRating, t5.filledOrderCount, t5.firstName, t5.lastName, t5.name, t5.status, "
+ + "t2.delivered, t2.name, t2.orderTs, t2.quantity, t2.totalCost "
+ + "FROM CR_ODR t2 INNER JOIN CR_CUST t3 ON t2.CUSTOMER_ID = t3.id "
+ + "LEFT OUTER JOIN CR_CUST t5 ON t2.CUSTOMER_ID = t5.id "
+ + "INNER JOIN CR_ADDR t4 ON t3.ADDRESS_ID = t4.id "
+ + "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id "
+ + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID WHERE (? < ALL ("
+ + "SELECT t1.age FROM CR_ADDR t0 INNER JOIN CompUser t1 ON t0.id = t1.ADD_ID WHERE (t4.city = t0.city AND "
+ + "t3.ADDRESS_ID = t0.id) ) AND 1 = 1)";

execute(jpql, expectedSQL);
}
@@ -289,64 +293,518 @@
public void testSubqueries6e() {
String jpql = "SELECT o FROM Order o JOIN o.customer c JOIN c.address a WHERE 10000 < "
+ "ALL (SELECT u.age FROM a.user u)";
-
- String expectedSQL = "SELECT t0.id, t0.count, t5.id, t5.accountNum, t6.id, t6.city, t6.country, t6.county, " +
- "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, " +
- "t5.balanceOwed, t5.creditRating, t5.filledOrderCount, t5.firstName, t5.lastName, t5.name, t5.status, " +
- "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost " +
- "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id " +
- "LEFT OUTER JOIN CR_CUST t5 ON t0.CUSTOMER_ID = t5.id " +
- "INNER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id " +
- "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id " +
- "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID " +
- "WHERE (? < ALL (SELECT t4.age FROM CompUser t3, CompUser t4 " +
- "WHERE (t3.userid = t4.userid) AND (t2.id = t3.ADD_ID) ) AND 1 = 1)";
-
-
+
+ String expectedSQL = "SELECT t0.id, t0.count, t5.id, t5.accountNum, t6.id, t6.city, t6.country, t6.county, "
+ + "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, "
+ + "t5.balanceOwed, t5.creditRating, t5.filledOrderCount, t5.firstName, t5.lastName, t5.name, t5.status, "
+ + "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "LEFT OUTER JOIN CR_CUST t5 ON t0.CUSTOMER_ID = t5.id "
+ + "INNER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id "
+ + "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id "
+ + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID "
+ + "WHERE (? < ALL (SELECT t4.age FROM CompUser t3, CompUser t4 "
+ + "WHERE (t3.userid = t4.userid) AND (t2.id = t3.ADD_ID) ) AND 1 = 1)";
+
execute(jpql, expectedSQL);
}

public void testSubqueries6f() {
String jpql = "SELECT o FROM Order o JOIN o.customer c WHERE 10000 < "
+ "ALL (SELECT u.age FROM c.address.user u)";
-
- String expectedSQL = "SELECT t0.id, t0.count, t5.id, t5.accountNum, t6.id, t6.city, t6.country, t6.county, " +
- "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, " +
- "t5.balanceOwed, t5.creditRating, t5.filledOrderCount, t5.firstName, t5.lastName, t5.name, t5.status, " +
- "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost " +
- "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id " +
- "LEFT OUTER JOIN CR_CUST t5 ON t0.CUSTOMER_ID = t5.id " +
- "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id " +
- "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID " +
- "WHERE (? < ALL (SELECT t4.age " +
- "FROM CR_ADDR t2 INNER JOIN CompUser t3 ON t2.id = t3.ADD_ID, CompUser t4 " +
- "WHERE (t3.userid = t4.userid) AND (t1.ADDRESS_ID = t2.id) ))";

-
+ String expectedSQL = "SELECT t0.id, t0.count, t5.id, t5.accountNum, t6.id, t6.city, t6.country, t6.county, "
+ + "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, "
+ + "t5.balanceOwed, t5.creditRating, t5.filledOrderCount, t5.firstName, t5.lastName, t5.name, t5.status, "
+ + "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "LEFT OUTER JOIN CR_CUST t5 ON t0.CUSTOMER_ID = t5.id "
+ + "LEFT OUTER JOIN CR_ADDR t6 ON t5.ADDRESS_ID = t6.id "
+ + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID "
+ + "WHERE (? < ALL (SELECT t4.age "
+ + "FROM CR_ADDR t2 INNER JOIN CompUser t3 ON t2.id = t3.ADD_ID, CompUser t4 "
+ + "WHERE (t3.userid = t4.userid) AND (t1.ADDRESS_ID = t2.id) ))";
+
execute(jpql, expectedSQL);
}
-
+
// redundant t3
+ // compare to 6e, t3 should be in main query for LEFT OUTER JOIN
public void testSubqueries6g() {
String jpql = "SELECT o FROM Order o JOIN o.customer.address a WHERE 10000 < "
+ "ALL (SELECT u.age FROM a.user u)";
- String expectedSQL = "SELECT t0.id, t0.count, t1.id, t1.accountNum, t6.id, t6.city, t6.country, t6.county, " +
- "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, " +
- "t1.balanceOwed, t1.creditRating, t1.filledOrderCount, t1.firstName, t1.lastName, t1.name, t1.status, " +
- "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost " +
- "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id " +
- "INNER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id " +
- "LEFT OUTER JOIN CR_ADDR t6 ON t1.ADDRESS_ID = t6.id " +
- "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID WHERE (? < ALL (" +
- "SELECT t5.age FROM CR_CUST t3, CompUser t4, CompUser t5 " +
- "WHERE (t4.userid = t5.userid) AND (t0.CUSTOMER_ID = t3.id) AND (t2.id = t4.ADD_ID) ))";
+ String expectedSQL = "SELECT t0.id, t0.count, t1.id, t1.accountNum, t6.id, t6.city, t6.country, t6.county, "
+ + "t6.state, t6.street, t7.userid, t7.DTYPE, t7.age, t7.compName, t7.creditRating, t7.name, t6.zipCode, "
+ + "t1.balanceOwed, t1.creditRating, t1.filledOrderCount, t1.firstName, t1.lastName, t1.name, t1.status, "
+ + "t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "INNER JOIN CR_ADDR t2 ON t1.ADDRESS_ID = t2.id "
+ + "LEFT OUTER JOIN CR_ADDR t6 ON t1.ADDRESS_ID = t6.id "
+ + "LEFT OUTER JOIN CompUser t7 ON t6.id = t7.ADD_ID WHERE (? < ALL ("
+ + "SELECT t5.age FROM CR_CUST t3, CompUser t4, CompUser t5 "
+ + "WHERE (t4.userid = t5.userid) AND (t0.CUSTOMER_ID = t3.id) AND (t2.id = t4.ADD_ID) ))";

execute(jpql, expectedSQL);
- }
-
- void execute(String jpql, String expectedSQL) {
+ }
+
+ public void testExist1() {
+ String jpql = "SELECT DISTINCT c.name FROM CompUser c WHERE EXISTS"
+ + " (SELECT a FROM Address a WHERE a = c.address )";
+
+ String expectedSQL = "SELECT DISTINCT t1.name FROM CompUser t1 WHERE (EXISTS ("
+ + "SELECT t0.id FROM CR_ADDR t0 WHERE (t0.id = t1.ADD_ID) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testExist1a() {
+ String jpql = "SELECT DISTINCT o.name FROM CompUser o WHERE EXISTS"
+ + " (SELECT s FROM CompUser s WHERE s.address.country = "
+ + "o.address.country)";
+
+ String expectedSQL = "SELECT DISTINCT t2.name " + "FROM CompUser t2 "
+ + "INNER JOIN CR_ADDR t3 ON t2.ADD_ID = t3.id "
+ + "WHERE (EXISTS (" + "SELECT t0.userid " + "FROM CompUser t0 "
+ + "INNER JOIN CR_ADDR t1 ON t0.ADD_ID = t1.id "
+ + "WHERE (t1.country = t3.country) ))";
+
+ execute(jpql, expectedSQL);
+
+ }
+
+ public void testExist1b() {
+ String jpql = "select c from Customer c left join c.orders o where exists"
+ + " (select o2 from c.orders o2 where o2 = o)";
+
+ String expectedSQL = "SELECT t0.id, t0.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, "
+ + "t5.zipCode, t0.balanceOwed, t0.creditRating, t0.filledOrderCount, t0.firstName, t0.lastName, "
+ + "t0.name, t0.status "
+ + "FROM CR_CUST t0 "
+ + "LEFT OUTER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID "
+ + "LEFT OUTER JOIN CR_ODR t2 ON t0.id = t2.CUSTOMER_ID "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t0.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (EXISTS ("
+ + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE (t2.id = t4.id AND t3.id = t4.id) "
+ + "AND (t0.id = t3.CUSTOMER_ID) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testNotExist1() {
+ String jpql = "SELECT DISTINCT c.name FROM CompUser c WHERE NOT EXISTS"
+ + " (SELECT a FROM Address a WHERE a = c.address )";
+
+ String expectedSQL = "SELECT DISTINCT t1.name FROM CompUser t1 WHERE (NOT (EXISTS ("
+ + "SELECT t0.id FROM CR_ADDR t0 WHERE (t0.id = t1.ADD_ID) )))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testNotExist1a() {
+ String jpql = "select c from Customer c left join c.orders o where not exists"
+ + " (select o2 from c.orders o2 where o2 = o)";
+
+ String expectedSQL = "SELECT t0.id, t0.accountNum, t5.id, t5.city, t5.country, t5.county, "
+ + "t5.state, t5.street, t6.userid, t6.DTYPE, t6.age, t6.compName, t6.creditRating, t6.name, "
+ + "t5.zipCode, t0.balanceOwed, t0.creditRating, t0.filledOrderCount, t0.firstName, t0.lastName, "
+ + "t0.name, t0.status "
+ + "FROM CR_CUST t0 "
+ + "LEFT OUTER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID "
+ + "LEFT OUTER JOIN CR_ODR t2 ON t0.id = t2.CUSTOMER_ID "
+ + "LEFT OUTER JOIN CR_ADDR t5 ON t0.ADDRESS_ID = t5.id "
+ + "LEFT OUTER JOIN CompUser t6 ON t5.id = t6.ADD_ID WHERE (NOT (EXISTS ("
+ + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 WHERE (t2.id = t4.id AND t3.id = t4.id) "
+ + "AND (t0.id = t3.CUSTOMER_ID) )))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testAny() {
+ String jpql = "SELECT o.name FROM CompUser o "
+ + "WHERE o.address.zipCode = " + " ANY (SELECT s.computerName "
+ + " FROM CompUser s WHERE s.address.country IS NOT NULL)";
+
+ String expectedSQL = "SELECT t0.name "
+ + "FROM CompUser t0 "
+ + "INNER JOIN CR_ADDR t1 ON t0.ADD_ID = t1.id "
+ + "WHERE (t1.zipCode = ANY ("
+ + "SELECT t2.compName "
+ + "FROM CompUser t2 "
+ + "INNER JOIN CR_ADDR t3 ON t2.ADD_ID = t3.id WHERE (t3.country IS NOT NULL) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ // redundant t1
+ public void testSubquery01() {
+ String jpql = "select o1.id from Order o1 where o1.id in "
+ + " (select distinct o.id from LineItem i, Order o"
+ + " where i.quantity > 10 and o.count > 1000 and i.id = o.id)";
+
+ 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 ("
+ + "t3.quantity > ? AND t2.count > ? AND t3.id = t2.id) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery02() {
+ String jpql = "select o.id from Order o where o.customer.balanceOwed ="
+ + " (select max(o2.customer.balanceOwed) from Order o2"
+ + " where o.customer.id = o2.customer.id)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 "
+ + "INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id WHERE (t1.balanceOwed = ("
+ + "SELECT MAX(t3.balanceOwed) FROM CR_ODR t2 "
+ + "INNER JOIN CR_CUST t3 ON t2.CUSTOMER_ID = t3.id WHERE (t0.CUSTOMER_ID = t2.CUSTOMER_ID) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery03() {
+ String jpql = "select o from Order o where o.customer.balanceOwed ="
+ + " (select max(o2.customer.balanceOwed) from Order o2"
+ + " where o.customer.id = o2.customer.id)";
+
+ String expectedSQL = "SELECT t0.id, t0.count, t1.id, t1.accountNum, t4.id, t4.city, t4.country, "
+ + "t4.county, t4.state, t4.street, t5.userid, t5.DTYPE, t5.age, t5.compName, t5.creditRating, t5.name, "
+ + "t4.zipCode, t1.balanceOwed, t1.creditRating, t1.filledOrderCount, t1.firstName, t1.lastName, "
+ + "t1.name, t1.status, t0.delivered, t0.name, t0.orderTs, t0.quantity, t0.totalCost "
+ + "FROM CR_ODR t0 "
+ + "INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id "
+ + "LEFT OUTER JOIN CR_ADDR t4 ON t1.ADDRESS_ID = t4.id "
+ + "LEFT OUTER JOIN CompUser t5 ON t4.id = t5.ADD_ID WHERE (t1.balanceOwed = ("
+ + "SELECT MAX(t3.balanceOwed) FROM CR_ODR t2 "
+ + "INNER JOIN CR_CUST t3 ON t2.CUSTOMER_ID = t3.id WHERE (t0.CUSTOMER_ID = t2.CUSTOMER_ID) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery04() {
+ String jpql = "select o.id from Order o where o.quantity >"
+ + " (select count(i) from o.lineItems i)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.quantity > ("
+ + "SELECT COUNT(t2.id) FROM CR_LI t1, CR_LI t2 "
+ + "WHERE (t1.id = t2.id) AND (t0.id = t1.ORDER_ID) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery05() {
+ String jpql = "select o.id from Order o where o.quantity >"
+ + " (select count(o.quantity) from Order o)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.quantity > ("
+ + "SELECT COUNT(t1.quantity) FROM CR_ODR t1 ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery06() {
+ String jpql = "select o.id from Order o where o.quantity >"
+ + " (select count(o.id) from Order o)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.quantity > ("
+ + "SELECT COUNT(t1.id) FROM CR_ODR t1 ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery07() {
+ String jpql = "select o.id from Order o where o.quantity >"
+ + " (select avg(o.quantity) from Order o)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.quantity > ("
+ + "SELECT AVG(t1.quantity) FROM CR_ODR t1 ))";
+ execute(jpql, expectedSQL);
+
+ }
+
+ public void testSubquery08() {
+ String jpql = "select c.name from Customer c "
+ + "where exists (select o from c.orders o where o.id = 1) "
+ + "or exists (select o from c.orders o where o.id = 2)";
+
+ String expectedSQL = "SELECT t0.name FROM CR_CUST t0 WHERE (EXISTS ("
+ + "SELECT t2.id FROM CR_ODR t1, CR_ODR t2 "
+ + "WHERE (t2.id = ? AND t1.id = t2.id) AND (t0.id = t1.CUSTOMER_ID) ) OR EXISTS ("
+ + "SELECT t4.id FROM CR_ODR t3, CR_ODR t4 "
+ + "WHERE (t4.id = ? AND t3.id = t4.id) AND (t0.id = t3.CUSTOMER_ID) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery09() {
+ String jpql = "select c.name from Customer c, in(c.orders) o "
+ + "where o.quantity between "
+ + "(select max(o.quantity) from Order o) and "
+ + "(select avg(o.quantity) from Order o) ";
+
+ String expectedSQL = "SELECT t0.name "
+ + "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE ("
+ + "t1.quantity >= (SELECT MAX(t2.quantity) FROM CR_ODR t2 ) AND "
+ + "t1.quantity <= (SELECT AVG(t3.quantity) FROM CR_ODR t3 ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery10() {
+ String jpql = "select o.id from Order o where o.quantity >"
+ + " (select sum(o2.quantity) from Customer c, "
+ + "in(c.orders) o2) ";
+
+ String expectedSQL = "SELECT t2.id FROM CR_ODR t2 WHERE (t2.quantity > ("
+ + "SELECT SUM(t1.quantity) FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery11() {
+ String jpql = "select o.id from Order o where o.quantity between"
+ + " (select avg(o2.quantity) from Customer c, in(c.orders) o2)"
+ + " and (select min(o2.quantity) from Customer c, in(c.orders)"
+ + " o2)";
+
+ String expectedSQL = "SELECT t4.id FROM CR_ODR t4 WHERE (t4.quantity >= ("
+ + "SELECT AVG(t1.quantity) "
+ + "FROM CR_CUST t0 INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID ) AND "
+ + "t4.quantity <= ("
+ + "SELECT MIN(t3.quantity) "
+ + "FROM CR_CUST t2 INNER JOIN CR_ODR t3 ON t2.id = t3.CUSTOMER_ID ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery12() {
+ String jpql = "select o.id from Customer c, in(c.orders)o "
+ + "where o.quantity > (select sum(o2.quantity)"
+ + " from c.orders o2)";
+
+ String expectedSQL = "SELECT t1.id FROM CR_CUST t0 "
+ + "INNER JOIN CR_ODR t1 ON t0.id = t1.CUSTOMER_ID WHERE (t1.quantity > ("
+ + "SELECT SUM(t3.quantity) FROM CR_ODR t2, CR_ODR t3 "
+ + "WHERE (t2.id = t3.id) AND (t0.id = t2.CUSTOMER_ID) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ // a correated JPQL generates non correlated SQL
+ public void testSubquery13() {
+ String jpql = "select o1.id, c.name from Order o1, Customer c"
+ + " where o1.quantity = "
+ + " any(select o2.quantity from in(c.orders) o2)";
+
+ String expectedSQL = "SELECT t0.id, t1.name "
+ + "FROM CR_ODR t0 JOIN CR_CUST t1 ON (1 = 1) WHERE (t0.quantity = ANY ("
+ + "SELECT t4.quantity "
+ + "FROM CR_ODR t0 JOIN CR_CUST t2 ON (1 = 1) "
+ + "INNER JOIN CR_ODR t3 ON t2.id = t3.CUSTOMER_ID, CR_ODR t4 WHERE (t3.id = t4.id) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery14() {
+ String jpql = "SELECT p, m FROM Publisher p "
+ + "LEFT OUTER JOIN p.magazineCollection m "
+ + "WHERE m.id = (SELECT MAX(m2.id) FROM Magazine m2 "
+ + "WHERE m2.idPublisher.id = p.id AND m2.id = "
+ + "(SELECT MAX(m3.id) FROM Magazine m3 "
+ + "WHERE m3.idPublisher.id = p.id)) ";
+
+ String expectedSQL = "SELECT t0.id, t1.id, t1.date_published, t1.id_publisher, t1.name "
+ + "FROM Publisher t0 LEFT OUTER JOIN Magazine t1 ON t0.id = t1.id_publisher WHERE (t1.id = ("
+ + "SELECT MAX(t2.id) FROM Magazine t2 WHERE ("
+ + "t2.id_publisher = t0.id AND "
+ + "t2.id = (SELECT MAX(t3.id) FROM Magazine t3 WHERE (t3.id_publisher = t0.id) )) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery15() {
+ String jpql = "select o.id from Order o where o.delivered =(select "
+ + " CASE WHEN o2.quantity > 10 THEN true"
+ + " WHEN o2.quantity = 10 THEN false "
+ + " ELSE false END from Order o2"
+ + " where o.customer.id = o2.customer.id)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.delivered = ("
+ + "SELECT CASE WHEN t1.quantity > ? THEN 1 WHEN t1.quantity = ? THEN 0 ELSE 0 END "
+ + "FROM CR_ODR t1 WHERE (t0.CUSTOMER_ID = t1.CUSTOMER_ID) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery16() {
+ String jpql = "select o1.id from Order o1 where o1.quantity > "
+ + " (select o.quantity*2 from LineItem i, Order o"
+ + " where i.quantity > 10 and o.quantity > 1000 and i.id = "
+ + "o.id)";
+ 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 ("
+ + "t3.quantity > ? AND t2.quantity > ? AND t3.id = t2.id) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery17() {
+ 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 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) "
+ + "FROM CR_ODR t2 INNER JOIN CR_CUST t3 ON t2.CUSTOMER_ID = t3.id "
+ + "WHERE (t0.CUSTOMER_ID = t2.CUSTOMER_ID) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery18() {
+ String jpql = "select o.id from Order o where o.orderTs >"
+ + " (select CURRENT_TIMESTAMP from o.lineItems i)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.orderTs > ("
+ + "SELECT CURRENT_TIMESTAMP FROM CR_LI t1, CR_LI t2 WHERE (t1.id = t2.id) AND "
+ + "(t0.id = t1.ORDER_ID) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery19() {
+ String jpql = "select o.id from Order o where o.quantity >"
+ + " (select SQRT(o.quantity) from Order o where o.delivered"
+ + " = true)";
+
+ String expectedSQL = "SELECT t0.id FROM CR_ODR t0 WHERE (t0.quantity > ("
+ + "SELECT SQRT(t1.quantity) FROM CR_ODR t1 WHERE (t1.delivered = ?) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery20() {
+ 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 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))) "
+ + "FROM CR_ODR t0 INNER JOIN CR_CUST t1 ON t0.CUSTOMER_ID = t1.id WHERE (t0.quantity > ?) ))";
+
+ execute(jpql, expectedSQL);
+ }
+
+ public void testSubquery21() {
+ String jpql = "select c from Customer c where c.creditRating ="
+ + " (select " + " CASE WHEN o2.quantity > 10 THEN "
+ + " criteria1.Customer$CreditRating.POOR "
+ + " WHEN o2.quantity = 10 THEN "
+ + " criteria1.Customer$CreditRating.GOOD "
+ + " ELSE "
+ + " criteria1.Customer$CreditRating.EXCELLENT "
+ + " END " + " from Order o2 "
+ + " where c.id = o2.customer.id)";
+
+ String expectedSQL = "SELECT t0.id, t0.accountNum, t2.id, t2.city, t2.country, t2.county, t2.state, " +
+ "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, " +
+ "t0.balanceOwed, t0.creditRating, t0.filledOrderCount, t0.firstName, t0.lastName, t0.name, " +
+ "t0.status " +
+ "FROM CR_CUST t0 " +
+ "LEFT OUTER JOIN CR_ADDR t2 ON t0.ADDRESS_ID = t2.id " +
+ "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID " +
+ "WHERE (t0.creditRating = (" +
+ "SELECT CASE WHEN t1.quantity > ? THEN 0 WHEN t1.quantity = ? THEN 1 ELSE 2 END " +
+ "FROM CR_ODR t1 WHERE (t0.id = t1.CUSTOMER_ID) ))";
+ execute(jpql, expectedSQL);
+ }
+
+ //enum literal should be integer, not string
+ public void atestSubquery22() {
+ String jpql = "select c from Customer c "
+ + "where c.creditRating = (select COALESCE (c1.creditRating, "
+ + "criteria1.Customer$CreditRating.POOR) "
+ + "from Customer c1 where c1.name = 'Famzy') order by c.name "
+ + "DESC";
+
+ String expectedSQL = "SELECT t0.id, t0.accountNum, t2.id, t2.city, t2.country, t2.county, t2.state, " +
+ "t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, t2.zipCode, " +
+ "t0.balanceOwed, t0.creditRating, t0.filledOrderCount, t0.firstName, t0.lastName, t0.name, " +
+ "t0.status " +
+ "FROM CR_CUST t0 " +
+ "LEFT OUTER JOIN CR_ADDR t2 ON t0.ADDRESS_ID = t2.id " +
+ "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID WHERE (t0.creditRating = (" +
+ "SELECT COALESCE(t1.creditRating,'POOR') FROM CR_CUST t1 WHERE (t1.name = ?) )) " +
+ "ORDER BY t0.name DESC";
+ execute(jpql, expectedSQL);
+
+ }
+
+ public void testSubquery23() {
+ String jpql = "select c from Customer c "
+ + "where c.creditRating = (select NULLIF (c1.creditRating, "
+ + "org.apache.openjpa.persistence.criteria."
+ + "Customer$CreditRating.POOR) "
+ + "from Customer c1 where c1.name = 'Famzy') "
+ + "order by c.name DESC";
+
+ String expectedSQL = "SELECT t0.id, t0.accountNum, t2.id, t2.city, t2.country, t2.county, " +
+ "t2.state, t2.street, t3.userid, t3.DTYPE, t3.age, t3.compName, t3.creditRating, t3.name, " +
+ "t2.zipCode, t0.balanceOwed, t0.creditRating, t0.filledOrderCount, t0.firstName, t0.lastName, " +
+ "t0.name, t0.status " +
+ "FROM CR_CUST t0 " +
+ "LEFT OUTER JOIN CR_ADDR t2 ON t0.ADDRESS_ID = t2.id " +
+ "LEFT OUTER JOIN CompUser t3 ON t2.id = t3.ADD_ID WHERE (t0.creditRating = (" +
+ "SELECT NULLIF(t1.creditRating,0) FROM CR_CUST t1 WHERE (t1.name = ?) )) " +
+ "ORDER BY t0.name DESC";
+ execute(jpql, expectedSQL);
+
+ }
+
+ public void testSubquery24() {
+ String jpql = "select o from Order o where o.count > (select count(o) from Order o)";
+ String expectedSQL = "SELECT t0.id, t0.count, t2.id, t2.accountNum, t3.id, t3.city, t3.country, " +
+ "t3.county, t3.state, t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, " +
+ "t4.name, t3.zipCode, t2.balanceOwed, t2.creditRating, t2.filledOrderCount, t2.firstName, " +
+ "t2.lastName, t2.name, t2.status, t0.delivered, t0.name, t0.orderTs, t0.quantity, " +
+ "t0.totalCost " +
+ "FROM CR_ODR t0 " +
+ "LEFT OUTER JOIN CR_CUST t2 ON t0.CUSTOMER_ID = t2.id " +
+ "LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " +
+ "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (t0.count > (" +
+ "SELECT COUNT(t1.id) FROM CR_ODR t1 ))";
+ execute(jpql, expectedSQL);
+
+ }
+
+ public void testSubquery25() {
+ String jpql = "select o from Order o where o.count > (select count(o2) from Order o2)";
+
+ String expectedSQL = "SELECT t0.id, t0.count, t2.id, t2.accountNum, t3.id, t3.city, t3.country, " +
+ "t3.county, t3.state, t3.street, t4.userid, t4.DTYPE, t4.age, t4.compName, t4.creditRating, " +
+ "t4.name, t3.zipCode, t2.balanceOwed, t2.creditRating, t2.filledOrderCount, t2.firstName, " +
+ "t2.lastName, t2.name, t2.status, t0.delivered, t0.name, t0.orderTs, t0.quantity, " +
+ "t0.totalCost " +
+ "FROM CR_ODR t0 " +
+ "LEFT OUTER JOIN CR_CUST t2 ON t0.CUSTOMER_ID = t2.id " +
+ "LEFT OUTER JOIN CR_ADDR t3 ON t2.ADDRESS_ID = t3.id " +
+ "LEFT OUTER JOIN CompUser t4 ON t3.id = t4.ADD_ID WHERE (t0.count > (" +
+ "SELECT COUNT(t1.id) FROM CR_ODR t1 ))";
+ execute(jpql, expectedSQL);
+ }
+
+ /**
+ * this test scenario must use Dependent.java and DependentId.java in
+ * org.apache.openjpa.persistence.query package.
+ */
+ public void atestSubSelectMaxDateRange() {
+ String jpql = "SELECT e,d from Employee e, Dependent d "
+ + "WHERE e.empId = :empid "
+ + "AND d.id.empid = (SELECT MAX (e2.empId) FROM Employee e2) "
+ + "AND d.id.effDate > :minDate "
+ + "AND d.id.effDate < :maxDate ";
+ String expectedSQL = "SELECT t0.empId, t1.effDate, t1.empid, t1.name " +
+ "FROM CR_EMP t0 JOIN SUBQ_DEPENDENT t1 ON (1 = 1) " +
+ "WHERE (t0.empId = ? " +
+ "AND t1.empid = (SELECT MAX(t2.empId) FROM CR_EMP t2 ) " +
+ "AND t1.effDate > ? AND t1.effDate < ?)";
+
sql.clear();
Query jQ = em.createQuery(jpql);
+ jQ.setParameter("empid", (long) 101);
+ jQ.setParameter("minDate", new Date(100));
+ jQ.setParameter("maxDate", new Date(100000));
+
try {
List jList = jQ.getResultList();
} catch (PersistenceException e) {
@@ -356,7 +814,7 @@
e.printStackTrace();
fail("Wrong JPQL :" + jpql);
}
-
+
for (int i = 0; i < sql.size(); i++) {
String jSQL = sql.get(i).trim();
System.out.println("jSQL = " + sql.get(i));
@@ -366,5 +824,25 @@
}
}

+ void execute(String jpql, String expectedSQL) {
+ sql.clear();
+ Query jQ = em.createQuery(jpql);
+ try {
+ List jList = jQ.getResultList();
+ } catch (PersistenceException e) {
+ e.printStackTrace();
+ fail("Wrong SQL for JPQL :" + jpql + "\r\nSQL :" + sql.get(0));
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Wrong JPQL :" + jpql);
+ }

+ for (int i = 0; i < sql.size(); i++) {
+ String jSQL = sql.get(i).trim();
+ System.out.println("jSQL = " + sql.get(i));
+ if (expectedSQL != null) {
+ assertEquals(expectedSQL, jSQL);
+ }
+ }
+ }
}

svn commit: r790748 - in /openjpa/branches/subquery: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ openjpa-persistenc...

2009-07-02T15:09:53Z

Author: faywang
Date: Thu Jul 2 22:09:52 2009
New Revision: 790748

URL: http://svn.apache.org/viewvc?rev=790748&view=rev
Log:
fix exists/not exists problem

Modified:
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java
openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java?rev=790748&r1=790747&r2=790748&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java Thu Jul 2 22:09:52 2009
@@ -166,8 +166,9 @@
return new OrExpression((Exp) exp1, (Exp) exp2);
}

- public Expression not(Expression exp) {
- if (HasContainsExpressionVisitor.hasContains(exp))
+ public Expression not(Expression exp) {// fyw
+ if (!(exp instanceof IsNotEmptyExpression) &&
+ HasContainsExpressionVisitor.hasContains(exp))
return new NotContainsExpression((Exp) exp);
return new NotExpression((Exp) exp);
}

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java?rev=790748&r1=790747&r2=790748&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java Thu Jul 2 22:09:52 2009
@@ -45,7 +45,7 @@

private final ClassMapping _candidate;
private final boolean _subs;
- private final String _alias;
+ private final String _subqAlias;
private final SelectConstructor _cons = new SelectConstructor();

private Class _type = null;
@@ -60,7 +60,7 @@
public SubQ(ClassMapping candidate, boolean subs, String alias) {
_candidate = candidate;
_subs = subs;
- _alias = alias;
+ _subqAlias = alias;
_select = (((JDBCConfiguration) candidate.getMappingRepository().
getConfiguration()).getSQLFactoryInstance().newSelect());
_cons.setSubselect(_select);
@@ -102,7 +102,7 @@
}

public String getCandidateAlias() {
- return _alias;
+ return _subqAlias;
}

public void setQueryExpressions(QueryExpressions query) {
@@ -192,7 +192,7 @@
private void appendTo(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql, int index, boolean size) {
QueryExpressionsState substate = new QueryExpressionsState();
- Select sub = _cons.evaluate(ctx, sel, _alias, _exps, substate);
+ Select sub = _cons.evaluate(ctx, sel, _subqAlias, _exps, substate);
_cons.select(sub, ctx, _candidate, _subs, _exps, substate,
JDBCFetchConfiguration.EAGER_NONE);

Modified: openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java?rev=790748&r1=790747&r2=790748&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java (original)
+++ openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java Thu Jul 2 22:09:52 2009
@@ -2023,22 +2023,9 @@
boolean create) {
Integer i = null;
SelectImpl sel = this;
-
- //currCtx is set from Action, it is reset to null after the PCPath initialization
- Context currCtx = pj == null ? null : ((PathJoinsImpl)pj).context;
-
- // lastCtx is set to currCtx after the SelectJoins.join. pj.lastCtx and pj.path string are
- // the last snapshot of pj. They will be used together for later table alias resolution in
- // the getColumnAlias().
- Context lastCtx = pj == null ? null : ((PathJoinsImpl)pj).lastContext;
- Context thisCtx = currCtx == null ? lastCtx : currCtx;
- String corrVar = pj == null ? null : pj.getCorrelatedVariable();
-
String alias = _schemaAlias;
- if ((pj != null && pj.path() != null && (corrVar == null || ctx() == thisCtx)) ||
- table.isAssociation()) {
+ if (isPathInThisContext(pj) || table.isAssociation())
alias = null;
- }

// find the context where this alias is defined
Context ctx = (alias != null) ?
@@ -2062,6 +2049,20 @@
return i;
}

+ private boolean isPathInThisContext(PathJoins pj) {
+ // currCtx is set from Action, it is reset to null after the PCPath initialization
+ Context currCtx = pj == null ? null : ((PathJoinsImpl)pj).context;
+
+ // lastCtx is set to currCtx after the SelectJoins.join. pj.lastCtx and pj.path string are
+ // the last snapshot of pj. They will be used together for later table alias resolution in
+ // the getColumnAlias().
+ Context lastCtx = pj == null ? null : ((PathJoinsImpl)pj).lastContext;
+ Context thisCtx = currCtx == null ? lastCtx : currCtx;
+ String corrVar = pj == null ? null : pj.getCorrelatedVariable();
+
+ return (pj != null && pj.path() != null &&
+ (corrVar == null || (thisCtx != null && ctx() == thisCtx)));
+ }

private Integer getAlias(Table table, Object key) {
Integer alias = null;

Modified: openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=790748&r1=790747&r2=790748&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java (original)
+++ openjpa/branches/subquery/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java Thu Jul 2 22:09:52 2009
@@ -601,11 +601,12 @@

setCandidate(candidate, alias);

- Subquery subquery =
- factory.newSubquery(candidate, true, alias);
-
Context subContext = ctx();
- subContext.setSubquery(subquery);
+ Subquery subquery = ctx().getSubquery();
+ if (subquery == null){
+ subquery = factory.newSubquery(candidate, true, alias);
+ subContext.setSubquery(subquery);
+ }
Path subpath = factory.newPath(subquery);
subpath.setMetaData(candidate);
subquery.setMetaData(candidate);
@@ -635,14 +636,6 @@
// OPENJPA-15 support subquery's from clause do not start with
// identification_variable_declaration()
if (inner && ctx().getParent() != null && ctx().schemaAlias == null) {
-// ClassMetaData candidate = getFieldType(path.last());
-// setCandidate(candidate, alias.text);
-//
-// ctx().subquery = factory.newSubquery(candidate, true, alias.text);
-// Path subpath = factory.newPath(ctx().subquery);
-// subpath.setMetaData(candidate);
-// exp = bindVariableForSubPath(path, alias.text, exp);
-// exp = and(exp, factory.equal(path, subpath));
return getSubquery(alias.text, path, exp);
}

@@ -704,18 +697,6 @@
// clause, since we might be in a subquery against a collection
if (isPath(left)) {
Path path = getPath(left);
-// FieldMetaData fmd = path.last();
-// ClassMetaData candidate = getFieldType(fmd);
-//
-// if (candidate == null && fmd.isElementCollection())
-// candidate = fmd.getDefiningMetaData();
-//
-// setCandidate(candidate, alias);
-// exp = bindVariableForSubPath(path, alias, exp);
-//
-// Path subpath = factory.newPath(ctx().subquery);
-// subpath.setMetaData(ctx().subquery.getMetaData());
-// return and(exp, factory.equal(path, subpath));
return getSubquery(alias, path, exp);
} else {
// we have an alias: bind it as a variable

Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java?rev=790748&r1=790747&r2=790748&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java Thu Jul 2 22:09:52 2009
@@ -94,9 +94,8 @@
" (select count(o) from Order o)",
"select o from Order o where o.amount > " +
"(select count(o2) from Order o2)",
- // outstanding problem subqueries:
- // "select c from Customer c left join c.orders o where not exists"
- // + " (select o2 from c.orders o2 where o2 = o)",
+ "select c from Customer c left join c.orders o where not exists"
+ + " (select o2 from c.orders o2 where o2 = o)",
};

static String[] querys_jpa20 = new String[] {

svn commit: r790722 - in /openjpa/trunk/openjpa-integration/validation: ./ src/test/java/org/apache/openjpa/integration/validation/

2009-07-02T12:44:18Z

Author: dwoods
Date: Thu Jul 2 19:44:18 2009
New Revision: 790722

URL: http://svn.apache.org/viewvc?rev=790722&view=rev
Log:
OPENJPA-1106 Add tests for DecimalMin/Max constraints. Upgrade to agimatec 0.9.1-SNAPSHOT which has been updated to the 1.0.CR1 API level and now includes support for DecimalMin/Max constraints.

Added:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java (with props)
Modified:
openjpa/trunk/openjpa-integration/validation/pom.xml
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java

Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=790722&r1=790721&r2=790722&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Thu Jul 2 19:44:18 2009
@@ -67,7 +67,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.Beta4</version>
+ <version>1.0.CR1</version>
<scope>test</scope>
</dependency>
-->
@@ -79,13 +79,13 @@
<dependency>
<groupId>com.agimatec</groupId>
<artifactId>agimatec-jsr303</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.agimatec</groupId>
<artifactId>agimatec-validation</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>

Modified: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java?rev=790722&r1=790721&r2=790722&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java (original)
+++ openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java Thu Jul 2 19:44:18 2009
@@ -23,11 +23,19 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.AssertTrue;

+@NamedQueries( {
+ @NamedQuery(name="FindFirst",
+ query="select c from VBOOLEAN c where c.id = 1"),
+ @NamedQuery(name="FindAll", query="select c from VBOOLEAN c")
+})
+
@Entity(name = "VBOOLEAN")
@Table(name = "BOOLEAN_ENTITY")
public class ConstraintBoolean implements Serializable {

Added: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java?rev=790722&view=auto
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java (added)
+++ openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java Thu Jul 2 19:44:18 2009
@@ -0,0 +1,129 @@
+/*
+ * 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.integration.validation;
+
+import java.io.Serializable;
+//import java.math.BigDecimal;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
+
+
+@NamedQueries( {
+ @NamedQuery(name="FindFirst",
+ query="select c from VDECIMAL c where c.id = 1"),
+ @NamedQuery(name="FindAll", query="select c from VDECIMAL c")
+})
+
+@Entity(name = "VDECIMAL")
+@Table(name = "DECIMAL_ENTITY")
+public class ConstraintDecimal implements Serializable {
+
+ @Transient
+ private static final long serialVersionUID = 1L;
+
+ @Transient
+ //private static final BigDecimal negative = new BigDecimal(-99);
+ private static final long negative = -99;
+
+ @Transient
+ //private static final BigDecimal positive = new BigDecimal(99);
+ private static final long positive = 99;
+
+ @Id
+ @GeneratedValue
+ private long id;
+
+ @Basic
+ @DecimalMin(value = "0")
+ //private BigDecimal minZero;
+ private long minZero;
+
+ @Basic
+ @DecimalMax(value = "0")
+ //private BigDecimal maxZero;
+ private long maxZero;
+
+
+ /*
+ * Some helper methods to create the entities to test with
+ */
+ public static ConstraintDecimal createInvalidMin() {
+ ConstraintDecimal c = new ConstraintDecimal();
+ c.setMinZero(negative);
+ c.setMaxZero(negative);
+ return c;
+ }
+
+ public static ConstraintDecimal createInvalidMax() {
+ ConstraintDecimal c = new ConstraintDecimal();
+ c.setMinZero(positive);
+ c.setMaxZero(positive);
+ return c;
+ }
+
+ public static ConstraintDecimal createInvalidMinMax() {
+ ConstraintDecimal c = new ConstraintDecimal();
+ c.setMinZero(negative);
+ c.setMaxZero(positive);
+ return c;
+ }
+
+ public static ConstraintDecimal createValid() {
+ ConstraintDecimal c = new ConstraintDecimal();
+ c.setMinZero(positive);
+ c.setMaxZero(negative);
+ return c;
+ }
+
+
+ /*
+ * Main entity code
+ */
+ public ConstraintDecimal() {
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public long getMinZero() {
+ return minZero;
+ }
+
+ public void setMinZero(long d) {
+ minZero = d;
+ }
+
+ public long getMaxZero() {
+ return maxZero;
+ }
+
+ public void setMaxZero(long d) {
+ maxZero = d;
+ }
+}

Propchange: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDecimal.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java?rev=790722&r1=790721&r2=790722&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java (original)
+++ openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java Thu Jul 2 19:44:18 2009
@@ -29,22 +29,25 @@
* focusing on the following Validation scenarios:
*
* Check special update/delete/ignore cases once:
- * 1) Update @Null constraint exception on variables in mode=AUTO
- * Tests that a constraint violation will occur on invalid update.
- * 2) No invalid Delete @Null constraint exception when mode=AUTO
- * Tests that a violation will not occur when deleting invalid entity.
- * 3) No invalid Persist constraint exception when mode=NONE
- * Tests that no Validation Providers are used when disabled.
+ * 1) Update @Null constraint exception on variables in mode=AUTO
+ * Tests that a constraint violation will occur on invalid update.
+ * 2) No invalid Delete @Null constraint exception when mode=AUTO
+ * Tests that a violation will not occur when deleting invalid entity.
+ * 3) No invalid Persist constraint exception when mode=NONE
+ * Tests that no Validation Providers are used when disabled.
*
* Basic constraint tests for violation exceptions:
- * 4) Persist @Null constraint exception on variables in mode=AUTO
- * 5) Persist @NotNull constraint exception on variables in mode=AUTO
- * 7) Test @AssertTrue constraint exception on variables in mode=AUTO
- * 8) Test @AssertFalse constraint exception on variables in mode=AUTO
+ * 4) Persist @Null constraint exception on variables in mode=AUTO
+ * 5) Persist @NotNull constraint exception on variables in mode=AUTO
+ * 7) Test @AssertTrue constraint exception on variables in mode=AUTO
+ * 8) Test @AssertFalse constraint exception on variables in mode=AUTO
+ * 10) Test @DecimalMin constraint exception on variables in mode=AUTO
+ * 11) Test @DecimalMax constraint exception on variables in mode=AUTO
*
* Basic constraint test for no violations:
- * 6) Persist @NotNull and @Null constraints pass in mode=AUTO
- * 9) Test @AssertFalse and @AssertTrue constraints pass in mode=AUTO
+ * 6) Persist @NotNull and @Null constraints pass in mode=AUTO
+ * 9) Test @AssertFalse and @AssertTrue constraints pass in mode=AUTO
+ * 12) Test @DecimalMin and @DecimalMax constraints pass in mode=AUTO
*
* @version $Rev$ $Date$
*/
@@ -53,7 +56,8 @@
@Override
public void setUp() {
super.setUp(CLEAR_TABLES,
- ConstraintNull.class, ConstraintBoolean.class);
+ ConstraintNull.class, ConstraintBoolean.class,
+ ConstraintDecimal.class);
}

/**
@@ -86,6 +90,8 @@
fail("Caught unexpected exception = " + e);
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
}
@@ -152,6 +158,8 @@
fail("Unexpected Validation exception = " + e);
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
if ((emf != null) && emf.isOpen()) {
@@ -230,6 +238,8 @@
fail("Unexpected Validation exception = " + e);
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
if ((emf != null) && emf.isOpen()) {
@@ -267,6 +277,8 @@
getLog().trace("testNullConstraint() passed");
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
}
@@ -301,6 +313,8 @@
getLog().trace("testNotNullConstraint() passed");
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
}
@@ -330,9 +344,12 @@
getLog().trace("testNullNotNullConstraint() passed");
} catch (Exception e) {
// unexpected
+ getLog().trace("testNullNotNullConstraint() failed");
fail("Caught unexpected exception = " + e);
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
}
@@ -367,6 +384,8 @@
getLog().trace("testAssertTrueConstraint() passed");
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
}
@@ -401,6 +420,8 @@
getLog().trace("testAssertFalseConstraint() passed");
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
}
@@ -430,9 +451,119 @@
getLog().trace("testAssertTrueFalseConstraint() passed");
} catch (Exception e) {
// unexpected
+ getLog().trace("testAssertTrueFalseConstraint() failed");
+ fail("Caught unexpected exception = " + e);
+ } finally {
+ if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ em.close();
+ }
+ }
+ }
+
+ /**
+ * Scenario being tested:
+ * 10) Test @DecimalMin constraint exception on variables in mode=AUTO
+ * Basic constraint test for a violation exception.
+ */
+ public void testDecimalMinConstraint() {
+ getLog().trace("testDecimalMinConstraint() started");
+ // create EM from default EMF
+ OpenJPAEntityManager em = emf.createEntityManager();
+ assertNotNull(em);
+ try {
+ // verify Validation Mode
+ OpenJPAConfiguration conf = em.getConfiguration();
+ assertNotNull(conf);
+ assertTrue("ValidationMode",
+ conf.getValidationMode().equalsIgnoreCase("AUTO"));
+ // create invalid ConstraintBoolean instance
+ em.getTransaction().begin();
+ ConstraintDecimal c = ConstraintDecimal.createInvalidMin();
+ em.persist(c);
+ em.getTransaction().commit();
+ getLog().trace("testDecimalMinConstraint() failed");
+ fail("Expected a Validation exception");
+ } catch (Exception e) {
+ // expected
+ getLog().trace("Caught expected exception = " + e);
+ getLog().trace("testDecimalMinConstraint() passed");
+ } finally {
+ if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ em.close();
+ }
+ }
+ }
+
+ /**
+ * Scenario being tested:
+ * 11) Test @DecimalMax constraint exception on variables in mode=AUTO
+ * Basic constraint test for a violation exception.
+ */
+ public void testDecimalMaxConstraint() {
+ getLog().trace("testDecimalMaxConstraint() started");
+ // create EM from default EMF
+ OpenJPAEntityManager em = emf.createEntityManager();
+ assertNotNull(em);
+ try {
+ // verify Validation Mode
+ OpenJPAConfiguration conf = em.getConfiguration();
+ assertNotNull(conf);
+ assertTrue("ValidationMode",
+ conf.getValidationMode().equalsIgnoreCase("AUTO"));
+ // create invalid ConstraintBoolean instance
+ em.getTransaction().begin();
+ ConstraintDecimal c = ConstraintDecimal.createInvalidMax();
+ em.persist(c);
+ em.getTransaction().commit();
+ getLog().trace("testDecimalMaxConstraint() failed");
+ fail("Expected a Validation exception");
+ } catch (Exception e) {
+ // expected
+ getLog().trace("Caught expected exception = " + e);
+ getLog().trace("testDecimalMaxConstraint() passed");
+ } finally {
+ if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ em.close();
+ }
+ }
+ }
+
+ /**
+ * Scenario being tested:
+ * 12) Test @DecimalMin and @DecimalMax constraints pass in mode=AUTO
+ * Basic constraint test for no violations.
+ */
+ public void testDecimalMinMaxConstraint() {
+ getLog().trace("testDecimalMinMaxConstraint() started");
+ // create EM from default EMF
+ OpenJPAEntityManager em = emf.createEntityManager();
+ assertNotNull(em);
+ try {
+ // verify Validation Mode
+ OpenJPAConfiguration conf = em.getConfiguration();
+ assertNotNull(conf);
+ assertTrue("ValidationMode",
+ conf.getValidationMode().equalsIgnoreCase("AUTO"));
+ // create valid ConstraintBoolean instance
+ em.getTransaction().begin();
+ ConstraintDecimal c = ConstraintDecimal.createValid();
+ em.persist(c);
+ em.getTransaction().commit();
+ getLog().trace("testDecimalMinMaxConstraint() passed");
+ } catch (Exception e) {
+ // unexpected
+ getLog().trace("testDecimalMinMaxConstraint() failed");
fail("Caught unexpected exception = " + e);
} finally {
if ((em != null) && em.isOpen()) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
em.close();
}
}

svn propchange: r740763 - svn:log

2009-07-02T12:39:45Z

Author: mikedd
Revision: 740763
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:39:45 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:39:45 2009
@@ -1 +1,3 @@
-OPENJPA-772 committing patch provided by Donald Woods
+OPENJPA-772:
+Use ianal plugin to handle legal resources and better plugin management in pom.xml
+Submitted by :Donald Woods

svn propchange: r742775 - svn:log

2009-07-02T12:38:23Z

Author: mikedd
Revision: 742775
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:38:23 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:38:23 2009
@@ -1 +1,3 @@
-OPENJPA-876 committing patch provided by Donald Woods
+OPENJPA-876
+Improve DB2 and Oracle test profiles.
+Submitted By : Donald Woods

svn propchange: r748576 - svn:log

2009-07-02T12:37:08Z

Author: mikedd
Revision: 748576
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:37:08 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:37:08 2009
@@ -1 +1,3 @@
-OPENJPA-901 committing patch provided by Donald Woods.
+OPENJPA-901:
+Use hosted version of JAI artifacts instead of manually installing to local repository.
+Submitted by :Donald Woods.

svn propchange: r755396 - svn:log

2009-07-02T12:34:50Z

Author: mikedd
Revision: 755396
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:34:50 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:34:50 2009
@@ -1 +1,3 @@
-OPENJPA-970. Committing patch provided by Donald Woods
+OPENJPA-970:
+SchemaTool supports dropTables
+Submitted by:Donald Woods

svn propchange: r760914 - svn:log

2009-07-02T12:33:47Z

Author: mikedd
Revision: 760914
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:33:47 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:33:47 2009
@@ -1 +1,3 @@
-OPENJPA-975 committing patch from B.J. Reed
+OPENJPA-975:
+Omit escape ('\') for Oracle
+Submitted by: B.J. Reed

svn propchange: r761509 - svn:log

2009-07-02T12:32:41Z

Author: mikedd
Revision: 761509
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:32:41 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:32:41 2009
@@ -1 +1,3 @@
-OPENJPA-1015 fix line wrapping in source files. Based on patch contributed by B.J. Reed. Updates made to do enforce line wrapping during the process-sources phase of the build.
+OPENJPA-1015:
+Enforce 80 character column width for source files.
+Submitted by: B.J. Reed.

svn propchange: r761699 - svn:log

2009-07-02T12:31:37Z

Author: mikedd
Revision: 761699
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:31:37 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:31:37 2009
@@ -1 +1,3 @@
-OPENJPA-1015. Committing auditing patch from Donald Woods
+OPENJPA-1015:
+Show console ouput for files which fail checkstyle check
+Submitted by: Donald Woods

svn propchange: r762774 - svn:log

2009-07-02T12:30:26Z

Author: mikedd
Revision: 762774
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:30:26 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:30:26 2009
@@ -1 +1,3 @@
-OPENJPA-1015 committing plugin version patch from Donald Wodds.
+OPENJPA-1015:
+Add checkstyle plugin to pom.xml.
+Submitted by: Donald Wodds.

svn propchange: r769801 - svn:log

2009-07-02T12:28:13Z

Author: mikedd
Revision: 769801
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:28:13 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:28:13 2009
@@ -1 +1,3 @@
-OPENJPA-1025 committing patch provided by B.J. Reed. Removin subList method from AbstractResultList forcing subclasses to override the method
+OPENJPA-1025:
+Removing subList method from AbstractResultList forcing subclasses to override the method
+Submitted by :B.J. Reed.

svn propchange: r776411 - svn:log

2009-07-02T12:27:17Z

Author: mikedd
Revision: 776411
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:27:17 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:27:17 2009
@@ -1 +1,3 @@
-OPENJPA-918. Committing testcases based on patch provided by B.J. Reed
+OPENJPA-918:
+Handle return values from StoredProcedures properly.
+Submitted by : B.J. Reed

svn propchange: r776413 - svn:log

2009-07-02T12:25:25Z

Author: mikedd
Revision: 776413
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:25:25 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:25:25 2009
@@ -1 +1,3 @@
-OPENJPA-975. Committing patch from B.J. Reed.
+OPENJPA-975:
+Remove auto-generated escape('\') text from queries when using Oracle.
+Submitted by : B.J. Reed.

svn propchange: r777135 - svn:log

2009-07-02T12:24:12Z

Author: mikedd
Revision: 777135
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:24:12 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:24:12 2009
@@ -1 +1,3 @@
-OPENJPA-1015. Committing patch provided by BJ Reed. Additional testcases have been added which do not conform - I've updated some of them but some still exist so validation is not enabled by default
+OPENJPA-1015:
+Fixing code conventions (line length) for test classes.
+Submitted by: BJ Reed.

svn propchange: r779416 - svn:log

2009-07-02T12:15:05Z

Author: mikedd
Revision: 779416
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:15:05 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:15:05 2009
@@ -1 +1,3 @@
-OPENJPA-1026. Committing patch from B.J. Reed and enabling newline check.
+OPENJPA-1026:
+Add newlines at the end of files and make enable checkstyle configuration.
+Submitted by : B.J. Reed

svn propchange: r779715 - svn:log

2009-07-02T12:13:16Z

Author: mikedd
Revision: 779715
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:13:16 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:13:16 2009
@@ -1 +1,3 @@
-OPENJPA-1054 committing patch from Rick Curtis and Fay Wang. Testcase has been updated to use jMock instead of creating its own mock objects
+OPENJPA-1054:
+Handle LRS with MySQL.
+Submitted by: Rick Curtis and Fay Wang.

svn propchange: r780086 - svn:log

2009-07-02T12:11:31Z

Author: mikedd
Revision: 780086
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:11:31 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:11:31 2009
@@ -1 +1,3 @@
-OPENJPA-952. Committing patch from Rick Curtis
+OPENJPA-952:
+Use attach API to dynamically enhance classes.
+Submitted by: Rick Curtis

svn propchange: r781791 - svn:log

2009-07-02T12:09:59Z

Author: mikedd
Revision: 781791
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:09:59 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:09:59 2009
@@ -1 +1,3 @@
-OPENJPA-1083 committing patch provided by Ravi Palacherla
+OPENJPA-1083:
+Try to determine constraint name when dropping tables.
+Submitted by: Ravi Palacherla

svn propchange: r783376 - svn:log

2009-07-02T12:07:04Z

Author: mikedd
Revision: 783376
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:07:04 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:07:04 2009
@@ -1 +1,3 @@
-OPENJPA-1125 committing patch from Rick Curtis. Preventing misleading enhancement message.
+OPENJPA-1125:
+Supress misleading INFO message when using dynamic class enhancement.
+Submitted by Rick Curtis.

svn propchange: r787359 - svn:log

2009-07-02T12:03:23Z

Author: mikedd
Revision: 787359
Modified property: svn:log

Modified: svn:log at Thu Jul 2 19:03:23 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 19:03:23 2009
@@ -1 +1,4 @@
-OPENJPA-1119 committing patch from Rick Curtis.
+OPENJPA-1119:
+Excluding tests that rely on subclassing or fail with dynamic enhancement.
+Also handle NPE from if CodeSource is null.
+Submitted by : Rick Curtis.

svn propchange: r790003 - svn:log

2009-07-02T11:56:50Z

Author: mikedd
Revision: 790003
Modified property: svn:log

Modified: svn:log at Thu Jul 2 18:56:50 2009
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Jul 2 18:56:50 2009
@@ -1,2 +1,4 @@
-OPENJPA-1151 committing patch from Jody Grassel.
+OPENJPA-1151:
+Caching timestamp used for query results eviction.
+Submitted by: Jody Grassel.
modified: openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java

svn commit: r790707 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/

2009-07-02T11:45:07Z

Author: mikedd
Date: Thu Jul 2 18:45:07 2009
New Revision: 790707

URL: http://svn.apache.org/viewvc?rev=790707&view=rev
Log:
OPENJPA-1156 remove primitiveidentity directory

Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/

svn commit: r790703 [1/2] - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities: ./ idmsc/jointable/ idmsc/jointable/chardiscriminator/ idmsc/jointable/intdiscriminator/ idmsc/jointable/stringdis...

2009-07-02T11:40:14Z

Author: mikedd
Date: Thu Jul 2 18:40:11 2009
New Revision: 790703

URL: http://svn.apache.org/viewvc?rev=790703&view=rev
Log:
OPENJPA-1156. Refactoring test code from OPENJPA-1061 to avoid path length problems in some environments. Specifically I've removed the primitiveidentity component of the package since it was not adding any semantic meaning to the tests. Further refactoring may be needed, but this should prevent the specific problem that was reported.

Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/
- copied from r790676, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/jointable/chardiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/
- copied from r790676, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/jointable/intdiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/
- copied from r790676, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/jointable/stringdiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/
- copied from r790676, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/singletable/chardiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/
- copied from r790676, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/singletable/intdiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/
- copied from r790676, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/singletable/stringdiscriminator/
Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/jointable/chardiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/jointable/intdiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/jointable/stringdiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/singletable/chardiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/singletable/intdiscriminator/
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/primitiveidentity/singletable/stringdiscriminator/
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java?rev=790703&r1=790702&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java Thu Jul 2 18:40:11 2009
@@ -4,126 +4,70 @@

import org.apache.openjpa.persistence.inheritance.entities.idmsc.
PrimitiveIDMappedSuperclass;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCEntityB;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCEntityD;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCLeafA;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCLeafB1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCLeafB2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCLeafC;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCLeafD1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCLeafD2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCMappedSuperclass;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.chardiscriminator.PIdJTCDMSCRootEntity;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCEntityB;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCEntityD;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCLeafA;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCLeafB1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCLeafB2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCLeafC;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCLeafD1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCLeafD2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCMappedSuperclass;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.intdiscriminator.PIdJTIDMSCRootEntity;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCEntityB;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCEntityD;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCLeafA;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCLeafB1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCLeafB2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCLeafC;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCLeafD1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCLeafD2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCMappedSuperclass;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.jointable.stringdiscriminator.PIdJTSDMSCRootEntity;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCEntityB;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCEntityD;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCLeafA;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCLeafB1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCLeafB2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCLeafC;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCLeafD1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCLeafD2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCMappedSuperclass;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.chardiscriminator.PIdSTCDMSCRootEntity;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCEntityB;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCEntityD;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCLeafA;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCLeafB1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCLeafB2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCLeafC;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCLeafD1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCLeafD2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCMappedSuperclass;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator.PIdSTIDMSCRootEntity;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCEntityB;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCEntityD;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCLeafA;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCLeafB1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCLeafB2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCLeafC;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCLeafD1;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCLeafD2;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCMappedSuperclass;
-import org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator.PIdSTSDMSCRootEntity;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCEntityB;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCEntityD;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCLeafA;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCLeafB1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCLeafB2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCLeafC;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCLeafD1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCLeafD2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCMappedSuperclass;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator.PIdJTCDMSCRootEntity;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCEntityB;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCEntityD;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCLeafA;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCLeafB1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCLeafB2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCLeafC;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCLeafD1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCLeafD2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCMappedSuperclass;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator.PIdJTIDMSCRootEntity;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCEntityB;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCEntityD;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCLeafA;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCLeafB1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCLeafB2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCLeafC;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCLeafD1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCLeafD2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.
+ PIdJTSDMSCMappedSuperclass;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator.PIdJTSDMSCRootEntity;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCEntityB;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCEntityD;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCLeafA;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCLeafB1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCLeafB2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCLeafC;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCLeafD1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCLeafD2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.
+ PIdSTCDMSCMappedSuperclass;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator.PIdSTCDMSCRootEntity;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCEntityB;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCEntityD;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCLeafA;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCLeafB1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCLeafB2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCLeafC;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCLeafD1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCLeafD2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.
+ PIdSTIDMSCMappedSuperclass;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator.PIdSTIDMSCRootEntity;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCEntityB;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCEntityD;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCLeafA;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCLeafB1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCLeafB2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCLeafC;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCLeafD1;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCLeafD2;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.
+ PIdSTSDMSCMappedSuperclass;
+import org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator.PIdSTSDMSCRootEntity;

public class EntityMapping {
@SuppressWarnings("unchecked")

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.MappedSuperclass;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java Thu Jul 2 18:40:11 2009
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.chardiscriminator;

import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.MappedSuperclass;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java Thu Jul 2 18:40:11 2009
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.intdiscriminator;

import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.MappedSuperclass;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java Thu Jul 2 18:40:11 2009
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.jointable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.jointable.stringdiscriminator;

import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.MappedSuperclass;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java Thu Jul 2 18:40:11 2009
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
-primitiveidentity.singletable.chardiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.chardiscriminator;

import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.MappedSuperclass;

svn commit: r790703 [2/2] - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities: ./ idmsc/jointable/ idmsc/jointable/chardiscriminator/ idmsc/jointable/intdiscriminator/ idmsc/jointable/stringdis...

2009-07-02T11:40:14Z

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java Thu Jul 2 18:40:11 2009
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.intdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.intdiscriminator;

import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java Thu Jul 2 18:40:11 2009
@@ -17,8 +17,7 @@
* under the License.
*/

-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.MappedSuperclass;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java?rev=790703&r1=790676&r2=790703&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java Thu Jul 2 18:40:11 2009
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openjpa.persistence.inheritance.entities.idmsc.
- primitiveidentity.singletable.stringdiscriminator;
+package org.apache.openjpa.persistence.inheritance.entities.idmsc.singletable.stringdiscriminator;

import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;

svn commit: r790700 - in /openjpa/trunk: openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ openjpa-kernel/src/main/java/org/apache/openjpa/util/ openjpa-kernel/src/main/java/org/apache/openjpa/validation/ openjpa-p...

2009-07-02T11:21:27Z

Author: jrbauer
Date: Thu Jul 2 18:21:26 2009
New Revision: 790700

URL: http://svn.apache.org/viewvc?rev=790700&view=rev
Log:
OPENJPA-1068 Modified exception translator to translate wrapped validation exceptions. EM operations now throw correct validation exceptions.

Added:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java (with props)
Modified:
openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java

Modified: openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java?rev=790700&r1=790699&r2=790700&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java (original)
+++ openjpa/trunk/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraints.java Thu Jul 2 18:21:26 2009
@@ -15,6 +15,7 @@

import javax.persistence.Query;
import javax.persistence.ValidationMode;
+import javax.validation.ConstraintViolationException;

import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.lib.log.Log;
@@ -102,7 +103,7 @@
em.getTransaction().commit();
getLog().trace("testNullUpdateConstraint() Part 2 of 2 failed");
fail("Expected a Validation exception");
- } catch (Exception e) {
+ } catch (ConstraintViolationException e) {
// expected
getLog().trace("Caught expected exception = " + e);
getLog().trace("testNullUpdateConstraint() Part 2 of 2 passed");
@@ -153,6 +154,9 @@
if ((em != null) && em.isOpen()) {
em.close();
}
+ if ((emf != null) && emf.isOpen()) {
+ emf.close();
+ }
}

// Part 2 - Verify delete using default group does not cause Validation
@@ -186,6 +190,9 @@
em.getTransaction().rollback();
em.close();
}
+ if ((emf != null) && emf.isOpen()) {
+ emf.close();
+ }
}
}

@@ -225,6 +232,9 @@
if ((em != null) && em.isOpen()) {
em.close();
}
+ if ((emf != null) && emf.isOpen()) {
+ emf.close();
+ }
}
}

@@ -251,7 +261,7 @@
em.getTransaction().commit();
getLog().trace("testNullConstraint() failed");
fail("Expected a Validation exception");
- } catch (Exception e) {
+ } catch (ConstraintViolationException e) {
// expected
getLog().trace("Caught expected exception = " + e);
getLog().trace("testNullConstraint() passed");
@@ -285,7 +295,7 @@
em.getTransaction().commit();
getLog().trace("testNotNullConstraint() failed");
fail("Expected a Validation exception");
- } catch (Exception e) {
+ } catch (ConstraintViolationException e) {
// expected
getLog().trace("Caught expected exception = " + e);
getLog().trace("testNotNullConstraint() passed");
@@ -351,7 +361,7 @@
em.getTransaction().commit();
getLog().trace("testAssertTrueConstraint() failed");
fail("Expected a Validation exception");
- } catch (Exception e) {
+ } catch (ConstraintViolationException e) {
// expected
getLog().trace("Caught expected exception = " + e);
getLog().trace("testAssertTrueConstraint() passed");
@@ -385,7 +395,7 @@
em.getTransaction().commit();
getLog().trace("testAssertFalseConstraint() failed");
fail("Expected a Validation exception");
- } catch (Exception e) {
+ } catch (ConstraintViolationException e) {
// expected
getLog().trace("Caught expected exception = " + e);
getLog().trace("testAssertFalseConstraint() passed");

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java?rev=790700&r1=790699&r2=790700&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java Thu Jul 2 18:21:26 2009
@@ -33,6 +33,7 @@
public static final int UNSUPPORTED = 3;
public static final int USER = 4;
public static final int WRAPPED = 5;
+ public static final int UNAVAILABLE = 6;

/**

Added: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java?rev=790700&view=auto
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java (added)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java Thu Jul 2 18:21:26 2009
@@ -0,0 +1,44 @@
+/*
+ * 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.validation;
+
+import org.apache.openjpa.util.OpenJPAException;
+
+@SuppressWarnings("serial")
+public class ValidationUnavailableException extends OpenJPAException {
+
+ public ValidationUnavailableException(String msg) {
+ super(msg);
+ }
+
+ public ValidationUnavailableException(String msg, RuntimeException e) {
+ super(msg, e);
+ }
+
+ public ValidationUnavailableException(String msg, RuntimeException e,
+ boolean fatal) {
+ super(msg, e);
+ setFatal(fatal);
+ }
+
+ @Override
+ public int getType() {
+ return UNAVAILABLE;
+ }
+}

Propchange: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=790700&r1=790699&r2=790700&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Thu Jul 2 18:21:26 2009
@@ -72,10 +72,12 @@
import org.apache.openjpa.meta.QueryMetaData;
import org.apache.openjpa.meta.SequenceMetaData;
import org.apache.openjpa.persistence.criteria.CriteriaBuilder;
+import org.apache.openjpa.persistence.validation.ValidationUtils;
import org.apache.openjpa.util.Exceptions;
import org.apache.openjpa.util.ImplHelper;
import org.apache.openjpa.util.RuntimeExceptionTranslator;
import org.apache.openjpa.util.UserException;
+import org.apache.openjpa.util.WrappedException;

/**
* Implementation of {@link EntityManager} interface.
@@ -552,6 +554,12 @@
} catch (IllegalStateException e) {
throw e;
} catch (Exception e) {
+ // Per JPA 2.0 spec, if the exception was due to a JSR-303
+ // constraint violation, the ConstraintViolationException should be
+ // thrown. Since JSR-303 is optional, the cast to RuntimeException
+ // prevents the introduction of a runtime dependency on the BV API.
+ if (ValidationUtils.isConstraintViolationException(e))
+ throw (RuntimeException)e;
// RollbackExceptions are special and aren't handled by the
// normal exception translator, since the spec says they
// should be thrown whenever the commit fails for any reason at

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java?rev=790700&r1=790699&r2=790700&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java Thu Jul 2 18:21:26 2009
@@ -33,6 +33,7 @@
import org.apache.openjpa.util.RuntimeExceptionTranslator;
import org.apache.openjpa.util.StoreException;
import org.apache.openjpa.util.UserException;
+import org.apache.openjpa.util.WrappedException;

/**
* Converts from OpenJPA to persistence exception types.
@@ -138,6 +139,8 @@
return translateStoreException(ke);
case OpenJPAException.USER:
return translateUserException(ke);
+ case OpenJPAException.WRAPPED:
+ return translateWrappedException(ke);
default:
return translateGeneralException(ke);
}
@@ -249,6 +252,18 @@
e.setStackTrace(ke.getStackTrace());
return e;
}
+
+ /*
+ * Translate the given wrapped exception. If contains an Exception, return
+ * the exception. If contains a Throwable, wrap the throwable and
+ * return it.
+ */
+ private static Exception translateWrappedException(OpenJPAException ke) {
+ Throwable t = ke.getCause();
+ if (t instanceof Exception)
+ return (Exception)t;
+ return translateCause(ke);
+ }

/**
* Translate to a facade-level exception if the given exception

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java?rev=790700&r1=790699&r2=790700&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidationUtils.java Thu Jul 2 18:21:26 2009
@@ -23,7 +23,9 @@
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.Localizer.Message;
import org.apache.openjpa.validation.ValidationException;
+import org.apache.openjpa.validation.ValidationUnavailableException;

/**
@@ -77,9 +79,11 @@
} catch (ClassNotFoundException e) {
if (bValRequired) {
// fatal error - ValidationMode requires a validator
- log.error(_loc.get("vlem-creation-error"), e);
- // rethrow as a WrappedException
- throw new ValidationException(
+ Message msg = _loc.get("vlem-creation-error");
+ log.error(msg, e);
+ // rethrow as a more descriptive/identifiable exception
+ throw new ValidationUnavailableException(
+ msg.getMessage(),
new RuntimeException(e), true);
} else {
// no optional validation provider, so just trace output
@@ -105,9 +109,14 @@
} catch (RuntimeException e) {
if (bValRequired) {
// fatal error - ValidationMode requires a validator
- log.error(_loc.get("vlem-creation-error"), e);
// rethrow as a WrappedException
- throw new ValidationException(e, true);
+ Message msg = _loc.get("vlem-creation-error");
+ log.error(msg, e);
+ // rethrow as a more descriptive/identifiable exception
+ throw new ValidationUnavailableException(
+ msg.getMessage(),
+ e, true);
+
} else {
// unexpected, but validation is optional,
// so just log it as a warning
@@ -123,4 +132,21 @@
}
return brc;
}
+
+ /**
+ * Determines whether an exception is a constraint violation exception via
+ * class name. Does not require JSR-303 API to be in classpath.
+ * @param e exception to check
+ * @return true of the exception is a constraint violation exception
+ */
+ public static boolean isConstraintViolationException(Exception e) {
+ if (e == null)
+ return false;
+
+ if (e.getClass().getName().equals(
+ "javax.validation.ConstraintViolationException"))
+ return true;
+
+ return false;
+ }
}