From e294b5292a55f7e63074d52ed1de491e003ec30c Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 24 Oct 2006 14:06:24 +0000 Subject: [PATCH] INTEGRATION: CWS dba205c (1.44.10); FILE MERGED 2006/10/10 13:40:07 fs 1.44.10.1: #i69227# when stepping down a sub query, don't forget to erase its name from the pSubQueryHistory, to allow repeated occurances --- connectivity/source/parse/sqlnode.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index e8a6c68c25b9..ac214b812318 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sqlnode.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: obo $ $Date: 2006-09-17 03:09:39 $ + * last change: $Author: hr $ $Date: 2006-10-24 15:06:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -721,6 +721,11 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( ::rtl::OUString& rStr rString += SetQuotation( sTableOrQueryName, rParam.aIdentifierQuote, rParam.aIdentifierQuote ); } + // don't forget to remove the query name from the history, else multiple inclusions + // won't work + // #i69227# / 2006-10-10 / frank.schoenheit@sun.com + rParam.pSubQueryHistory->erase( sTableOrQueryName ); + return true; } catch( const SQLException& )