Kaydet (Commit) 020c3eeb authored tarafından Miklos Vajna's avatar Miklos Vajna

connectivity DatabaseMetaData: pull out OComponent from OCalc/Writer

Only getURL() and getTables() is custom, the rest can be shared.

Change-Id: I9d282a30f722bce0c05b37c7d005c84193e01b7c
Reviewed-on: https://gerrit.libreoffice.org/42152Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 653e4937
......@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,file,\
$(eval $(call gb_Library_add_exception_objects,file,\
connectivity/source/drivers/component/CColumns \
connectivity/source/drivers/component/CDatabaseMetaData \
connectivity/source/drivers/component/CPreparedStatement \
connectivity/source/drivers/component/CResultSet \
connectivity/source/drivers/component/CStatement \
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDATABASEMETADATA_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDATABASEMETADATA_HXX
#include "file/FDatabaseMetaData.hxx"
#include "component/CDatabaseMetaData.hxx"
namespace connectivity
{
......@@ -30,16 +30,9 @@ namespace connectivity
//************ Class: java.sql.DatabaseMetaDataDate
class OCalcDatabaseMetaData : public file::ODatabaseMetaData
class OCalcDatabaseMetaData : public component::OComponentDatabaseMetaData
{
virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override;
virtual OUString SAL_CALL getURL( ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override;
virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override;
virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override;
virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override;
virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
protected:
virtual ~OCalcDatabaseMetaData() override;
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CDATABASEMETADATA_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CDATABASEMETADATA_HXX
#include "file/FDatabaseMetaData.hxx"
namespace connectivity
{
namespace component
{
//************ Class: java.sql.DatabaseMetaDataDate
class OOO_DLLPUBLIC_FILE OComponentDatabaseMetaData : public file::ODatabaseMetaData
{
virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override;
virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override;
virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override;
virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override;
virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override;
protected:
virtual ~OComponentDatabaseMetaData() override;
public:
OComponentDatabaseMetaData(file::OConnection* _pCon);
};
}
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CDATABASEMETADATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -20,23 +20,16 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WDATABASEMETADATA_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WDATABASEMETADATA_HXX
#include "file/FDatabaseMetaData.hxx"
#include "component/CDatabaseMetaData.hxx"
namespace connectivity
{
namespace writer
{
class OWriterDatabaseMetaData : public file::ODatabaseMetaData
class OWriterDatabaseMetaData : public component::OComponentDatabaseMetaData
{
virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override;
virtual OUString SAL_CALL getURL() override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns(const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern) override;
virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength() override;
virtual sal_Int32 SAL_CALL getMaxCharLiteralLength() override;
virtual sal_Int32 SAL_CALL getMaxColumnNameLength() override;
virtual sal_Int32 SAL_CALL getMaxColumnsInIndex() override;
virtual sal_Int32 SAL_CALL getMaxColumnsInTable() override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types) override;
protected:
virtual ~OWriterDatabaseMetaData() override;
......
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