diff options
| -rw-r--r-- | connectivity/source/parse/sqliterator.cxx | 13 | ||||
| -rw-r--r-- | include/connectivity/sqliterator.hxx | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index a19f59380559..4cd8c6557426 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -803,7 +803,18 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, } //----------------------------------------------------------------------------- -sal_Bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const +bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const +{ + OUString tmp; + if(impl_getColumnTableRange(pNode, tmp)) + { + rTableRange = tmp; + return true; + } + else + return false; +} +bool OSQLParseTreeIterator::impl_getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const { SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getColumnTableRange" ); // See if all columns belong to one table diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index b9a1b6c67834..03b12de251f9 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -272,7 +272,7 @@ namespace connectivity OUString& _rTableRange); // empty if ambiguous - sal_Bool getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const; + bool getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const; // return true when the tableNode is a rule like catalog_name, schema_name or table_name sal_Bool isTableNode(const OSQLParseNode* _pTableNode) const; @@ -284,6 +284,9 @@ namespace connectivity ::std::vector< TNodePair >& getJoinConditions() const; private: + // helper to implement getColumnTableRange + bool impl_getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const; + /** traverses the list of table names, and filles _rTables */ bool traverseTableNames( OSQLTables& _rTables ); |