Tag: cws_src680_dba27
User: fs      
Date: 05/03/15 03:37:57

Modified:
 /dba/dbaccess/source/core/api/
  SingleSelectQueryComposer.cxx

Log:
 RESYNC: (1.8-1.9); FILE MERGED

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.20.1&r2=1.8.20.2
Delta lines:  +6 -6
-------------------
--- SingleSelectQueryComposer.cxx       11 Mar 2005 13:44:23 -0000      1.8.20.1
+++ SingleSelectQueryComposer.cxx       15 Mar 2005 11:37:54 -0000      1.8.20.2
@@ -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]

Reply via email to