db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1493796 - in /db/derby/code/branches/10.10: ./ java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
Date Mon, 17 Jun 2013 14:52:17 GMT
Author: rhillegas
Date: Mon Jun 17 14:52:16 2013
New Revision: 1493796

URL: http://svn.apache.org/r1493796
Log:
DERBY-6263: Port 1493789 from trunk to 10.10 branch.

Modified:
    db/derby/code/branches/10.10/   (props changed)
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java

Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1493789

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java?rev=1493796&r1=1493795&r2=1493796&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
(original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
Mon Jun 17 14:52:16 2013
@@ -2533,6 +2533,49 @@ public class SelectNode extends ResultSe
 		if (havingClause != null) {
 			havingClause = (ValueNode)havingClause.accept(v);
 		}
+
+        // visiting these clauses was added as part of DERBY-6263. a better fix might be
to fix the
+        // visitor rather than skip it.
+        if ( !(v instanceof HasCorrelatedCRsVisitor) )
+        {
+            if (selectSubquerys != null)
+            {
+                selectSubquerys = (SubqueryList) selectSubquerys.accept( v );
+            }
+
+            if (whereSubquerys != null)
+            {
+                whereSubquerys = (SubqueryList) whereSubquerys.accept( v );
+            }
+
+            if (groupByList != null) {
+                groupByList = (GroupByList) groupByList.accept( v );
+            }
+        
+            if (orderByLists[0] != null) {
+                for (int i = 0; i < orderByLists.length; i++) {
+                    orderByLists[i] = (OrderByList) orderByLists[ i ].accept( v );
+                }
+            }
+
+            if (offset != null) {
+                offset = (ValueNode) offset.accept( v );
+            }
+            
+            if (fetchFirst != null) {
+                fetchFirst = (ValueNode) fetchFirst.accept( v );
+            }
+            
+            if (preJoinFL != null)
+            {
+                preJoinFL = (FromList) preJoinFL.accept( v );
+            }
+            
+            if (windows != null)
+            {
+                windows = (WindowList) windows.accept( v );
+            }
+        }
 	}
 
 	/**



Mime
View raw message