From e076856d58a34454039104f990c0fafa78501803 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 31 Jul 2007 12:39:08 +0000 Subject: INTEGRATION: CWS dba23c (1.53.74); FILE MERGED 2007/07/23 08:37:01 fs 1.53.74.1: #i77635# impl_getQueryParameterColumns: also recognize parameters in the SELECT column list --- connectivity/source/parse/sqliterator.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'connectivity/source/parse') diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index a3157525b2db..883eb9ce67bf 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sqliterator.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: kz $ $Date: 2006-12-13 16:24:48 $ + * last change: $Author: hr $ $Date: 2007-07-31 13:39:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -384,7 +384,9 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu break; OSQLParseTreeIterator aSubQueryIterator( *this, m_rParser, pSubQueryNode.get() ); - aSubQueryIterator.traverseSome( Parameters ); + aSubQueryIterator.traverseSome( Parameters | SelectColumns ); + // SelectColumns might also contain parameters + // #i77635# - 2007-07-23 / frank.schoenheit@sun.com pSubQueryParameterColumns = aSubQueryIterator.getParameters(); aSubQueryIterator.dispose(); -- cgit