diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2020-05-04 22:58:31 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-13 10:04:52 +0200 |
| commit | bfaa243b0cac1753330982bedb47f272724bfa1c (patch) | |
| tree | 3fe594d173d5ab7e05ca3fa02f8e28c784d85c0a /connectivity | |
| parent | Resolves: tdf#132173 handle API sequence to inline array token correctly (diff) | |
| download | core-bfaa243b0cac1753330982bedb47f272724bfa1c.tar.gz core-bfaa243b0cac1753330982bedb47f272724bfa1c.zip | |
tdf#122408 make StatementComposer apply HAVING clause
Change-Id: I381c918e8cac2800367bc586f8c230d46bcd71e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93378
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 3 | ||||
| -rw-r--r-- | connectivity/source/commontools/statementcomposer.cxx | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 514b026b26c9..34d83e573a1e 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1247,7 +1247,10 @@ static Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const bool bApplyFilter = true; _rxRowSet->getPropertyValue("ApplyFilter") >>= bApplyFilter; if ( bApplyFilter ) + { aComposer.setFilter( getString( _rxRowSet->getPropertyValue("Filter") ) ); + aComposer.setHavingClause( getString( _rxRowSet->getPropertyValue("HavingClause") ) ); + } aComposer.getQuery(); diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index a21c8cf1a41d..01f20e9c1e3c 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -60,6 +60,7 @@ namespace dbtools Reference< XSingleSelectQueryComposer > xComposer; OUString sCommand; OUString sFilter; + OUString sHavingClause; OUString sOrder; sal_Int32 nCommandType; bool bEscapeProcessing; @@ -189,6 +190,8 @@ namespace dbtools OUString sFilter; OSL_VERIFY( xQuery->getPropertyValue("Filter") >>= sFilter ); xComposer->setFilter( sFilter ); + OSL_VERIFY( xQuery->getPropertyValue("HavingClause") >>= sFilter ); + xComposer->setHavingClause( sFilter ); } // the composed statement @@ -212,6 +215,7 @@ namespace dbtools // append sort/filter xComposer->setOrder( _rData.sOrder ); xComposer->setFilter( _rData.sFilter ); + xComposer->setHavingClause( _rData.sHavingClause ); sStatement = xComposer->getQuery(); @@ -262,6 +266,13 @@ namespace dbtools } + void StatementComposer::setHavingClause( const OUString& _rHavingClause ) + { + m_pData->sHavingClause = _rHavingClause; + m_pData->bComposerDirty = true; + } + + void StatementComposer::setOrder( const OUString& _rOrder ) { m_pData->sOrder = _rOrder; |