diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-09-26 21:03:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-27 14:41:50 +0200 |
| commit | fefc215592ab3e11afb957e59016f1b9d6a00593 (patch) | |
| tree | 0cfdbe06e96edb990a3eca8ada4352f1076f5aed /connectivity | |
| parent | 50e98026e802d06aae055f14c762ba5c2cb97f02 (diff) | |
appendColumns is always called with m_aSelectColumns as 1st arg
Change-Id: I791c0eef1fda97d21ba9efb170ef226c9a495eed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122658
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqliterator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 752caa841473..f20bef933395 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1523,7 +1523,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN return aReturnTable; } -void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable) +void OSQLParseTreeIterator::appendColumns(const OUString& _rTableAlias, const OSQLTable& _rTable) { if (!_rTable.is()) return; @@ -1560,7 +1560,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns> const & pColumn->setTableName(_rTableAlias); pColumn->setRealName(*pBegin); - _rColumns->push_back(pColumn); + m_aSelectColumns->push_back(pColumn); } else impl_appendError( IParseContext::ErrorCode::InvalidColumn, pBegin, &_rTableAlias ); @@ -1572,14 +1572,14 @@ void OSQLParseTreeIterator::setSelectColumnName(const OUString & rColumnName,con if(rColumnName.toChar() == '*' && rTableRange.isEmpty()) { // SELECT * ... for (auto const& table : *m_pImpl->m_pTables) - appendColumns(m_aSelectColumns, table.first, table.second); + appendColumns(table.first, table.second); } else if( rColumnName.toChar() == '*' && !rTableRange.isEmpty() ) { // SELECT <table>.* OSQLTables::const_iterator aFind = m_pImpl->m_pTables->find(rTableRange); if(aFind != m_pImpl->m_pTables->end()) - appendColumns(m_aSelectColumns, rTableRange, aFind->second); + appendColumns(rTableRange, aFind->second); } else if ( rTableRange.isEmpty() ) { // SELECT <something> ... |