mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dba24 (1.7.20); FILE MERGED

Browse Source 
2005/02/21 13:07:44 oj 1.7.20.2: RESYNC: (1.7-1.8); FILE MERGED
2005/02/11 08:59:50 oj 1.7.20.1: #i42459# check for single select corrected
This commit is contained in:
Vladimir Glazounov
2005-03-10 15:31:39 +00:00
parent 051edcf217
commit c9af2e7370
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: SingleSelectQueryComposer.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: vg $ $Date: 2005-02-17 11:01:55 $
* last change: $Author: vg $ $Date: 2005-03-10 16:31:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -205,7 +205,7 @@ namespace
_rIterator.setParseTree( pStatementNode );
_rIterator.traverseAll();
bool bIsSingleSelect = ( _rIterator.getStatementType() == SQL_STATEMENT_SELECT )
|| ( _rIterator.getStatementType() != SQL_STATEMENT_SELECT_COUNT );
|| ( _rIterator.getStatementType() == SQL_STATEMENT_SELECT_COUNT );
// throw the error, if necessary
if ( !bIsSingleSelect || SQL_ISRULE( pStatementNode, union_statement ) ) // #i4229# OJ
@@ -382,8 +382,8 @@ void SAL_CALL OSingleSelectQueryComposer::setQuery( const ::rtl::OUString& comma
// first clear the tables and columns
clearCurrentCollections();
// now set the new one
setQuery_Impl(command);
m_sOrignal = command;
setQuery_Impl(m_sOrignal);
// reset the additive iterator to the same statement
parseAndCheck_throwError( m_aSqlParser, m_sOrignal, m_aAdditiveIterator, *this );