Tag: cws_src680_dba205b User: oj Date: 2006/09/04 04:11:49 Modified: dba/connectivity/source/parse/sqliterator.cxx
Log: RESYNC: (1.48-1.51); FILE MERGED File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqliterator.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqliterator.cxx?r1=1.48.18.1&r2=1.48.18.2 Delta lines: +22 -13 --------------------- --- sqliterator.cxx 15 Aug 2006 11:47:24 -0000 1.48.18.1 +++ sqliterator.cxx 4 Sep 2006 11:11:46 -0000 1.48.18.2 @@ -530,7 +530,7 @@ traverseOneTableName( _rTables, pNode, aTableRange ); } //----------------------------------------------------------------------------- -const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, const OSQLParseNode *pTableRef,::rtl::OUString& aTableRange ) +const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, const OSQLParseNode *pTableRef,::rtl::OUString& rTableRange ) { OSL_PRECOND( SQL_ISRULE( pTableRef, table_ref ) || SQL_ISRULE( pTableRef, joined_table ) || SQL_ISRULE( pTableRef, qualified_join ) || SQL_ISRULE( pTableRef, cross_union ) @@ -541,11 +541,11 @@ if ( SQL_ISRULE( pTableRef, joined_table ) ) { - getQualified_join( _rTables, pTableRef->getChild(1), aTableRange ); + getQualified_join( _rTables, pTableRef->getChild(1), rTableRange ); } else if ( SQL_ISRULE( pTableRef, qualified_join ) || SQL_ISRULE( pTableRef, cross_union ) ) { - getQualified_join( _rTables, pTableRef, aTableRange ); + getQualified_join( _rTables, pTableRef, rTableRange ); } else { @@ -553,12 +553,12 @@ { if ( SQL_ISPUNCTUATION( pTableRef->getChild(0), "{" ) ) { // { OJ joined_table } - getQualified_join( _rTables, pTableRef->getChild(2), aTableRange ); + getQualified_join( _rTables, pTableRef->getChild(2), rTableRange ); } else { // table_node as range_variable op_column_commalist pTableNameNode = pTableRef->getChild(0); - aTableRange = pTableRef->getChild(2)->getTokenValue(); + rTableRange = pTableRef->getChild(2)->getTokenValue(); } } else if ( pTableRef->count() == 3 ) @@ -569,7 +569,7 @@ if ( SQL_ISRULE( pQueryExpression, select_statement ) ) { getSelect_statement( *m_pImpl->m_pSubTables, pQueryExpression ); - aTableRange = pTableRef->getChild(2)->getTokenValue(); + rTableRange = pTableRef->getChild(2)->getTokenValue(); } else { @@ -579,8 +579,13 @@ else if ( pTableRef->count() == 6 ) { // '(' joined_table ')' as range_variable op_column_commalist - getQualified_join( _rTables, pTableRef->getChild(1), aTableRange ); - aTableRange = pTableRef->getChild(4)->getTokenValue(); + getQualified_join( _rTables, pTableRef->getChild(1), rTableRange ); + rTableRange = pTableRef->getChild(4)->getTokenValue(); + } + else if ( pTableRef->count() == 1 ) + { + // table_node + pTableNameNode = pTableRef->getChild(0); } else OSL_ENSURE( false, "OSQLParseTreeIterator::getTableNode: unhandled case!" ); @@ -1994,9 +1999,13 @@ ::rtl::OUString sErrorMessage = m_rParser.getContext().getErrorMessage( _eError ); if ( _pReplaceToken1 ) { - sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf('#'), 1, *_pReplaceToken1 ); + bool bTwoTokens = ( _pReplaceToken2 != NULL ); + const sal_Char* pPlaceHolder1 = bTwoTokens ? "#1" : "#"; + const ::rtl::OUString sPlaceHolder1 = ::rtl::OUString::createFromAscii( pPlaceHolder1 ); + + sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 ); if ( _pReplaceToken2 ) - sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf('#'), 1, *_pReplaceToken2 ); + sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( ::rtl::OUString::createFromAscii( "#2" ) ), 2, *_pReplaceToken2 ); } impl_appendError( SQLException( --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
