You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2014/05/16 08:38:47 UTC
svn commit: r1595121 - in
/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile:
JoinNode.java SQLToJavaValueNode.java SelectNode.java
Author: kahatlen
Date: Fri May 16 06:38:47 2014
New Revision: 1595121
URL: http://svn.apache.org/r1595121
Log:
DERBY-6577: Preserve return value from recursive calls to preprocess()
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java?rev=1595121&r1=1595120&r2=1595121&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java Fri May 16 06:38:47 2014
@@ -1073,7 +1073,7 @@ class JoinNode extends TableOperatorNode
* to joinClause.preprocess() because we know that no
* flattening will take place. (Bug #1206)
*/
- joinClause.preprocess(
+ joinClause = joinClause.preprocess(
numTables,
new FromList(
getOptimizerFactory().doJoinOrderOptimization(),
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java?rev=1595121&r1=1595120&r2=1595121&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java Fri May 16 06:38:47 2014
@@ -264,7 +264,7 @@ class SQLToJavaValueNode extends JavaVal
PredicateList outerPredicateList)
throws StandardException
{
- value.preprocess(numTables,
+ value = value.preprocess(numTables,
outerFromList, outerSubqueryList,
outerPredicateList);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java?rev=1595121&r1=1595120&r2=1595121&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java Fri May 16 06:38:47 2014
@@ -1085,7 +1085,7 @@ class SelectNode extends ResultSetNode
if (whereSubquerys != null){
whereSubquerys.markWhereSubqueries();
}
- whereClause.preprocess(numTables,
+ whereClause = whereClause.preprocess(numTables,
fromList, whereSubquerys,
wherePredicates);
}