User: vg Date: 05/03/10 08:31:41 Modified: /dba/dbaccess/source/core/api/ SingleSelectQueryComposer.cxx
Log: INTEGRATION: CWS dba24 (1.7.20); FILE MERGED 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 File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.8&r2=1.9 Delta lines: +3 -3 ------------------- --- SingleSelectQueryComposer.cxx 17 Feb 2005 11:01:55 -0000 1.8 +++ SingleSelectQueryComposer.cxx 10 Mar 2005 16:31:39 -0000 1.9 @@ -205,7 +205,7 @@ _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 @@ // 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 ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
