connectivity/source/drivers/mysqlc/mysqlc_view.cxx | 23 +------- connectivity/source/drivers/mysqlc/mysqlc_views.cxx | 55 ++++++++------------ 2 files changed, 27 insertions(+), 51 deletions(-)
New commits: commit 544cf2e9b71e18973fd64376791fbc2a6cf2f88f Author: Julien Nabet <[email protected]> AuthorDate: Sat Jan 22 11:08:19 2022 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Sat Jan 22 14:26:29 2022 +0100 Mysql/MariaDB: Clean mysqlc_views + remove using Change-Id: I11e1284f9e7589cf4770d723e36c91a84b9b36b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128761 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx index 5db17db83c85..53d23235ea29 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "mysqlc_tables.hxx" #include "mysqlc_views.hxx" #include "mysqlc_view.hxx" #include "mysqlc_catalog.hxx" @@ -25,21 +24,9 @@ #include <comphelper/types.hxx> #include <TConnection.hxx> -using namespace ::comphelper; - -using namespace ::cppu; -using namespace connectivity; -using namespace connectivity::mysqlc; -using namespace css::uno; -using namespace css::beans; -using namespace css::sdbcx; -using namespace css::sdbc; -using namespace css::container; -using namespace css::lang; -typedef connectivity::sdbcx::OCollection OCollection_TYPE; - -Views::Views(const Reference<XConnection>& _rxConnection, ::cppu::OWeakObject& _rParent, - ::osl::Mutex& _rMutex, const ::std::vector<OUString>& _rVector) +connectivity::mysqlc::Views::Views(const css::uno::Reference<css::sdbc::XConnection>& _rxConnection, + ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, + const ::std::vector<OUString>& _rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) , m_xConnection(_rxConnection) , m_xMetaData(_rxConnection->getMetaData()) @@ -47,7 +34,7 @@ Views::Views(const Reference<XConnection>& _rxConnection, ::cppu::OWeakObject& _ { } -sdbcx::ObjectType Views::createObject(const OUString& _rName) +connectivity::sdbcx::ObjectType connectivity::mysqlc::Views::createObject(const OUString& _rName) { OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, sSchema, sTable, @@ -55,60 +42,64 @@ sdbcx::ObjectType Views::createObject(const OUString& _rName) return new View(m_xConnection, isCaseSensitive(), sSchema, sTable); } -void Views::impl_refresh() { static_cast<Catalog&>(m_rParent).refreshViews(); } +void connectivity::mysqlc::Views::impl_refresh() +{ + static_cast<Catalog&>(m_rParent).refreshViews(); +} -void Views::disposing() +void connectivity::mysqlc::Views::disposing() { m_xMetaData.clear(); OCollection::disposing(); } -Reference<XPropertySet> Views::createDescriptor() +css::uno::Reference<css::beans::XPropertySet> connectivity::mysqlc::Views::createDescriptor() { return new connectivity::sdbcx::OView(true, m_xMetaData); } // XAppend -sdbcx::ObjectType Views::appendObject(const OUString& _rForName, - const Reference<XPropertySet>& descriptor) +connectivity::sdbcx::ObjectType connectivity::mysqlc::Views::appendObject( + const OUString& _rForName, const css::uno::Reference<css::beans::XPropertySet>& descriptor) { createView(descriptor); return createObject(_rForName); } // XDrop -void Views::dropObject(sal_Int32 _nPos, const OUString& /*_sElementName*/) +void connectivity::mysqlc::Views::dropObject(sal_Int32 _nPos, const OUString& /*_sElementName*/) { if (m_bInDrop) return; - Reference<XInterface> xObject(getObject(_nPos)); + css::uno::Reference<XInterface> xObject(getObject(_nPos)); bool bIsNew = connectivity::sdbcx::ODescriptor::isNew(xObject); if (!bIsNew) { OUString aSql("DROP VIEW"); - Reference<XPropertySet> xProp(xObject, UNO_QUERY); + css::uno::Reference<css::beans::XPropertySet> xProp(xObject, css::uno::UNO_QUERY); aSql += ::dbtools::composeTableName(m_xMetaData, xProp, ::dbtools::EComposeRule::InTableDefinitions, true); - Reference<XConnection> xConnection = m_xMetaData->getConnection(); - Reference<XStatement> xStmt = xConnection->createStatement(); + css::uno::Reference<css::sdbc::XConnection> xConnection = m_xMetaData->getConnection(); + css::uno::Reference<css::sdbc::XStatement> xStmt = xConnection->createStatement(); xStmt->execute(aSql); ::comphelper::disposeComponent(xStmt); } } -void Views::dropByNameImpl(const OUString& elementName) +void connectivity::mysqlc::Views::dropByNameImpl(const OUString& elementName) { m_bInDrop = true; - OCollection_TYPE::dropByName(elementName); + connectivity::sdbcx::OCollection::dropByName(elementName); m_bInDrop = false; } -void Views::createView(const Reference<XPropertySet>& descriptor) +void connectivity::mysqlc::Views::createView( + const css::uno::Reference<css::beans::XPropertySet>& descriptor) { - Reference<XConnection> xConnection = m_xMetaData->getConnection(); + css::uno::Reference<css::sdbc::XConnection> xConnection = m_xMetaData->getConnection(); OUString sCommand; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) @@ -119,7 +110,7 @@ void Views::createView(const Reference<XPropertySet>& descriptor) ::dbtools::EComposeRule::InTableDefinitions, true) + " AS " + sCommand; - Reference<XStatement> xStmt = xConnection->createStatement(); + css::uno::Reference<css::sdbc::XStatement> xStmt = xConnection->createStatement(); if (xStmt.is()) { xStmt->execute(aSql); commit 7da9683f63dd2acf4a74ef40de6add112d60bd4d Author: Julien Nabet <[email protected]> AuthorDate: Sat Jan 22 10:58:17 2022 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Sat Jan 22 14:26:18 2022 +0100 Mysql/MariaDB: Clean mysqlc_view + remove using Change-Id: I6fcb2f2c4346e6293a1e40e6f143ef6e8a68ee8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128760 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_view.cxx b/connectivity/source/drivers/mysqlc/mysqlc_view.cxx index a586e20a9a13..86837381d2bc 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_view.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_view.cxx @@ -21,26 +21,11 @@ #include <propertyids.hxx> -#include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/sdbc/SQLException.hpp> namespace connectivity::mysqlc { -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::RuntimeException; -using ::com::sun::star::uno::Any; -using ::com::sun::star::sdbc::SQLException; -using ::com::sun::star::sdbc::XConnection; -using ::com::sun::star::lang::WrappedTargetException; -using ::com::sun::star::sdbc::XResultSet; -using ::com::sun::star::sdbc::XStatement; -using ::com::sun::star::lang::DisposedException; -using ::com::sun::star::sdbc::XRow; - -View::View(const Reference<XConnection>& _rxConnection, bool _bCaseSensitive, +View::View(const css::uno::Reference<css::sdbc::XConnection>& _rxConnection, bool _bCaseSensitive, const OUString& _rSchemaName, const OUString& _rName) : View_Base(_bCaseSensitive, _rName, _rxConnection->getMetaData(), OUString(), _rSchemaName, OUString()) @@ -76,7 +61,7 @@ void SAL_CALL View::alterCommand(const OUString& _rNewCommand) m_xMetaData->getConnection()->createStatement()->execute(aCommand); } -void SAL_CALL View::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const +void SAL_CALL View::getFastPropertyValue(css::uno::Any& _rValue, sal_Int32 _nHandle) const { if (_nHandle == PROPERTY_ID_COMMAND) { @@ -94,7 +79,7 @@ OUString View::impl_getCommand() const OUString aCommand("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = '" + m_SchemaName + "' AND TABLE_NAME = '" + m_Name + "'"); //::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW ); - Reference<XResultSet> xResult( + css::uno::Reference<css::sdbc::XResultSet> xResult( m_xMetaData->getConnection()->createStatement()->executeQuery(aCommand), css::uno::UNO_SET_THROW); if (!xResult->next()) @@ -104,7 +89,7 @@ OUString View::impl_getCommand() const std::abort(); } - Reference<XRow> xRow(xResult, UNO_QUERY_THROW); + css::uno::Reference<css::sdbc::XRow> xRow(xResult, css::uno::UNO_QUERY_THROW); return xRow->getString(1); }
