You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2009/07/14 04:56:41 UTC
svn commit: r793779 - in /openjpa/branches/subquery:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/
Author: fancy
Date: Tue Jul 14 02:56:40 2009
New Revision: 793779
URL: http://svn.apache.org/viewvc?rev=793779&view=rev
Log:
cleanup work
Modified:
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/TestQueryPagination.java
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=793779&r1=793778&r2=793779&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 Tue Jul 14 02:56:40 2009
@@ -168,7 +168,6 @@
// A path navigation is begin with this schema alias
private String _schemaAlias = null;
- private String _correlatedVar = null;
/**
* Helper method to return the proper table alias for the given alias index.
@@ -2110,15 +2109,6 @@
_tables.put(alias, tableString);
}
- private void recordTableAlias(String table, Object key, Integer alias) {
- if (_aliases == null)
- _aliases = new HashMap();
- _aliases.put(key, alias);
- if (_tables == null)
- _tables = new TreeMap();
- _tables.put(alias, table);
- }
-
/**
* Calculate total number of aliases.
*/
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=793779&r1=793778&r2=793779&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 Tue Jul 14 02:56:40 2009
@@ -1542,7 +1542,6 @@
if (cmd != null) {
// handle the case where the class name is the alias
// for the candidate (we don't use variables for this)
- //Value thiz = factory.getThis();
Value thiz = null;
if (ctx().subquery == null ||
ctx().getSchema(name.toLowerCase()) == null) {
@@ -1965,9 +1964,6 @@
Value v = c.getVariable(var);
if (v != null)
return v;
-// if (c.getSchema(var) != null)
-// // variable is to be defined in this context
-// return null;
if (c.getParent() != null)
return c.getParent().findVariable(var);
Modified: openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java
URL: http://svn.apache.org/viewvc/openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java?rev=793779&r1=793778&r2=793779&view=diff
==============================================================================
--- openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java (original)
+++ openjpa/branches/subquery/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java Tue Jul 14 02:56:40 2009
@@ -24,8 +24,6 @@
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.jdbc.sql.DerbyDictionary;
-import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.test.SQLListenerTestCase;
/**