Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1398F10E70 for ; Mon, 17 Jun 2013 14:44:47 +0000 (UTC) Received: (qmail 38601 invoked by uid 500); 17 Jun 2013 14:44:47 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 38541 invoked by uid 500); 17 Jun 2013 14:44:46 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 38534 invoked by uid 99); 17 Jun 2013 14:44:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jun 2013 14:44:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jun 2013 14:44:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D932E23888FE; Mon, 17 Jun 2013 14:44:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1493789 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java Date: Mon, 17 Jun 2013 14:44:21 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130617144421.D932E23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhillegas Date: Mon Jun 17 14:44:21 2013 New Revision: 1493789 URL: http://svn.apache.org/r1493789 Log: DERBY-6263: Add missing clauses to Visitor logic of SelectNode; tests passed cleanly on derby-6263-02-aa-ignored-clauses-in-SelectNode.diff. Modified: 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/SelectNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java?rev=1493789&r1=1493788&r2=1493789&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 Mon Jun 17 14:44:21 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 ); + } + } } /**