Kaydet (Commit) 36e1e0ce authored tarafından Marcos Paulo de Souza's avatar Marcos Paulo de Souza Kaydeden (comit) Luboš Luňák

fdo#57950: Remove some chained appends in dbaccess

Also simplify logic a little bit.

Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90
Signed-off-by: 's avatarMarcos Paulo de Souza <marcos.souza.org@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1559Reviewed-by: 's avatarLuboš Luňák <l.lunak@suse.cz>
Tested-by: 's avatarLuboš Luňák <l.lunak@suse.cz>
üst 2b0b5f7d
......@@ -765,25 +765,17 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
bCase = m_xMetaData->supportsMixedCaseQuotedIdentifiers();
aSelectColumns = m_aSqlIterator.getSelectColumns();
::rtl::OUStringBuffer aSQL;
aSQL.append( m_aPureSelectSQL );
aSQL.append( STR_WHERE );
OUStringBuffer aSQL( m_aPureSelectSQL + STR_WHERE + " ( 0 = 1 )");
// preserve the original WHERE clause
// #i102234#
::rtl::OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator, sal_False );
OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator, sal_False );
if ( !sOriginalWhereClause.isEmpty() )
{
aSQL.appendAscii( " ( 0 = 1 ) AND ( " );
aSQL.append( sOriginalWhereClause );
aSQL.appendAscii( " ) " );
}
else
{
aSQL.appendAscii( " ( 0 = 1 ) " );
aSQL.append( " AND ( " + sOriginalWhereClause + " ) " );
}
::rtl::OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
if ( !sGroupBy.isEmpty() )
aSQL.append( sGroupBy );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment