Tag: mws_ooo300 User: obo Date: 2008-11-17 14:51:56+0000 Modified: dba/connectivity/source/parse/sqliterator.cxx
Log: INTEGRATION: CWS dba301a (1.59.12); FILE MERGED 2008/10/16 13:27:34 oj 1.59.12.1: #i94803# change table_ref for ( joined_table ) 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.59&r2=1.59.2.1 Delta lines: +13 -6 -------------------- --- sqliterator.cxx 2008-07-25 07:41:44+0000 1.59 +++ sqliterator.cxx 2008-11-17 14:51:54+0000 1.59.2.1 @@ -520,9 +520,15 @@ { getQualified_join( _rTables, pTableRef->getChild(6 - pTableRef->count()), rTableRange ); } - else if ( pTableRef->count() == 3 ) // subquery range_variable op_column_commalist + else if ( pTableRef->count() == 3 ) // subquery range_variable op_column_commalist || '(' joined_table ')' { const OSQLParseNode* pSubQuery = pTableRef->getChild(0); + if ( pSubQuery->isToken() ) + { + getQualified_join( _rTables, pTableRef->getChild(1), rTableRange ); + } + else + { OSL_ENSURE( pSubQuery->count() == 3, "sub queries should have 3 children!" ); const OSQLParseNode* pQueryExpression = pSubQuery->getChild(1); if ( SQL_ISRULE( pQueryExpression, select_statement ) ) @@ -534,6 +540,7 @@ OSL_ENSURE( false, "OSQLParseTreeIterator::getTableNode: subquery which is no select_statement: not yet implemented!" ); } } + } else if ( pTableRef->count() == 2 ) // table_node table_primary_as_range_column { pTableNameNode = pTableRef->getChild(0); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
