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/08 03:02:05 UTC
svn commit: r792006 - in
/openjpa/branches/subquery/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc:
kernel/exps/PCPath.java sql/SelectImpl.java
Author: fancy
Date: Wed Jul 8 01:02:05 2009
New Revision: 792006
URL: http://svn.apache.org/viewvc?rev=792006&view=rev
Log:
remove println
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
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=792006&r1=792005&r2=792006&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 Wed Jul 8 01:02:05 2009
@@ -496,7 +496,7 @@
if (sel.getParent() != null && action.var != null &&
prevaction != null && prevaction.data != null &&
sel.ctx().getVariable(action.var) == null) {
- System.out.println("action var="+action.var);
+ //System.out.println("Correlated action var="+action.var);
isCorrelatedPath = true;
pstate.joins = pstate.joins.setCorrelatedVariable(action.var);
} else
@@ -515,11 +515,10 @@
if (sel.getParent() != null && action.var != null &&
sel.ctx().getVariable(action.var) == null) {
- System.out.println("action var="+action.var);
+ //System.out.println("Correlated action var="+action.var);
isCorrelatedPath = true;
pstate.joins = pstate.joins.setCorrelatedVariable(var.getName());
- } else
-
+ } else
pstate.joins = pstate.joins.setVariable(var.getName());
pstate.joins = pstate.joins.crossJoin(_candidate.getTable(),
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=792006&r1=792005&r2=792006&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 Wed Jul 8 01:02:05 2009
@@ -2011,10 +2011,10 @@
// not found; create alias
i = Numbers.valueOf(aliasSize(null));
- System.out.println("GetTableIndex\t"+
- ((_parent != null) ? "Sub" :"") +
- " created alias: "+
- i.intValue()+ " "+ key);
+// System.out.println("GetTableIndex\t"+
+// ((_parent != null) ? "Sub" :"") +
+// " created alias: "+
+// i.intValue()+ " "+ key);
recordTableAlias(table, key, i);
return i.intValue();
}
@@ -2073,10 +2073,10 @@
private int createAlias(Table table, Object key) {
Integer i = Numbers.valueOf(ctx().nextAlias());
- System.out.println("\t"+
- ((_parent != null) ? "Sub" :"") +
- "Query created alias: "+
- i.intValue()+ " "+ key);
+// System.out.println("\t"+
+// ((_parent != null) ? "Sub" :"") +
+// "Query created alias: "+
+// i.intValue()+ " "+ key);
recordTableAlias(table, key, i);
return i.intValue();
}
@@ -2917,8 +2917,8 @@
}
public void moveJoinsToParent() {
- if (_joins == null) // add this line
- return; // add this line
+ if (_joins == null)
+ return;
if (_sel._parent._joins == null)
_sel._parent._joins = new SelectJoins(_sel._parent);
SelectJoins p = _sel._parent._joins;