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/42152
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

7 files changed, 307 insertions, 437 deletions

diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index d44f27e247ac..e6ff6bcfa29d 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -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 \
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 795c72103152..4f44dce752ed 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -38,6 +38,7 @@
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
+using namespace connectivity::component;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;
@@ -46,192 +47,14 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::sheet;
 
-
-OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon)    :ODatabaseMetaData(_pCon)
+OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon)    :OComponentDatabaseMetaData(_pCon)
 {
 }
 
-
 OCalcDatabaseMetaData::~OCalcDatabaseMetaData()
 {
 }
 
-
-Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
-{
-    ::osl::MutexGuard aGuard( m_aMutex );
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
-    Reference< XResultSet > xRef = pResult;
-
-    static ODatabaseMetaDataResultSet::ORows aRows;
-    if(aRows.empty())
-    {
-        ODatabaseMetaDataResultSet::ORow aRow;
-
-        aRows.reserve(6);
-        aRow.reserve(18);
-
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
-        aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
-        aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); // ORowSetValue((sal_Int32)ColumnValue::NULLABLE)
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::CHAR));
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator((sal_Int32)10));
-
-
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
-        aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("BOOL"));
-        aRow[2] = new ORowSetValueDecorator(DataType::BIT);
-        aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
-        aRow[2] = new ORowSetValueDecorator(DataType::DATE);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
-        aRow[2] = new ORowSetValueDecorator(DataType::TIME);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
-        aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-    }
-
-    pResult->setRows(aRows);
-    return xRef;
-}
-
-
-Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
-    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
-        const OUString& columnNamePattern )
-{
-    ::osl::MutexGuard aGuard( m_aMutex );
-
-
-    Reference< XTablesSupplier > xTables = m_pConnection->createCatalog();
-    if(!xTables.is())
-        throw SQLException();
-
-    Reference< XNameAccess> xNames = xTables->getTables();
-    if(!xNames.is())
-        throw SQLException();
-
-    ODatabaseMetaDataResultSet::ORows aRows;
-    ODatabaseMetaDataResultSet::ORow  aRow(19);
-
-    aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
-
-    Sequence< OUString> aTabNames(xNames->getElementNames());
-    const OUString* pTabIter = aTabNames.getConstArray();
-    const OUString* pTabEnd      = pTabIter + aTabNames.getLength();
-    for(;pTabIter != pTabEnd;++pTabIter)
-    {
-        if(match(tableNamePattern,*pTabIter,'\0'))
-        {
-            const Reference< XColumnsSupplier> xTable(xNames->getByName(*pTabIter),UNO_QUERY_THROW);
-            OSL_ENSURE(xTable.is(),"Table not found! Normally a exception had to be thrown here!");
-            aRow[3] = new ORowSetValueDecorator(*pTabIter);
-
-            const Reference< XNameAccess> xColumns = xTable->getColumns();
-            if(!xColumns.is())
-                throw SQLException();
-
-            const Sequence< OUString> aColNames(xColumns->getElementNames());
-
-            const OUString* pColumnIter = aColNames.getConstArray();
-            const OUString* pEnd = pColumnIter + aColNames.getLength();
-            Reference< XPropertySet> xColumn;
-            for(sal_Int32 i=1;pColumnIter != pEnd;++pColumnIter,++i)
-            {
-                if(match(columnNamePattern,*pColumnIter,'\0'))
-                {
-                    aRow[4]  = new ORowSetValueDecorator( *pColumnIter);
-
-                    xColumns->getByName(*pColumnIter) >>= xColumn;
-                    OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!");
-                    aRow[5] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))));
-                    aRow[6] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))));
-                    aRow[7] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))));
-                    //  aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    aRow[9] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))));
-                    aRow[11] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))));
-                    //  aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    aRow[13] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))));
-                    //  aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    //  aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    switch(sal_Int32(aRow[5]->getValue()))
-                    {
-                    case DataType::CHAR:
-                    case DataType::VARCHAR:
-                        aRow[16] = new ORowSetValueDecorator((sal_Int32)254);
-                        break;
-                    case DataType::LONGVARCHAR:
-                        aRow[16] = new ORowSetValueDecorator((sal_Int32)65535);
-                        break;
-                    default:
-                        aRow[16] = new ORowSetValueDecorator((sal_Int32)0);
-                    }
-                    aRow[17] = new ORowSetValueDecorator(i);
-                    switch(sal_Int32(aRow[11]->getValue()))
-                    {
-                    case ColumnValue::NO_NULLS:
-                        aRow[18]  = new ORowSetValueDecorator(OUString("NO"));
-                        break;
-                    case ColumnValue::NULLABLE:
-                        aRow[18]  = new ORowSetValueDecorator(OUString("YES"));
-                        break;
-                    default:
-                        aRow[18]  = new ORowSetValueDecorator(OUString());
-                    }
-                    aRows.push_back(aRow);
-                }
-            }
-        }
-    }
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
-    Reference< XResultSet > xRef = pResult;
-    pResult->setRows(aRows);
-
-    return xRef;
-}
-
-
 OUString SAL_CALL OCalcDatabaseMetaData::getURL(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -239,34 +62,6 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL(  )
     return "sdbc:calc:" + m_pConnection->getURL();
 }
 
-
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength(  )
-{
-    return SAL_MAX_INT32;
-}
-
-
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength(  )
-{
-    return SAL_MAX_INT32;
-}
-
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength(  )
-{
-    return SAL_MAX_INT32;
-}
-
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex(  )
-{
-    return 1;
-}
-
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable(  )
-{
-    return 256;
-}
-
-
 static bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const OUString& rName )
 {
     Any aAny = xSheets->getByName( rName );
@@ -337,7 +132,6 @@ static bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUSt
     return bUnnamed;
 }
 
-
 Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
         const OUString& tableNamePattern, const Sequence< OUString >& types )
@@ -431,5 +225,4 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     return xRef;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/component/CDatabaseMetaData.cxx b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
new file mode 100644
index 000000000000..e0389598f2c9
--- /dev/null
+++ b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
@@ -0,0 +1,247 @@
+/* -*- 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 .
+ */
+
+#include "component/CDatabaseMetaData.hxx"
+#include "file/FConnection.hxx"
+#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/ResultSetType.hpp>
+#include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
+#include "FDatabaseMetaDataResultSet.hxx"
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <comphelper/types.hxx>
+
+using namespace connectivity::component;
+using namespace connectivity::file;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::container;
+
+OComponentDatabaseMetaData::OComponentDatabaseMetaData(OConnection* _pCon)    :ODatabaseMetaData(_pCon)
+{
+}
+
+OComponentDatabaseMetaData::~OComponentDatabaseMetaData()
+{
+}
+
+Reference< XResultSet > OComponentDatabaseMetaData::impl_getTypeInfo_throw(  )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
+    Reference< XResultSet > xRef = pResult;
+
+    static ODatabaseMetaDataResultSet::ORows aRows;
+    if(aRows.empty())
+    {
+        ODatabaseMetaDataResultSet::ORow aRow;
+
+        aRows.reserve(6);
+        aRow.reserve(18);
+
+        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
+        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
+        aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
+        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
+        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
+        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
+        aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); // ORowSetValue((sal_Int32)ColumnValue::NULLABLE)
+        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
+        aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::CHAR));
+        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
+        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
+        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
+        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
+        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
+        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
+        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
+        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
+        aRow.push_back(new ORowSetValueDecorator((sal_Int32)10));
+
+
+        aRows.push_back(aRow);
+
+        aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
+        aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
+        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
+        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
+        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
+        aRows.push_back(aRow);
+
+        aRow[1] = new ORowSetValueDecorator(OUString("BOOL"));
+        aRow[2] = new ORowSetValueDecorator(DataType::BIT);
+        aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
+        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
+        aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
+        aRows.push_back(aRow);
+
+        aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
+        aRow[2] = new ORowSetValueDecorator(DataType::DATE);
+        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
+        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
+        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
+        aRows.push_back(aRow);
+
+        aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
+        aRow[2] = new ORowSetValueDecorator(DataType::TIME);
+        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
+        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
+        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
+        aRows.push_back(aRow);
+
+        aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
+        aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
+        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
+        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
+        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
+        aRows.push_back(aRow);
+    }
+
+    pResult->setRows(aRows);
+    return xRef;
+}
+
+Reference< XResultSet > SAL_CALL OComponentDatabaseMetaData::getColumns(
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
+        const OUString& columnNamePattern )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+
+    Reference< XTablesSupplier > xTables = m_pConnection->createCatalog();
+    if(!xTables.is())
+        throw SQLException();
+
+    Reference< XNameAccess> xNames = xTables->getTables();
+    if(!xNames.is())
+        throw SQLException();
+
+    ODatabaseMetaDataResultSet::ORows aRows;
+    ODatabaseMetaDataResultSet::ORow  aRow(19);
+
+    aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
+
+    Sequence< OUString> aTabNames(xNames->getElementNames());
+    const OUString* pTabIter = aTabNames.getConstArray();
+    const OUString* pTabEnd      = pTabIter + aTabNames.getLength();
+    for(;pTabIter != pTabEnd;++pTabIter)
+    {
+        if(match(tableNamePattern,*pTabIter,'\0'))
+        {
+            const Reference< XColumnsSupplier> xTable(xNames->getByName(*pTabIter),UNO_QUERY_THROW);
+            OSL_ENSURE(xTable.is(),"Table not found! Normally a exception had to be thrown here!");
+            aRow[3] = new ORowSetValueDecorator(*pTabIter);
+
+            const Reference< XNameAccess> xColumns = xTable->getColumns();
+            if(!xColumns.is())
+                throw SQLException();
+
+            const Sequence< OUString> aColNames(xColumns->getElementNames());
+
+            const OUString* pColumnIter = aColNames.getConstArray();
+            const OUString* pEnd = pColumnIter + aColNames.getLength();
+            Reference< XPropertySet> xColumn;
+            for(sal_Int32 i=1;pColumnIter != pEnd;++pColumnIter,++i)
+            {
+                if(match(columnNamePattern,*pColumnIter,'\0'))
+                {
+                    aRow[4]  = new ORowSetValueDecorator( *pColumnIter);
+
+                    xColumns->getByName(*pColumnIter) >>= xColumn;
+                    OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!");
+                    aRow[5] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))));
+                    aRow[6] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))));
+                    aRow[7] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))));
+                    //  aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+                    aRow[9] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))));
+                    aRow[11] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))));
+                    //  aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+                    aRow[13] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))));
+                    //  aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+                    //  aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+                    switch(sal_Int32(aRow[5]->getValue()))
+                    {
+                    case DataType::CHAR:
+                    case DataType::VARCHAR:
+                        aRow[16] = new ORowSetValueDecorator((sal_Int32)254);
+                        break;
+                    case DataType::LONGVARCHAR:
+                        aRow[16] = new ORowSetValueDecorator((sal_Int32)65535);
+                        break;
+                    default:
+                        aRow[16] = new ORowSetValueDecorator((sal_Int32)0);
+                    }
+                    aRow[17] = new ORowSetValueDecorator(i);
+                    switch(sal_Int32(aRow[11]->getValue()))
+                    {
+                    case ColumnValue::NO_NULLS:
+                        aRow[18]  = new ORowSetValueDecorator(OUString("NO"));
+                        break;
+                    case ColumnValue::NULLABLE:
+                        aRow[18]  = new ORowSetValueDecorator(OUString("YES"));
+                        break;
+                    default:
+                        aRow[18]  = new ORowSetValueDecorator(OUString());
+                    }
+                    aRows.push_back(aRow);
+                }
+            }
+        }
+    }
+
+    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
+    Reference< XResultSet > xRef = pResult;
+    pResult->setRows(aRows);
+
+    return xRef;
+}
+
+sal_Int32 SAL_CALL OComponentDatabaseMetaData::getMaxBinaryLiteralLength(  )
+{
+    return SAL_MAX_INT32;
+}
+
+sal_Int32 SAL_CALL OComponentDatabaseMetaData::getMaxCharLiteralLength(  )
+{
+    return SAL_MAX_INT32;
+}
+
+sal_Int32 SAL_CALL OComponentDatabaseMetaData::getMaxColumnNameLength(  )
+{
+    return SAL_MAX_INT32;
+}
+
+sal_Int32 SAL_CALL OComponentDatabaseMetaData::getMaxColumnsInIndex(  )
+{
+    return 1;
+}
+
+sal_Int32 SAL_CALL OComponentDatabaseMetaData::getMaxColumnsInTable(  )
+{
+    return 256;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
index 66104f0a0e9b..e83ea87e198d 100644
--- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
@@ -19,20 +19,8 @@
 
 #include "writer/WDatabaseMetaData.hxx"
 #include "writer/WConnection.hxx"
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/sdbc/ResultSetType.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
-#include "FDatabaseMetaDataResultSet.hxx"
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/types.hxx>
 
-using namespace connectivity::file;
 using namespace ::com::sun::star;
 
 namespace connectivity
@@ -40,7 +28,7 @@ namespace connectivity
 namespace writer
 {
 
-OWriterDatabaseMetaData::OWriterDatabaseMetaData(OConnection* pConnection) :ODatabaseMetaData(pConnection)
+OWriterDatabaseMetaData::OWriterDatabaseMetaData(file::OConnection* pConnection) :OComponentDatabaseMetaData(pConnection)
 {
 }
 
@@ -48,177 +36,6 @@ OWriterDatabaseMetaData::~OWriterDatabaseMetaData()
 {
 }
 
-uno::Reference<sdbc::XResultSet> OWriterDatabaseMetaData::impl_getTypeInfo_throw()
-{
-    ::osl::MutexGuard aGuard(m_aMutex);
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
-    uno::Reference<sdbc::XResultSet> xRef = pResult;
-
-    static ODatabaseMetaDataResultSet::ORows aRows;
-    if (aRows.empty())
-    {
-        ODatabaseMetaDataResultSet::ORow aRow;
-
-        aRows.reserve(6);
-        aRow.reserve(18);
-
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
-        aRow.push_back(new ORowSetValueDecorator(sdbc::DataType::VARCHAR));
-        aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); // ORowSetValue((sal_Int32)ColumnValue::NULLABLE)
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(new ORowSetValueDecorator((sal_Int32)sdbc::ColumnSearch::CHAR));
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator((sal_Int32)10));
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
-        aRow[2] = new ORowSetValueDecorator(sdbc::DataType::DECIMAL);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("BOOL"));
-        aRow[2] = new ORowSetValueDecorator(sdbc::DataType::BIT);
-        aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
-        aRow[2] = new ORowSetValueDecorator(sdbc::DataType::DATE);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
-        aRow[2] = new ORowSetValueDecorator(sdbc::DataType::TIME);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-
-        aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
-        aRow[2] = new ORowSetValueDecorator(sdbc::DataType::TIMESTAMP);
-        aRow[3] = ODatabaseMetaDataResultSet::get0Value();
-        aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[15] = ODatabaseMetaDataResultSet::get0Value();
-        aRows.push_back(aRow);
-    }
-
-    pResult->setRows(aRows);
-    return xRef;
-}
-
-
-uno::Reference<sdbc::XResultSet> SAL_CALL OWriterDatabaseMetaData::getColumns(
-    const uno::Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
-    const OUString& columnNamePattern)
-{
-    ::osl::MutexGuard aGuard(m_aMutex);
-
-    uno::Reference<sdbcx::XTablesSupplier> xTables = m_pConnection->createCatalog();
-    if (!xTables.is())
-        throw sdbc::SQLException();
-
-    uno::Reference<container::XNameAccess> xNames = xTables->getTables();
-    if (!xNames.is())
-        throw sdbc::SQLException();
-
-    ODatabaseMetaDataResultSet::ORows aRows;
-    ODatabaseMetaDataResultSet::ORow  aRow(19);
-
-    aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
-
-    uno::Sequence<OUString> aTabNames(xNames->getElementNames());
-    const OUString* pTabIter = aTabNames.getConstArray();
-    const OUString* pTabEnd      = pTabIter + aTabNames.getLength();
-    for (; pTabIter != pTabEnd; ++pTabIter)
-    {
-        if (match(tableNamePattern,*pTabIter,'\0'))
-        {
-            uno::Reference<sdbcx::XColumnsSupplier> xTable(xNames->getByName(*pTabIter), uno::UNO_QUERY_THROW);
-            aRow[3] = new ORowSetValueDecorator(*pTabIter);
-
-            uno::Reference<container::XNameAccess> xColumns = xTable->getColumns();
-            if (!xColumns.is())
-                throw sdbc::SQLException();
-
-            uno::Sequence<OUString> aColNames(xColumns->getElementNames());
-
-            const OUString* pColumnIter = aColNames.getConstArray();
-            const OUString* pEnd = pColumnIter + aColNames.getLength();
-            uno::Reference<beans::XPropertySet> xColumn;
-            for (sal_Int32 i=1; pColumnIter != pEnd; ++pColumnIter,++i)
-            {
-                if (match(columnNamePattern,*pColumnIter,'\0'))
-                {
-                    aRow[4]  = new ORowSetValueDecorator(*pColumnIter);
-
-                    xColumns->getByName(*pColumnIter) >>= xColumn;
-                    OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!");
-                    aRow[5] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))));
-                    aRow[6] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))));
-                    aRow[7] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))));
-                    //  aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    aRow[9] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))));
-                    aRow[11] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))));
-                    //  aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    aRow[13] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))));
-                    //  aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    //  aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
-                    switch (sal_Int32(aRow[5]->getValue()))
-                    {
-                    case sdbc::DataType::CHAR:
-                    case sdbc::DataType::VARCHAR:
-                        aRow[16] = new ORowSetValueDecorator((sal_Int32)254);
-                        break;
-                    case sdbc::DataType::LONGVARCHAR:
-                        aRow[16] = new ORowSetValueDecorator((sal_Int32)65535);
-                        break;
-                    default:
-                        aRow[16] = new ORowSetValueDecorator((sal_Int32)0);
-                    }
-                    aRow[17] = new ORowSetValueDecorator(i);
-                    switch (sal_Int32(aRow[11]->getValue()))
-                    {
-                    case sdbc::ColumnValue::NO_NULLS:
-                        aRow[18]  = new ORowSetValueDecorator(OUString("NO"));
-                        break;
-                    case sdbc::ColumnValue::NULLABLE:
-                        aRow[18]  = new ORowSetValueDecorator(OUString("YES"));
-                        break;
-                    default:
-                        aRow[18]  = new ORowSetValueDecorator(OUString());
-                    }
-                    aRows.push_back(aRow);
-                }
-            }
-        }
-    }
-
-    ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
-    uno::Reference<sdbc::XResultSet> xRef = pResult;
-    pResult->setRows(aRows);
-
-    return xRef;
-}
-
-
 OUString SAL_CALL OWriterDatabaseMetaData::getURL()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -227,32 +44,6 @@ OUString SAL_CALL OWriterDatabaseMetaData::getURL()
 }
 
 
-sal_Int32 SAL_CALL OWriterDatabaseMetaData::getMaxBinaryLiteralLength()
-{
-    return SAL_MAX_INT32;
-}
-
-
-sal_Int32 SAL_CALL OWriterDatabaseMetaData::getMaxCharLiteralLength()
-{
-    return SAL_MAX_INT32;
-}
-
-sal_Int32 SAL_CALL OWriterDatabaseMetaData::getMaxColumnNameLength()
-{
-    return SAL_MAX_INT32;
-}
-
-sal_Int32 SAL_CALL OWriterDatabaseMetaData::getMaxColumnsInIndex()
-{
-    return 1;
-}
-
-sal_Int32 SAL_CALL OWriterDatabaseMetaData::getMaxColumnsInTable()
-{
-    return 256;
-}
-
 uno::Reference<sdbc::XResultSet> SAL_CALL OWriterDatabaseMetaData::getTables(
     const uno::Any& /*catalog*/, const OUString& /*schemaPattern*/,
     const OUString& tableNamePattern, const uno::Sequence< OUString >& types)
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index 5c32627652fb..7062a7675efb 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -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;
diff --git a/connectivity/source/inc/component/CDatabaseMetaData.hxx b/connectivity/source/inc/component/CDatabaseMetaData.hxx
new file mode 100644
index 000000000000..36cf77510010
--- /dev/null
+++ b/connectivity/source/inc/component/CDatabaseMetaData.hxx
@@ -0,0 +1,52 @@
+/* -*- 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: */
diff --git a/connectivity/source/inc/writer/WDatabaseMetaData.hxx b/connectivity/source/inc/writer/WDatabaseMetaData.hxx
index 45f868366a6f..e80c8edf4e0d 100644
--- a/connectivity/source/inc/writer/WDatabaseMetaData.hxx
+++ b/connectivity/source/inc/writer/WDatabaseMetaData.hxx
@@ -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;